From 541399200a32580ef8d29af15cceae689ad1ce56 Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@digia.com>
Date: Wed, 21 Nov 2012 16:34:53 +0100
Subject: Adjust to make it build with Qt5.

Change-Id: I697b6987da45d1afe7620e2114fd2d4bcf15c7ce
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 installerfw.pri                       | 13 ++++++-------
 src/libs/installer/installer_global.h | 14 +++++++-------
 src/libs/kdtools/kdtools.pri          |  4 +---
 src/libs/kdtools/kdtoolsglobal.h      |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/installerfw.pri b/installerfw.pri
index 83b35f085..5ca3f144e 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -53,22 +53,21 @@ macx:LIBS += -framework Carbon -framework Security
 
 isEqual(QT_MAJOR_VERSION, 4) {
     CONFIG += uitools
+    CONFIG(static, static|shared) {
+        DEFINES += QT_STATIC
+        QT += script network xml
+    }
 } else {
-    QT += uitools
+    QT += uitools xml
     contains(QT, gui): QT += widgets
-    contains(QT, core): QT += concurrent
+    contains(QT, core): QT += concurrent core-private
 }
 
 CONFIG += depend_includepath
-CONFIG(static, static|shared) {
-    QT += script network xml
-}
 
 GIT_SHA1 = $$system(git rev-list --abbrev-commit -n1 HEAD)
 DEFINES += QT_NO_CAST_FROM_ASCII "_GIT_SHA1_=$$GIT_SHA1"
 
-CONFIG(shared, static|shared):DEFINES += KDTOOLS_SHARED
-CONFIG(shared, static|shared):DEFINES += LIB_INSTALLER_SHARED
 
 static {
     win32:exists($$IFW_LIB_PATH/installer.lib):POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib
diff --git a/src/libs/installer/installer_global.h b/src/libs/installer/installer_global.h
index 51091cd49..b6074ff4f 100644
--- a/src/libs/installer/installer_global.h
+++ b/src/libs/installer/installer_global.h
@@ -28,14 +28,14 @@
 
 #include <QtCore/QtGlobal>
 
-#ifdef LIB_INSTALLER_SHARED
-#ifdef BUILD_LIB_INSTALLER
-#define INSTALLER_EXPORT Q_DECL_EXPORT
+#ifndef QT_STATIC
+#  ifdef BUILD_LIB_INSTALLER
+#    define INSTALLER_EXPORT Q_DECL_EXPORT
+#  else
+#    define INSTALLER_EXPORT Q_DECL_IMPORT
+#  endif
 #else
-#define INSTALLER_EXPORT Q_DECL_IMPORT
-#endif
-#else
-#define INSTALLER_EXPORT
+#  define INSTALLER_EXPORT
 #endif
 
 #endif //INSTALLER_GLOBAL_H
diff --git a/src/libs/kdtools/kdtools.pri b/src/libs/kdtools/kdtools.pri
index 70385fd2e..cc9fd52fb 100644
--- a/src/libs/kdtools/kdtools.pri
+++ b/src/libs/kdtools/kdtools.pri
@@ -1,8 +1,6 @@
 INCLUDEPATH += $$PWD
 
-CONFIG(shared, static|shared) {
-    DEFINES += BUILD_SHARED_KDTOOLS
-}
+DEFINES += BUILD_SHARED_KDTOOLS
 
 FORMS += $$PWD/authenticationdialog.ui
 
diff --git a/src/libs/kdtools/kdtoolsglobal.h b/src/libs/kdtools/kdtoolsglobal.h
index 8199724c4..8ce4d5224 100644
--- a/src/libs/kdtools/kdtoolsglobal.h
+++ b/src/libs/kdtools/kdtoolsglobal.h
@@ -25,7 +25,7 @@
 
 #include <QtCore/QtGlobal>
 
-#ifdef KDTOOLS_SHARED
+#ifndef QT_STATIC
 #  ifdef BUILD_SHARED_KDTOOLS
 #    define KDTOOLS_EXPORT Q_DECL_EXPORT
 #  else
-- 
cgit v1.2.3