aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-10-15 15:56:06 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-17 14:56:09 +0200
commitcae0ee6a8256144464e0a4d92ccffcde891d0765 (patch)
treeef2f095f23704e8d095c0206c430a48186802e84
parent2946c6849159be12959151142171fa3b8c87f282 (diff)
Debugger: Create InspectorService only when debugging is enabled
Change-Id: Ie9704233012b0bd0e473c5ee6011e6382c61900f Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
-rw-r--r--src/declarative/items/qsgview.cpp6
-rw-r--r--src/qtquick1/util/qdeclarativeview.cpp6
2 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/items/qsgview.cpp b/src/declarative/items/qsgview.cpp
index cd20f6c973..841c8ebe31 100644
--- a/src/declarative/items/qsgview.cpp
+++ b/src/declarative/items/qsgview.cpp
@@ -68,7 +68,8 @@ void QSGViewPrivate::init()
engine.setIncubationController(q->incubationController());
- QDeclarativeInspectorService::instance()->addView(q);
+ if (QDeclarativeDebugService::isDebuggingEnabled())
+ QDeclarativeInspectorService::instance()->addView(q);
}
QSGViewPrivate::QSGViewPrivate()
@@ -78,7 +79,8 @@ QSGViewPrivate::QSGViewPrivate()
QSGViewPrivate::~QSGViewPrivate()
{
- QDeclarativeInspectorService::instance()->removeView(q_func());
+ if (QDeclarativeDebugService::isDebuggingEnabled())
+ QDeclarativeInspectorService::instance()->removeView(q_func());
delete root;
}
diff --git a/src/qtquick1/util/qdeclarativeview.cpp b/src/qtquick1/util/qdeclarativeview.cpp
index fd5f9debf7..8581947c06 100644
--- a/src/qtquick1/util/qdeclarativeview.cpp
+++ b/src/qtquick1/util/qdeclarativeview.cpp
@@ -304,7 +304,8 @@ void QDeclarativeViewPrivate::init()
q->viewport()->setAttribute(Qt::WA_NoSystemBackground);
#endif
- QDeclarativeInspectorService::instance()->addView(q);
+ if (QDeclarativeDebugService::isDebuggingEnabled())
+ QDeclarativeInspectorService::instance()->addView(q);
}
/*!
@@ -312,7 +313,8 @@ void QDeclarativeViewPrivate::init()
*/
QDeclarativeView::~QDeclarativeView()
{
- QDeclarativeInspectorService::instance()->removeView(this);
+ if (QDeclarativeDebugService::isDebuggingEnabled())
+ QDeclarativeInspectorService::instance()->removeView(this);
}
/*! \property QDeclarativeView::source