From 17bab9dce90f9c12d2982b3e5c28cfa17929aa63 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 9 Aug 2010 14:38:54 +0200
Subject: [PATCH] Debugger: Fix compilation if no private headers are specified
Don't try to compile the qml debugger backend (which needs
private headers from Qt) if private headers cannot be located.
Reviewed-by: hjk
---
src/plugins/debugger/debugger.pro | 7 ++++++-
src/plugins/debugger/debuggerrunner.cpp | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 64401106191..165fda07c11 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -112,8 +112,13 @@ include(cdb/cdb.pri)
include(gdb/gdb.pri)
include(script/script.pri)
include(pdb/pdb.pri)
-include(qml/qml.pri)
include(tcf/tcf.pri)
include(shared/shared.pri)
+include(../../private_headers.pri)
+exists($${QT_PRIVATE_HEADERS}/QtDeclarative/private/qdeclarativecontext_p.h) {
+ DEFINES += QML_ENGINE=1
+ include(qml/qml.pri)
+}
+
OTHER_FILES += Debugger.pluginspec
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp
index 6d6fed29eb7..4965fea7194 100644
--- a/src/plugins/debugger/debuggerrunner.cpp
+++ b/src/plugins/debugger/debuggerrunner.cpp
@@ -370,9 +370,11 @@ void DebuggerRunControl::createEngine(const DebuggerStartParameters &sp)
case TcfEngineType:
m_engine = createTcfEngine(sp);
break;
+#if defined(QML_ENGINE)
case QmlEngineType:
m_engine = createQmlEngine(sp);
break;
+#endif
default: {
// Could not find anything suitable.
debuggingFinished();
--
GitLab