summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>2011-04-18 17:20:49 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-02 13:24:22 +0200
commit813135081a8e22b673d2673fc38884b595ec0d33 (patch)
treed6481d1b049ec8dd6fe1582b10adb540a61f3cf8 /tools
parent6494f5c5aaec82cc5bcfd42de559d723edef57b1 (diff)
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 Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry picked from commit 5517cc588c39814530b8bfd957821f55be42acf2) Change-Id: Iacfc5a9b2ca0c2610288cf86f190b4a9950cacd1 Reviewed-on: http://codereview.qt.nokia.com/2436 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlscene/main.cpp2
-rw-r--r--tools/qmlscene/qmlscene.pro2
-rw-r--r--tools/qmlviewer/main.cpp3
-rw-r--r--tools/qmlviewer/qmlviewer.pro2
4 files changed, 2 insertions, 7 deletions
diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 0d6f813a8e..e6603adbd8 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -56,7 +56,6 @@
#include <QtGui/QGraphicsView>
#include <QtDeclarative/qdeclarativecontext.h>
-#include <private/qdeclarativedebughelper_p.h>
// ### This should be private API
#include <qsgitem.h>
@@ -455,7 +454,6 @@ int main(int argc, char ** argv)
Options options;
- QDeclarativeDebugHelper::enableDebugging();
QStringList imports;
for (int i = 1; i < argc; ++i) {
if (*argv[i] != '-' && QFileInfo(argv[i]).exists())
diff --git a/tools/qmlscene/qmlscene.pro b/tools/qmlscene/qmlscene.pro
index 8e252e589f..7a722630e0 100644
--- a/tools/qmlscene/qmlscene.pro
+++ b/tools/qmlscene/qmlscene.pro
@@ -11,7 +11,7 @@ macx: CONFIG -= app_bundle
SOURCES += main.cpp
-CONFIG += console
+CONFIG += console declarative_debug
symbian {
TARGET.EPOCHEAPSIZE = 0x20000 0x5000000
diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index bf99fa5630..cf33c4e365 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/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/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro
index 16579bb167..991d07c5a4 100644
--- a/tools/qmlviewer/qmlviewer.pro
+++ b/tools/qmlviewer/qmlviewer.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
-CONFIG += qt uic
+CONFIG += qt uic declarative_debug
DESTDIR = ../../bin
QT += declarative qtquick1 qtquick1-private