From 813135081a8e22b673d2673fc38884b595ec0d33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Mon, 18 Apr 2011 17:20:49 +0200
Subject: 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>
---
 tools/qmlscene/main.cpp       | 2 --
 tools/qmlscene/qmlscene.pro   | 2 +-
 tools/qmlviewer/main.cpp      | 3 ---
 tools/qmlviewer/qmlviewer.pro | 2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'tools')

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
 
-- 
cgit v1.2.3