From 110c58d09eaa9eba81d2c30b0b7c3e438d19b2ef Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Tue, 9 Nov 2010 14:53:21 +1000
Subject: [PATCH] make compile against 4.7 mainline
---
share/qtcreator/qml/qmlobserver/main.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/share/qtcreator/qml/qmlobserver/main.cpp b/share/qtcreator/qml/qmlobserver/main.cpp
index 464b6a83a8a..5189a70872c 100644
--- a/share/qtcreator/qml/qmlobserver/main.cpp
+++ b/share/qtcreator/qml/qmlobserver/main.cpp
@@ -362,8 +362,10 @@ int main(int argc, char ** argv)
if (stayOnTop)
wflags |= Qt::WindowStaysOnTopHint;
+#if defined(QMLJSDEBUGGER)
// enable remote debugging
QDeclarativeDebugHelper::enableDebugging();
+#endif
QDeclarativeViewer *viewer = new QDeclarativeViewer(0, wflags);
viewer->setAttribute(Qt::WA_DeleteOnClose, true);
--
GitLab