Commit 5b4a85df authored by Lasse Holmstedt's avatar Lasse Holmstedt

QML Observer: reverted hack, fixed compilation for ibmake

see 576642a7 for details
parent 719b7757
......@@ -15,6 +15,19 @@ defineReplace(targetPath) {
return($$replace(1, /, $$QMAKE_DIR_SEP))
}
defineReplace(qtLibraryName) {
unset(LIBRARY_NAME)
LIBRARY_NAME = $$1
CONFIG(debug, debug|release) {
!debug_and_release|build_pass {
mac:RET = $$member(LIBRARY_NAME, 0)_debug
else:win32:RET = $$member(LIBRARY_NAME, 0)d
}
}
isEmpty(RET):RET = $$LIBRARY_NAME
return($$RET)
}
# For use in custom compilers which just copy files
win32:i_flag = i
defineReplace(stripSrcDir) {
......
......@@ -2,4 +2,4 @@ INCLUDEPATH += $$PWD/include
DEPENDPATH += $$PWD $$PWD/include $$PWD/editor
QT += declarative script
LIBS *= -l$$qtLibraryTarget(QmlJSDebugger)
LIBS *= -l$$qtLibraryName(QmlJSDebugger)
LIBS *= -l$$qtLibraryTarget(Utils)
LIBS *= -l$$qtLibraryName(Utils)
......@@ -4,18 +4,16 @@ QT += declarative
include(qml.pri)
SOURCES += main.cpp
include(../../../../qtcreator.pri)
# hack to get qtLibraryTarget macro working
TEMPLATE +=lib
include(../../../libs/qmljsdebugger/qmljsdebugger.pri)
include(../../../libs/utils/utils.pri)
mac {
qmljsLibraryTarget = $$qtLibraryTarget(QmlJSDebugger)
utilsLibraryTarget = $$qtLibraryTarget(Utils)
qmljsLibraryTarget = $$qtLibraryName(QmlJSDebugger)
utilsLibraryTarget = $$qtLibraryName(Utils)
}
TEMPLATE -=lib
include(../../../../qtcreator.pri)
include(../../../private_headers.pri)
DESTDIR = $$IDE_BIN_PATH
include(../../../rpath.pri)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment