diff options
author | Niels Weber <niels.weber@digia.com> | 2013-01-14 15:38:26 +0100 |
---|---|---|
committer | Niels Weber <niels.weber@digia.com> | 2013-01-14 15:48:17 +0100 |
commit | 15428da8479fa7f0664e6e61dab2e9f5def75e53 (patch) | |
tree | 1142c0f20eb3253bcc87b35b46e33f9a36c5c624 /src/libs | |
parent | dd2cfbdd4aa8441a179c8471b311df5c8792fd7c (diff) |
Cleanup the operation list.
Change-Id: I615f66e984283f55002908f35e23567e11d3ab8e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/installer/init.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index 913911d17..b6365d806 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -51,27 +51,27 @@ #include "installiconsoperation.h" #include "elevatedexecuteoperation.h" #include "fakestopprocessforupdateoperation.h" - -//added for NDK +#include "createlinkoperation.h" +#include "simplemovefileoperation.h" #include "copydirectoryoperation.h" +#include "replaceoperation.h" +#include "linereplaceoperation.h" +#include "minimumprogressoperation.h" +#include "licenseoperation.h" + +// QtSDK specific #include "qtpatchoperation.h" #include "setdemospathonqtoperation.h" #include "setexamplespathonqtoperation.h" #include "setpluginpathonqtcoreoperation.h" #include "setimportspathonqtcoreoperation.h" #include "setpathonqtcoreoperation.h" -#include "replaceoperation.h" -#include "licenseoperation.h" -#include "linereplaceoperation.h" #include "registerqtvqnxoperation.h" #include "setqtcreatorvalueoperation.h" #include "addqtcreatorarrayvalueoperation.h" -#include "simplemovefileoperation.h" #include "registertoolchainoperation.h" #include "registerdefaultdebuggeroperation.h" -#include "createlinkoperation.h" -#include "minimumprogressoperation.h" #ifdef Q_OS_MAC # include "macreplaceinstallnamesoperation.h" @@ -227,19 +227,24 @@ void QInstaller::init() factory.registerUpdateOperation<CreateLocalRepositoryOperation>(QLatin1String("CreateLocalRepository")); factory.registerUpdateOperation<ExtractArchiveOperation>(QLatin1String("Extract")); factory.registerUpdateOperation<GlobalSettingsOperation>(QLatin1String("GlobalConfig")); - factory.registerUpdateOperation<EnvironmentVariableOperation>(QLatin1String( "EnvironmentVariable")); + factory.registerUpdateOperation<EnvironmentVariableOperation>(QLatin1String("EnvironmentVariable")); factory.registerUpdateOperation<RegisterFileTypeOperation>(QLatin1String("RegisterFileType")); factory.registerUpdateOperation<SelfRestartOperation>(QLatin1String("SelfRestart")); factory.registerUpdateOperation<InstallIconsOperation>(QLatin1String("InstallIcons")); factory.registerUpdateOperation<ElevatedExecuteOperation>(QLatin1String("Execute")); factory.registerUpdateOperation<FakeStopProcessForUpdateOperation>(QLatin1String("FakeStopProcessForUpdate")); - - // added for NDK + factory.registerUpdateOperation<CreateLinkOperation>(QLatin1String("CreateLink")); factory.registerUpdateOperation<SimpleMoveFileOperation>(QLatin1String("SimpleMoveFile")); factory.registerUpdateOperation<CopyDirectoryOperation>(QLatin1String("CopyDirectory")); + factory.registerUpdateOperation<ReplaceOperation>(QLatin1String("Replace")); + factory.registerUpdateOperation<LineReplaceOperation>(QLatin1String("LineReplace")); + factory.registerUpdateOperation<MinimumProgressOperation>(QLatin1String("MinimumProgress")); + factory.registerUpdateOperation<LicenseOperation>(QLatin1String("License")); + + // QtSDK specific factory.registerUpdateOperation<RegisterQtInCreatorQNXOperation>(QLatin1String("RegisterQtInCreatorQNX")); - factory.registerUpdateOperation<RegisterToolChainOperation>(QLatin1String("RegisterToolChain") ); - factory.registerUpdateOperation<RegisterDefaultDebuggerOperation>(QLatin1String( "RegisterDefaultDebugger")); + factory.registerUpdateOperation<RegisterToolChainOperation>(QLatin1String("RegisterToolChain")); + factory.registerUpdateOperation<RegisterDefaultDebuggerOperation>(QLatin1String("RegisterDefaultDebugger")); factory.registerUpdateOperation<SetDemosPathOnQtOperation>(QLatin1String("SetDemosPathOnQt")); factory.registerUpdateOperation<SetExamplesPathOnQtOperation>(QLatin1String("SetExamplesPathOnQt")); factory.registerUpdateOperation<SetPluginPathOnQtCoreOperation>(QLatin1String("SetPluginPathOnQtCore")); @@ -248,12 +253,6 @@ void QInstaller::init() factory.registerUpdateOperation<SetQtCreatorValueOperation>(QLatin1String("SetQtCreatorValue")); factory.registerUpdateOperation<AddQtCreatorArrayValueOperation>(QLatin1String("AddQtCreatorArrayValue")); factory.registerUpdateOperation<QtPatchOperation>(QLatin1String("QtPatch")); - factory.registerUpdateOperation<ReplaceOperation>(QLatin1String("Replace")); - factory.registerUpdateOperation<LineReplaceOperation>(QLatin1String( "LineReplace" ) ); - factory.registerUpdateOperation<CreateLinkOperation>(QLatin1String("CreateLink")); - - factory.registerUpdateOperation<MinimumProgressOperation>(QLatin1String("MinimumProgress")); - factory.registerUpdateOperation<LicenseOperation>(QLatin1String("License")); FileDownloaderFactory::setFollowRedirects(true); |