From a56fdc2bc3f29d4e14902cf502246a12035b995b Mon Sep 17 00:00:00 2001 From: kh1 Date: Fri, 25 Nov 2011 16:05:08 +0100 Subject: Let the app parse the arguments again in gui mode. Also do not stop on unknown arguments, this is rather stupid to do, just print the error message. Might fix a problem on OSX with session id... Change-Id: I9ca6903b0073ea54b398534c5273f7f0f2e50db4 Reviewed-by: Tim Jenssen Reviewed-by: Niels Weber --- installerbuilder/installerbase/installerbase.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'installerbuilder/installerbase/installerbase.cpp') diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp index c73c834da..f62325db0 100644 --- a/installerbuilder/installerbase/installerbase.cpp +++ b/installerbuilder/installerbase/installerbase.cpp @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) const KDSelfRestarter restarter(argc, argv); KDRunOnceChecker runCheck(QLatin1String("lockmyApp1234865.lock")); - const QStringList args = QInstaller::parseCommandLineArgs(argc, argv); + QStringList args = QInstaller::parseCommandLineArgs(argc, argv); try { if (args.contains(QLatin1String("--version"))) { InstallerBase::showVersion(QLatin1String(VERSION)); @@ -147,6 +147,7 @@ int main(int argc, char *argv[]) // from here, the "normal" installer binary is running MyApplication app(argc, argv); + args = app.arguments(); if (runCheck.isRunning(KDRunOnceChecker::ProcessList)) { if (runCheck.isRunning(KDRunOnceChecker::Lockfile)) @@ -278,8 +279,6 @@ int main(int argc, char *argv[]) PackageManagerCore::setNoForceInstallation(true); } else { std::cerr << "Unknown option: " << argument << std::endl; - InstallerBase::showUsage(); - return PackageManagerCore::Failure; } } -- cgit v1.2.3