From 576642a76a6ed6010de633bfcef7f29f9c3f259c Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Thu, 29 Jul 2010 15:03:48 +0200
Subject: [PATCH] Compile fix for QmlObserver
The problem was that qtLibraryTarget only works for libraries (see
mkspecs/features/qt_functions.prf), not apps. Additionally,
because we now have an app bundle inside an app bundle for OS X, the
install name of the library has to be manually modified.
Reviewed-by: con
---
src/libs/qmljsdebugger/qmljsdebugger.pri | 2 +-
src/tools/qml/qmlobserver/qmlobserver.pro | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/libs/qmljsdebugger/qmljsdebugger.pri b/src/libs/qmljsdebugger/qmljsdebugger.pri
index 8987d2e4522..119fde306cf 100644
--- a/src/libs/qmljsdebugger/qmljsdebugger.pri
+++ b/src/libs/qmljsdebugger/qmljsdebugger.pri
@@ -1,5 +1,5 @@
INCLUDEPATH += $$PWD/include
DEPENDPATH += $$PWD $$PWD/include $$PWD/editor
-QT += declarative
+QT += declarative script
LIBS *= -l$$qtLibraryTarget(QmlJSDebugger)
diff --git a/src/tools/qml/qmlobserver/qmlobserver.pro b/src/tools/qml/qmlobserver/qmlobserver.pro
index bdcdc2d8052..501776fc6ca 100644
--- a/src/tools/qml/qmlobserver/qmlobserver.pro
+++ b/src/tools/qml/qmlobserver/qmlobserver.pro
@@ -5,7 +5,14 @@ include(qml.pri)
SOURCES += main.cpp
+# hack to get qtLibraryTarget macro working
+TEMPLATE +=lib
include(../../../libs/qmljsdebugger/qmljsdebugger.pri)
+mac {
+ libraryTarget = $$qtLibraryTarget(QmlJSDebugger)
+}
+TEMPLATE -=lib
+
include(../../../../qtcreator.pri)
include(../../../private_headers.pri)
DESTDIR = $$IDE_BIN_PATH
@@ -15,6 +22,8 @@ mac {
QMAKE_INFO_PLIST=Info_mac.plist
TARGET=QMLObserver
ICON=qml.icns
+ QMAKE_POST_LINK=install_name_tool -change @executable_path/../PlugIns/lib$${libraryTarget}.1.dylib @executable_path/../../../../PlugIns/lib$${libraryTarget}.1.dylib \'$$DESTDIR/$${TARGET}.app/Contents/MacOS/$$TARGET\'
} else {
TARGET=qmlobserver
}
+
--
GitLab