3 files changed, 29 insertions, 11 deletions
diff --git a/Swift/QtUI/QtCertificateViewerDialog.cpp b/Swift/QtUI/QtCertificateViewerDialog.cpp
index 15a52ba..8108978 100644
--- a/Swift/QtUI/QtCertificateViewerDialog.cpp
+++ b/Swift/QtUI/QtCertificateViewerDialog.cpp
@@ -1,20 +1,28 @@
 /*
  * Copyright (c) 2012 Tobias Markmann
  * Licensed under the simplified BSD license.
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
 #include "QtCertificateViewerDialog.h"
 #include "ui_QtCertificateViewerDialog.h"
 
 #include <Swiften/Base/foreach.h>
 
-#include <QTreeWidgetItem>
-#include <QLabel>
 #include <QDateTime>
+#include <QLabel>
+#include <QString>
+#include <QStringList>
+#include <QTreeWidgetItem>
 
 namespace Swift {
 
 QtCertificateViewerDialog::QtCertificateViewerDialog(QWidget* parent) : QDialog(parent), ui(new Ui::QtCertificateViewerDialog) {
 	ui->setupUi(this);
 	connect(ui->certChainTreeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), SLOT(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
@@ -45,13 +53,13 @@ void QtCertificateViewerDialog::setCertificateChain(const std::vector<Certificat
 	root->setData(0, Qt::UserRole, QVariant(0));
 	root->setExpanded(true);
 	ui->certChainTreeWidget->addTopLevelItem(root);
 	if (currentChain.size() > 1) {
 		QTreeWidgetItem* parent = root;
 		for (int n = 1; n < currentChain.size(); n++) {
-			QTreeWidgetItem* link = new QTreeWidgetItem(parent, QStringList(QString("↳ ") + currentChain.at(n).subjectInfo(QSslCertificate::CommonName)));
+			QTreeWidgetItem* link = new QTreeWidgetItem(parent, QStringList(QString("↳ ") + (QStringList(currentChain.at(n).subjectInfo(QSslCertificate::CommonName)).join(", "))));
 			link->setExpanded(true);
 			link->setData(0, Qt::UserRole, QVariant(n));
 			parent = link;
 		}
 		ui->certChainTreeWidget->setCurrentItem(parent);
 	} else {
@@ -71,13 +79,14 @@ void QtCertificateViewerDialog::currentItemChanged(QTreeWidgetItem* current, QTr
 
 #define ADD_SECTION( TITLE ) \
 	ui->certGridLayout->addWidget(new QLabel("<strong>" + TITLE + "</strong>"), rowCount++, 0, 1, 2);
 
 #define ADD_FIELD( TITLE, VALUE) \
 	ui->certGridLayout->addWidget(new QLabel(TITLE), rowCount, 0, 1, 1, Qt::AlignRight); \
-	valueLabel = new QLabel(VALUE); \
+	valueLabel = new QLabel(); \
+	valueLabel->setText(QStringList(VALUE).join(", ")); \
 	valueLabel->setTextFormat(Qt::PlainText); \
 	valueLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard); \
 	ui->certGridLayout->addWidget(valueLabel, rowCount++, 1, 1, 1, Qt::AlignLeft);
 
 void QtCertificateViewerDialog::setCertificateDetails(const QSslCertificate& cert) {
 	QLayoutItem* item;
@@ -103,16 +112,22 @@ void QtCertificateViewerDialog::setCertificateDetails(const QSslCertificate& cer
 	ADD_FIELD(tr("Common Name"), cert.subjectInfo(QSslCertificate::CommonName));
 	ADD_FIELD(tr("Locality"), cert.subjectInfo(QSslCertificate::LocalityName));
 	ADD_FIELD(tr("Organizational Unit"), cert.subjectInfo(QSslCertificate::OrganizationalUnitName));
 	ADD_FIELD(tr("Country"), cert.subjectInfo(QSslCertificate::CountryName));
 	ADD_FIELD(tr("State"), cert.subjectInfo(QSslCertificate::StateOrProvinceName));
 
-	if (!cert.alternateSubjectNames().empty()) {
+#if QT_VERSION < 0x050000
+	QMultiMap<QSsl::AlternateNameEntryType, QString> altNames = cert.alternateSubjectNames();
+#define SANTYPE QSsl::AlternateNameEntryType
+#else
+	QMultiMap<QSsl::AlternativeNameEntryType, QString> altNames = cert.subjectAlternativeNames();
+#define SANTYPE QSsl::AlternativeNameEntryType
+#endif
+	if (!altNames.empty()) {
 		ADD_SECTION(tr("Alternate Subject Names"));
-		QMultiMap<QSsl::AlternateNameEntryType, QString> altNames = cert.alternateSubjectNames();
-		foreach (const QSsl::AlternateNameEntryType &type, altNames.uniqueKeys()) {
+		foreach (const SANTYPE &type, altNames.uniqueKeys()) {
 			foreach (QString name, altNames.values(type)) {
 				if (type == QSsl::EmailEntry) {
 					ADD_FIELD(tr("E-mail Address"), name);
 				} else {
 					ADD_FIELD(tr("DNS Name"), name);
 				}
diff --git a/Swift/QtUI/QtUtilities.cpp b/Swift/QtUI/QtUtilities.cpp
index 70686e7..b4b1b09 100644
--- a/Swift/QtUI/QtUtilities.cpp
+++ b/Swift/QtUI/QtUtilities.cpp
@@ -1,29 +1,30 @@
 /*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include "QtUtilities.h"
 
-#include <QTextDocument>
-#include <QWidget>
+#include <QtGui>
 #if defined (Q_OS_UNIX) && !defined(Q_OS_MAC)
 #include <QX11Info>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #endif
+#include <QTextDocument>
+#include <QWidget>
 
 #include "Swift/Controllers/ApplicationInfo.h"
 
 namespace QtUtilities {
 
 
 void setX11Resource(QWidget* widget, const QString& c) {
-#if defined (Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) && QT_VERSION < 0x050000
 	char res_class[] = SWIFT_APPLICATION_NAME;
 	XClassHint hint;
 	QByteArray resName = (QString(SWIFT_APPLICATION_NAME) + "-" + c).toUtf8();
 	hint.res_name = resName.data();
 	hint.res_class = res_class;
 	XSetClassHint(widget->x11Info().display(), widget->winId(), &hint);
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index f3251d2..86b41d3 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -58,12 +58,14 @@ myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])
 myenv.Tool("wix", toolpath = ["#/BuildTools/SCons/Tools"])
 myenv.Tool("textfile", toolpath = ["#/BuildTools/SCons/Tools"])
 qt4modules = ['QtCore', 'QtWebKit', 'QtGui']
 if myenv["qt5"] :
   qt_version = '5'
   qt4modules += ['QtWidgets', 'QtWebKitWidgets', 'QtMultimedia']
+  if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
+    qt4modules += ['QtX11Extras']
 else :
   qt_version = '4'
 if env["PLATFORM"] == "posix" :
 	qt4modules += ["QtDBus"]
 if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
 	qt4modules += ["QtNetwork"]