summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-04-29 13:01:58 (GMT)
committerKai Koehne <kai.koehne@nokia.com>2010-04-29 13:01:58 (GMT)
commite1c3dc3dad4604c8b0d2f70ef4602c5bead71ade (patch)
treec802f91ca86390a9b451d069fa8d20664c42c91d
parente1a60c82d39af5bda99ebea12f6877d6cd9642ac (diff)
downloadQt-e1c3dc3dad4604c8b0d2f70ef4602c5bead71ade.zip
Qt-e1c3dc3dad4604c8b0d2f70ef4602c5bead71ade.tar.gz
Qt-e1c3dc3dad4604c8b0d2f70ef4602c5bead71ade.tar.bz2
Don't show warnings log window by default
Disable it for the time being. The default annoyed more people then it helped. Reviewed-by: mae
-rw-r--r--tools/qml/main.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 9ccc3d2..f2c0530 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -125,7 +125,7 @@ void usage()
qWarning(" -sizeviewtorootobject .................... the view resizes to the changes in the content");
qWarning(" -sizerootobjecttoview .................... the content resizes to the changes in the view");
qWarning(" -qmlbrowser .............................. use a QML-based file browser");
- qWarning(" -nolog ................................... do not show log window");
+ qWarning(" -warnings ................................ show warnings in a separate log window");
qWarning(" -recordfile <output> ..................... set video recording file");
qWarning(" - ImageMagick 'convert' for GIF)");
qWarning(" - png file for raw frames");
@@ -229,7 +229,8 @@ int main(int argc, char ** argv)
bool stayOnTop = false;
bool maximized = false;
bool useNativeFileBrowser = true;
- bool showLogWidget = true;
+
+ bool showLogWidget = false;
bool sizeToView = true;
#if defined(Q_OS_SYMBIAN)
@@ -290,8 +291,8 @@ int main(int argc, char ** argv)
useGL = true;
} else if (arg == "-qmlbrowser") {
useNativeFileBrowser = false;
- } else if (arg == "-nolog") {
- showLogWidget = false;
+ } else if (arg == "-warnings") {
+ showLogWidget = true;
} else if (arg == "-I" || arg == "-L") {
if (arg == "-L")
qWarning("-L option provided for compatibility only, use -I instead");