Skip to content
Snippets Groups Projects
Commit 576642a7 authored by Lasse Holmstedt's avatar Lasse Holmstedt
Browse files

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
parent 4a16cb9c
No related branches found
No related tags found
No related merge requests found
INCLUDEPATH += $$PWD/include INCLUDEPATH += $$PWD/include
DEPENDPATH += $$PWD $$PWD/include $$PWD/editor DEPENDPATH += $$PWD $$PWD/include $$PWD/editor
QT += declarative QT += declarative script
LIBS *= -l$$qtLibraryTarget(QmlJSDebugger) LIBS *= -l$$qtLibraryTarget(QmlJSDebugger)
...@@ -5,7 +5,14 @@ include(qml.pri) ...@@ -5,7 +5,14 @@ include(qml.pri)
SOURCES += main.cpp SOURCES += main.cpp
# hack to get qtLibraryTarget macro working
TEMPLATE +=lib
include(../../../libs/qmljsdebugger/qmljsdebugger.pri) include(../../../libs/qmljsdebugger/qmljsdebugger.pri)
mac {
libraryTarget = $$qtLibraryTarget(QmlJSDebugger)
}
TEMPLATE -=lib
include(../../../../qtcreator.pri) include(../../../../qtcreator.pri)
include(../../../private_headers.pri) include(../../../private_headers.pri)
DESTDIR = $$IDE_BIN_PATH DESTDIR = $$IDE_BIN_PATH
...@@ -15,6 +22,8 @@ mac { ...@@ -15,6 +22,8 @@ mac {
QMAKE_INFO_PLIST=Info_mac.plist QMAKE_INFO_PLIST=Info_mac.plist
TARGET=QMLObserver TARGET=QMLObserver
ICON=qml.icns 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 { } else {
TARGET=qmlobserver TARGET=qmlobserver
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment