diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-07 02:41:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-07 02:41:30 (GMT) |
| commit | a05f73499a187c67a394893e2cc74516ccbc46f5 (patch) | |
| tree | 9e7c3f8af63fa0983cf3d5f18540546e4cc20255 /tools | |
| parent | f9fce9b432bfcb5c2f48b2b34056a63bd805d8d3 (diff) | |
| parent | 5f741649cff218367100f3a9d7cdf9e0d393e327 (diff) | |
| download | Qt-a05f73499a187c67a394893e2cc74516ccbc46f5.zip Qt-a05f73499a187c67a394893e2cc74516ccbc46f5.tar.gz Qt-a05f73499a187c67a394893e2cc74516ccbc46f5.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:
QmlViewer: Enable remote qml debugging
QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 6ca6bfb..b2c7f4f 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -51,6 +51,7 @@ #include <QMessageBox> #include <QAtomicInt> #include "qdeclarativetester.h" +#include <private/qdeclarativedebughelper_p.h> QT_USE_NAMESPACE @@ -538,6 +539,8 @@ int main(int argc, char ** argv) QApplication::setGraphicsSystem("raster"); #endif + QDeclarativeDebugHelper::enableDebugging(); + Application app(argc, argv); app.setApplicationName("QtQmlViewer"); app.setOrganizationName("Nokia"); |