aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Ionascu <stanislav.ionascu@nokia.com>2010-12-23 10:15:42 +0200
committerStanislav Ionascu <stanislav.ionascu@nokia.com>2010-12-23 10:15:42 +0200
commit761102ff8e01d706048b836fadcf17fdf610d6b4 (patch)
tree0e1887b6c9fca844cc7d860f9af6673d147d0ef4
parent5b68e71de0e33b7d823728b378fdc6b3a2987482 (diff)
Revert "Changes: show always MComponentData options if the args passed are wrong"
This reverts commit 45ada02cc589f7f511e181d2868e58805f35030d. Breaks widgetsgallery custom console parameters.
-rw-r--r--src/corelib/core/mcomponentdata.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/core/mcomponentdata.cpp b/src/corelib/core/mcomponentdata.cpp
index abea65e5..7d890085 100644
--- a/src/corelib/core/mcomponentdata.cpp
+++ b/src/corelib/core/mcomponentdata.cpp
@@ -668,10 +668,7 @@ void MComponentDataPrivate::parseArguments(int &argc, char **argv,
<< "Compile time:" << __DATE__ << __TIME__ << "\n"
<< "QT verison :" << QT_VERSION_STR << "\n";
exit(EXIT_SUCCESS);
-
- } else if (s == "-prestart") {
- prestarted = true;
- } else if (s == "-h" || s.startsWith("-help") || s.startsWith("--help") || s.length() > 0) {
+ } else if (s == "-h" || s.startsWith("-help") || s.startsWith("--help")) {
mDebug("MComponentData") << "Usage: " << argv[0] << "\n"
<< " [-software] Enable software rendering\n"
<< " [-fullscreen] Make the application fullscreen\n"
@@ -701,6 +698,9 @@ void MComponentDataPrivate::parseArguments(int &argc, char **argv,
<< " This overrides keyboard state, as well as a device profile"
<< "\n";
exit(0);
+
+ } else if (s == "-prestart") {
+ prestarted = true;
} else {
usedArguments[i] = false;
}