diff --git a/src/libs/qmljsdebugger/qmljsdebugger.pri b/src/libs/qmljsdebugger/qmljsdebugger.pri index 8987d2e45225fa0de67b951f9e2716039c96b8f1..119fde306cfc797adeac6816bfc3641c78ff8335 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 bdcdc2d8052d79d0226cacc90d0808ecadf351f2..501776fc6ca3b8fa24cc9ef9edc2f0f851074fb3 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 } +