web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

compatibility with more distributions

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-03-15 22:51:22 +00:00
parent 39b561355c
commit 5f3af87bdc
2 changed files with 61 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -23,7 +23,7 @@ AX_USE_RPM_PACKAGING
AX_USE_CPPUNIT
AX_BUILD_EXAMPLES
AX_REQUIRE_QT([QT], [QtCore QtNetwork QtWebKit QtDesigner], [QtWidgets QtWebKitWidgets])
AX_REQUIRE_QT([QT], [QtCore QtNetwork QtWebKit QtDesigner QtPrintSupport], [QtWidgets QtWebKitWidgets])
AX_PKG_REQUIRE([libpcscxx])
AX_PKG_REQUIRE([proxyface])

72
src/qbrowserlib/downloadmanager.hxx
View File

@@ -295,22 +295,70 @@ namespace qbrowserlib {
.arg(reply->url().toString())
.arg(err->errorString())
.arg(err->error())
.arg(err->certificate().issuerInfo(QSslCertificate::Organization).join("<br/>"))
.arg(err->certificate().issuerInfo(QSslCertificate::CommonName).join("<br/>"))
.arg(err->certificate().issuerInfo(QSslCertificate::LocalityName).join("<br/>"))
.arg(err->certificate().issuerInfo(QSslCertificate::Organization)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate().issuerInfo(QSslCertificate::CommonName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate().issuerInfo(QSslCertificate::LocalityName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate()
.issuerInfo(QSslCertificate::OrganizationalUnitName).join("<br/>"))
.arg(err->certificate().issuerInfo(QSslCertificate::CountryName).join("<br/>"))
.issuerInfo(QSslCertificate::OrganizationalUnitName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate().issuerInfo(QSslCertificate::CountryName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate()
.issuerInfo(QSslCertificate::StateOrProvinceName).join("<br/>"))
.arg(err->certificate().subjectInfo(QSslCertificate::Organization).join("<br/>"))
.arg(err->certificate().subjectInfo(QSslCertificate::CommonName).join("<br/>"))
.arg(err->certificate().subjectInfo(QSslCertificate::LocalityName).join("<br/>"))
.issuerInfo(QSslCertificate::StateOrProvinceName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate().subjectInfo(QSslCertificate::Organization)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate().subjectInfo(QSslCertificate::CommonName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate().subjectInfo(QSslCertificate::LocalityName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate()
.subjectInfo(QSslCertificate::OrganizationalUnitName).join("<br/>"))
.arg(err->certificate().subjectInfo(QSslCertificate::CountryName).join("<br/>"))
.subjectInfo(QSslCertificate::OrganizationalUnitName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate().subjectInfo(QSslCertificate::CountryName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
)
.arg(err->certificate()
.subjectInfo(QSslCertificate::StateOrProvinceName).join("<br/>"));
.subjectInfo(QSslCertificate::StateOrProvinceName)
#if QT_VERSION >= 0x050000
.join("<br/>")
#endif
);
}
}