diff options
author | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2011-04-18 15:20:49 (GMT) |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> | 2011-05-04 13:48:46 (GMT) |
commit | 5517cc588c39814530b8bfd957821f55be42acf2 (patch) | |
tree | bc90711b251831aacc75764f528560ccf48e9f7a /tools | |
parent | 35faeb205843c4f0b921d2b878d2d24962c64664 (diff) | |
download | Qt-5517cc588c39814530b8bfd957821f55be42acf2.zip Qt-5517cc588c39814530b8bfd957821f55be42acf2.tar.gz Qt-5517cc588c39814530b8bfd957821f55be42acf2.tar.bz2 |
Introduced a CONFIG option that enables declarative debug services
This replaces the need for applications to explicitly make a call to
enable the debug services, and rather does it in declarative.h when the
'declarative_debug' CONFIG option is used.
Done-with: Kai Koehne
Change-Id: I817f22a4ec9226a1ee2d080c1f5bb75d8599a06e
Reviewed-by: Martin Jones
Reviewed-by: Michael Brasser
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qml/main.cpp | 3 | ||||
-rw-r--r-- | tools/qml/qml.pro | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 24a4940..3b20996 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -52,7 +52,6 @@ #include <QAtomicInt> #include <QLibraryInfo> #include "qdeclarativetester.h" -#include <private/qdeclarativedebughelper_p.h> QT_USE_NAMESPACE @@ -539,8 +538,6 @@ int main(int argc, char ** argv) QApplication::setGraphicsSystem(QLatin1String("raster")); #endif - QDeclarativeDebugHelper::enableDebugging(); - Application app(argc, argv); app.setApplicationName(QLatin1String("QtQmlViewer")); app.setOrganizationName(QLatin1String("Nokia")); diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 9467b70..cf685a8 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qt uic +CONFIG += qt uic declarative_debug DESTDIR = ../../bin include(qml.pri) |