diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
commit | 9c54d0ef8f6442e32d5762edccef46db80b68681 (patch) | |
tree | 0fdbc2be98a2e7fd7728a3860d56c94db3e173bb /tools/qmlscene | |
parent | 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763 (diff) | |
parent | 36a42ed6b11dce102d0e0f93fbd441011b003157 (diff) |
Merge branch 'stable' into dev
Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
Diffstat (limited to 'tools/qmlscene')
-rw-r--r-- | tools/qmlscene/main.cpp | 10 | ||||
-rw-r--r-- | tools/qmlscene/qmlscene.pro | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp index 1121f02dba..090d173f9f 100644 --- a/tools/qmlscene/main.cpp +++ b/tools/qmlscene/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the tools applications of the Qt Toolkit. @@ -347,9 +347,9 @@ static void usage() { qWarning("Usage: qmlscene [options] <filename>"); qWarning(" "); - qWarning(" options:"); - qWarning(" --maximized ............................... run maximized"); - qWarning(" --fullscreen .............................. run fullscreen"); + qWarning(" Options:"); + qWarning(" --maximized ............................... Run maximized"); + qWarning(" --fullscreen .............................. Run fullscreen"); qWarning(" --transparent ............................. Make the window transparent"); qWarning(" --multisample ............................. Enable multisampling (OpenGL anti-aliasing)"); qWarning(" --no-version-detection .................... Do not try to detect the version of the .qml file"); @@ -358,7 +358,7 @@ static void usage() qWarning(" --quit .................................... Quit immediately after starting"); qWarning(" -I <path> ................................. Add <path> to the list of import paths"); qWarning(" -B <name> <file> .......................... Add a named bundle"); - qWarning(" -translation <translationfile> ........... set the language to run in"); + qWarning(" -translation <translationfile> ............ Set the language to run in"); qWarning(" "); exit(1); diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro index 623de41c5c..719110ad71 100644 --- a/tools/qmlscene/qmlscene.pro +++ b/tools/qmlscene/qmlscene.pro @@ -1,5 +1,5 @@ QT += qml quick core-private -!contains(QT_CONFIG, no-widgets):QT += widgets +qtHaveModule(widgets): QT += widgets SOURCES += main.cpp |