diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-18 02:06:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-18 02:06:36 (GMT) |
| commit | c8e4f99a7616120b180745674f652933731fd524 (patch) | |
| tree | 19ad095179ef5e46612ffd6d773022f652af42a5 /src/corelib | |
| parent | f412a9cb0bd1438d1518cf6a8eda3fda5fbf64f5 (diff) | |
| parent | 572c466c3b202aab3426cdb4e9adb176f934b021 (diff) | |
| download | Qt-c8e4f99a7616120b180745674f652933731fd524.zip Qt-c8e4f99a7616120b180745674f652933731fd524.tar.gz Qt-c8e4f99a7616120b180745674f652933731fd524.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make qml debugging work with command line arguments
Fix example after changes to font.letterSpacing.
Autotest and small fix for QDeclarativeFontLoader.
Improve error messages
Changes to objects returned from get() should emit itemsChanged() so
Make it clear that private ListModel constructor is only for worker
Remove duplicated move() implementations
Doc changes
Fix QDeclarativeXmlQuery mutex locking and don't wait for new jobs if the query has already quit
PathView didn't accept mouse events, preventing it from working in a Flickable.
Moving items in a PathView caused PathView.onPath to be set to false.
Fix worker agent to emit ListModel itemsChanged() correctly when set()
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 512e193..d3f399b 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2091,7 +2091,8 @@ QStringList QCoreApplication::arguments() l1arg == "-stylesheet" || l1arg == "-widgetcount") ; - else if (l1arg.startsWith("-style=")) + else if (l1arg.startsWith("-style=") || + l1arg.startsWith("-qmljsdebugger=")) ; else if (l1arg == "-style" || l1arg == "-session" || |