compatibility with more distributions

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])

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("<br/>"))
+            .arg(err->certificate().issuerInfo(QSslCertificate::Organization)
-            .arg(err->certificate().issuerInfo(QSslCertificate::CommonName).join("<br/>"))
+#if QT_VERSION >= 0x050000
-            .arg(err->certificate().issuerInfo(QSslCertificate::LocalityName).join("<br/>"))
+                 .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/>"))
+                 .issuerInfo(QSslCertificate::OrganizationalUnitName)
-            .arg(err->certificate().issuerInfo(QSslCertificate::CountryName).join("<br/>"))
+#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/>"))
+                 .issuerInfo(QSslCertificate::StateOrProvinceName)
-            .arg(err->certificate().subjectInfo(QSslCertificate::Organization).join("<br/>"))
+#if QT_VERSION >= 0x050000
-            .arg(err->certificate().subjectInfo(QSslCertificate::CommonName).join("<br/>"))
+                 .join("<br/>")
-            .arg(err->certificate().subjectInfo(QSslCertificate::LocalityName).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/>"))
+                 .subjectInfo(QSslCertificate::OrganizationalUnitName)
-            .arg(err->certificate().subjectInfo(QSslCertificate::CountryName).join("<br/>"))
+#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
+                 );
         }
       }