summaryrefslogtreecommitdiffstats
path: root/installerbuilder/installerbase/installerbase.cpp
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-05-18 21:26:51 +0200
committerkh1 <qt-info@nokia.com>2011-05-18 21:26:51 +0200
commitf70957cfdc0ace1564a159570fbee7a8a64794cd (patch)
treedbfff7535ca8acee3ef8f16964643e3e1e21a7ed /installerbuilder/installerbase/installerbase.cpp
parentff292889dfc6e08577f07ca690463a558625f038 (diff)
parenteb193817e876c4c704cb67c92c306fa3f9a9e6dc (diff)
Merge branch 'master' into refactor
Diffstat (limited to 'installerbuilder/installerbase/installerbase.cpp')
-rw-r--r--installerbuilder/installerbase/installerbase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index 598752ac0..e5b9e0226 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -147,6 +147,9 @@ int main(int argc, char *argv[])
return u.checkForUpdates() ? 0 : 1;
}
+ // from here, the "normal" installer binary is running
+ QApplication app(argc, argv);
+
if (runCheck.isRunning(KDRunOnceChecker::ProcessList)) {
if (runCheck.isRunning(KDRunOnceChecker::Lockfile))
return 0;
@@ -155,9 +158,6 @@ int main(int argc, char *argv[])
Sleep::sleep(1);
}
- // from here, the "normal" installer binary is running
- QApplication app(argc, argv);
-
if (args.contains(QLatin1String("--verbose")) || args.contains(QLatin1String("Verbose")))
QInstaller::setVerbose(true);