diff --git a/configure.ac b/configure.ac index 051fccb..245b587 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) diff --git a/src/qbrowserlib/downloadmanager.hxx b/src/qbrowserlib/downloadmanager.hxx index 7cf30e5..53b5520 100644 --- a/src/qbrowserlib/downloadmanager.hxx +++ b/src/qbrowserlib/downloadmanager.hxx @@ -295,22 +295,70 @@ namespace qbrowserlib { .arg(reply->url().toString()) .arg(err->errorString()) .arg(err->error()) - .arg(err->certificate().issuerInfo(QSslCertificate::Organization).join("
")) - .arg(err->certificate().issuerInfo(QSslCertificate::CommonName).join("
")) - .arg(err->certificate().issuerInfo(QSslCertificate::LocalityName).join("
")) + .arg(err->certificate().issuerInfo(QSslCertificate::Organization) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) + .arg(err->certificate().issuerInfo(QSslCertificate::CommonName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) + .arg(err->certificate().issuerInfo(QSslCertificate::LocalityName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) .arg(err->certificate() - .issuerInfo(QSslCertificate::OrganizationalUnitName).join("
")) - .arg(err->certificate().issuerInfo(QSslCertificate::CountryName).join("
")) + .issuerInfo(QSslCertificate::OrganizationalUnitName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) + .arg(err->certificate().issuerInfo(QSslCertificate::CountryName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) .arg(err->certificate() - .issuerInfo(QSslCertificate::StateOrProvinceName).join("
")) - .arg(err->certificate().subjectInfo(QSslCertificate::Organization).join("
")) - .arg(err->certificate().subjectInfo(QSslCertificate::CommonName).join("
")) - .arg(err->certificate().subjectInfo(QSslCertificate::LocalityName).join("
")) + .issuerInfo(QSslCertificate::StateOrProvinceName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) + .arg(err->certificate().subjectInfo(QSslCertificate::Organization) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) + .arg(err->certificate().subjectInfo(QSslCertificate::CommonName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) + .arg(err->certificate().subjectInfo(QSslCertificate::LocalityName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) .arg(err->certificate() - .subjectInfo(QSslCertificate::OrganizationalUnitName).join("
")) - .arg(err->certificate().subjectInfo(QSslCertificate::CountryName).join("
")) + .subjectInfo(QSslCertificate::OrganizationalUnitName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) + .arg(err->certificate().subjectInfo(QSslCertificate::CountryName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ) .arg(err->certificate() - .subjectInfo(QSslCertificate::StateOrProvinceName).join("
")); + .subjectInfo(QSslCertificate::StateOrProvinceName) +#if QT_VERSION >= 0x050000 + .join("
") +#endif + ); } }