Qt5 compile fix on Unix.

Change-Id: Ib860b9531dd74cf7022b6df77cb35aa8c3f1f0f2
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

3 files changed, 19 insertions, 8 deletions

diff --git a/src/libs/installer/adminauthorization_x11.cpp b/src/libs/installer/adminauthorization_x11.cpp
index 804e14a18..7b478cc78 100644
--- a/src/libs/installer/adminauthorization_x11.cpp
+++ b/src/libs/installer/adminauthorization_x11.cpp
@@ -35,9 +35,9 @@
 #include <QtCore/QFile>
 #include <QDebug>
 
-#include <QtGui/QApplication>
-#include <QtGui/QInputDialog>
-#include <QtGui/QMessageBox>
+#include <QApplication>
+#include <QInputDialog>
+#include <QMessageBox>
 
 #include <cstdlib>
 #include <sys/resource.h>
@@ -71,7 +71,12 @@ bool AdminAuthorization::authorize()
   
 static QString getPassword(QWidget *)
 {
-    if (QApplication::type() == QApplication::GuiClient) {
+#if QT_VERSION < 0x050000
+    if (QApplication::type() == QApplication::GuiClient)
+#else
+    if (qobject_cast<QApplication*> (qApp) != 0)
+#endif
+    {
         bool ok = false;
         const QString result = QInputDialog::getText(0, QObject::tr("Authorization required"),
            QObject::tr("Enter your password to authorize for sudo:"),
@@ -88,11 +93,17 @@ static QString getPassword(QWidget *)
 
 static void printError(QWidget *parent, const QString &value)
 {
+#if QT_VERSION < 0x050000
     if (QApplication::type() == QApplication::GuiClient)
+#else
+    if (qobject_cast<QApplication*> (qApp) != 0)
+#endif
+    {
         QMessageBox::critical(parent, QObject::tr( "Error acquiring admin rights" ), value,
-                              QMessageBox::Ok, QMessageBox::Ok);
-    else
+            QMessageBox::Ok, QMessageBox::Ok);
+    } else {
         std::cout << value.toStdString() << std::endl;
+    }
 }
 
 bool AdminAuthorization::execute(QWidget *parent, const QString &program, const QStringList &arguments)
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp
index da68ad727..8fc43d206 100644
--- a/src/libs/installer/init.cpp
+++ b/src/libs/installer/init.cpp
@@ -185,7 +185,7 @@ static void messageHandler(QtMsgType type, const char *msg)
 void messageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
 {
     QByteArray ba = trimAndPrepend(type, msg.toLocal8Bit());
-    if (type != QtMsgType::QtDebugMsg) {
+    if (type != QtDebugMsg) {
         ba += QByteArray(" (") + context.file + QByteArray(":").append(context.line) + QByteArray(", ")
             + context.function + QByteArray(")");
     }
diff --git a/src/libs/installer/repository.h b/src/libs/installer/repository.h
index 7e02a74db..13a5f32e9 100644
--- a/src/libs/installer/repository.h
+++ b/src/libs/installer/repository.h
@@ -86,7 +86,7 @@ private:
 
 inline uint qHash(const Repository &repository)
 {
-    return qHash(repository.url().toString());
+    return qHash(repository.url());
 }
 
 QDataStream &operator>>(QDataStream &istream, Repository &repository);