From 4cde7b2ed657e5cc2f5f7c071f4ff0a7dd20d56b Mon Sep 17 00:00:00 2001
From: kh1 <karsten.heimrich@digia.com>
Date: Mon, 18 Mar 2013 13:17:58 +0100
Subject: Fix missing wizard icon on a windows static build.

Q_IMPORT_PLUGIN() macros are needed in application code
only for Qt4, in Qt5 those are automatically generated by qmake.

Change-Id: Ic75795be402592a0595bb3aa084d0b7ee9a9f8c5
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
 src/libs/installer/init.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/libs/installer/init.cpp')

diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp
index e0c51a2f3..40c396ab4 100644
--- a/src/libs/installer/init.cpp
+++ b/src/libs/installer/init.cpp
@@ -85,6 +85,8 @@
 
 #include <unix/C/7zCrc.h>
 
+#include <QtPlugin>
+
 #include <iostream>
 
 namespace NArchive {
@@ -151,10 +153,17 @@ static void initArchives()
     CrcGenerateTable();
 }
 
+#if defined(QT_STATIC)
 static void initResources()
 {
     Q_INIT_RESOURCE(patch_file_lists);
+    Q_INIT_RESOURCE(installer);
+# if QT_VERSION < 0x050000
+    Q_IMPORT_PLUGIN(qico)
+    Q_UNUSED(qt_plugin_instance_qico());
+# endif
 }
+#endif
 
 static QByteArray trimAndPrepend(QtMsgType type, const QByteArray &msg)
 {
@@ -220,7 +229,10 @@ void messageHandler(QtMsgType type, const QMessageLogContext &context, const QSt
 
 void QInstaller::init()
 {
+#if defined(QT_STATIC)
+    ::initArchives();
     ::initResources();
+#endif
 
     UpdateOperationFactory &factory = UpdateOperationFactory::instance();
     factory.registerUpdateOperation<CreateShortcutOperation>(QLatin1String("CreateShortcut"));
@@ -262,9 +274,6 @@ void QInstaller::init()
     factory.registerUpdateOperation<MacReplaceInstallNamesOperation>(QLatin1String("ReplaceInstallNames"));
 #endif // Q_OS_MAC
 
-    // load 7z stuff, if we're a static lib
-    ::initArchives();
-
    // qDebug -> verbose()
 #if QT_VERSION < 0x050000
    qInstallMsgHandler(messageHandler);
-- 
cgit v1.2.3