diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-21 17:04:03 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-03-21 17:04:32 +0100 |
| commit | 3d9fc71e899702fff6124351cf0d5b1fa0c07b41 (patch) | |
| tree | a9b8eb1ca5fd45c7f9ffb4a92588e2fa6a294443 /src/libs/installer/init.cpp | |
| parent | 7e9b2651d0bba127ab8197ffa1ddbd5805a211d2 (diff) | |
| parent | 3fb931187386aadd4329e763b8a276ee0bc5ab77 (diff) | |
Merge remote-tracking branch 'origin/1.3'
Change-Id: Ibe38be81d8e763fb58899e2594641b8b062c5504
Diffstat (limited to 'src/libs/installer/init.cpp')
| -rw-r--r-- | src/libs/installer/init.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index 579446ebf..4e567c8c3 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); |