diff options
author | kh <karsten.heimrich@theqtcompany.com> | 2014-11-18 16:39:28 +0100 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2014-11-18 16:40:18 +0100 |
commit | 6a38cb8df826216b7de356c3c7c7a92bdb3a6e03 (patch) | |
tree | f01b61ade5cd5f1312a49777a16ded33c40e6a93 /src/libs/installer/init.cpp | |
parent | b5206decd82ee10be00460b6c3ba3f6f9d1c2b6c (diff) |
Remove Qt SDK specific operations
Change-Id: I0a06c4b019dc6799447adef6d722be36ab3ded5d
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/init.cpp')
-rw-r--r-- | src/libs/installer/init.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index fcd14f3f2..5d9f8a162 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -51,16 +51,9 @@ #include "linereplaceoperation.h" #include "minimumprogressoperation.h" #include "licenseoperation.h" -#include "applyproductkeyoperation.h" #include "settingsoperation.h" - -// QtSDK specific -#include "qtpatchoperation.h" #include "consumeoutputoperation.h" -#ifdef Q_OS_OSX -# include "macreplaceinstallnamesoperation.h" -#endif // Q_OS_OSX #include "utils.h" @@ -130,7 +123,6 @@ static void initArchives() #if defined(QT_STATIC) static void initResources() { - Q_INIT_RESOURCE(patch_file_lists); Q_INIT_RESOURCE(installer); } #endif @@ -228,17 +220,10 @@ void QInstaller::init() factory.registerUpdateOperation<LineReplaceOperation>(QLatin1String("LineReplace")); factory.registerUpdateOperation<MinimumProgressOperation>(QLatin1String("MinimumProgress")); factory.registerUpdateOperation<LicenseOperation>(QLatin1String("License")); - factory.registerUpdateOperation<ApplyProductKeyOperation>(QLatin1String("ApplyProductKey")); factory.registerUpdateOperation<ConsumeOutputOperation>(QLatin1String("ConsumeOutput")); factory.registerUpdateOperation<SettingsOperation>(QLatin1String("Settings")); - // QtSDK specific - factory.registerUpdateOperation<QtPatchOperation>(QLatin1String("QtPatch")); - FileDownloaderFactory::setFollowRedirects(true); -#ifdef Q_OS_OSX - factory.registerUpdateOperation<MacReplaceInstallNamesOperation>(QLatin1String("ReplaceInstallNames")); -#endif // Q_OS_OSX qInstallMessageHandler(messageHandler); } |