From 5f3af87bdcc73711cb71d0d40e9576fc78b7d2e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Sun, 15 Mar 2015 22:51:22 +0000
Subject: [PATCH] compatibility with more distributions

---
 configure.ac                        |  2 +-
 src/qbrowserlib/downloadmanager.hxx | 72 ++++++++++++++++++++++++-----
 2 files changed, 61 insertions(+), 13 deletions(-)

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("<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
+                 );
         }
       }