From e17d1491c48eea1504fe073cc5b5e6b729a5de60 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 17 Sep 2010 13:46:26 +0200
Subject: [PATCH] QmlJSDebugger: Fix compilation of user programs using the
observer on Mac
Copy the libs to the application bundle.
---
.../qtcreator/qmljsdebugger/private_headers.pri | 17 +++++++++++++++++
.../qmljsdebugger/qmljsdebugger-lib.pri | 4 +---
share/qtcreator/static.pro | 3 ++-
3 files changed, 20 insertions(+), 4 deletions(-)
create mode 100644 share/qtcreator/qmljsdebugger/private_headers.pri
diff --git a/share/qtcreator/qmljsdebugger/private_headers.pri b/share/qtcreator/qmljsdebugger/private_headers.pri
new file mode 100644
index 00000000000..fc353961781
--- /dev/null
+++ b/share/qtcreator/qmljsdebugger/private_headers.pri
@@ -0,0 +1,17 @@
+# Try to find location of Qt private headers (see README)
+isEmpty(QT_PRIVATE_HEADERS) {
+ QT_PRIVATE_HEADERS = $$[QT_INSTALL_HEADERS]
+}
+
+INCLUDEPATH += \
+ $${QT_PRIVATE_HEADERS} \
+ $${QT_PRIVATE_HEADERS}/QtCore \
+ $${QT_PRIVATE_HEADERS}/QtGui \
+ $${QT_PRIVATE_HEADERS}/QtScript \
+ $${QT_PRIVATE_HEADERS}/QtDeclarative
+DEPENDPATH += \
+ $${QT_PRIVATE_HEADERS} \
+ $${QT_PRIVATE_HEADERS}/QtCore \
+ $${QT_PRIVATE_HEADERS}/QtGui \
+ $${QT_PRIVATE_HEADERS}/QtScript \
+ $${QT_PRIVATE_HEADERS}/QtDeclarative
diff --git a/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri
index a39a2a415eb..1ca47b8b7f1 100644
--- a/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri
+++ b/share/qtcreator/qmljsdebugger/qmljsdebugger-lib.pri
@@ -8,9 +8,7 @@ contains(CONFIG, dll) {
DEFINES += BUILD_QMLJSDEBUGGER_STATIC_LIB
}
-## Once is not enough
-include($$PWD/../../../src/private_headers.pri)
-include($$PWD/../../../src/private_headers.pri)
+include($$PWD/private_headers.pri)
include($$PWD/editor/editor.pri)
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index f3c229c84a1..92c0bc40b69 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -32,7 +32,8 @@ DATA_DIRS = \
gdbmacros \
qmldesigner \
qmlicons \
- qml-type-descriptions
+ qml-type-descriptions \
+ qmljsdebugger
!isEmpty(copydata) {
--
GitLab