Commit 0640d343 authored by Christian Kandeler's avatar Christian Kandeler

QbsProjectManager: Adapt to qbs changes.

We have a shared library now.

Change-Id: Id5d3d879d19f502d79b190b8d28cfef43e8ca825
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 2efcd461
......@@ -11,6 +11,8 @@ isEmpty(QBS_BUILD_DIR): QBS_BUILD_DIR = $$(QBS_BUILD_DIR)
QBSLIBDIR = $$QBS_BUILD_DIR/lib
include($$QBS_SOURCE_DIR/src/lib/use.pri)
linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$QBSLIBDIR\'
macx:QMAKE_LFLAGS += -Wl,-rpath,$$QBSLIBDIR
QBS_SOURCE_DIR_FWD_SLASHES = $$replace(QBS_SOURCE_DIR, \\\\, /)
DEFINES += QBS_SOURCE_DIR=\\\"$$QBS_SOURCE_DIR_FWD_SLASHES\\\"
......
......@@ -31,22 +31,20 @@ QtcPlugin {
'QML_BUILD_STATIC_LIB'
])
cpp.staticLibraries: {
if (qbs.targetOS === "windows") {
if (qbs.enableDebugCode) {
return qbs_build_dir + "/lib/qbscored.lib"
} else {
return qbs_build_dir + "/lib/qbscore.lib"
}
} else {
return qbs_build_dir + "/lib/libqbscore.a"
}
}
cpp.libraryPaths: base.concat([qbs_build_dir + "/lib"])
cpp.rpaths: cpp.libraryPaths
cpp.dynamicLibraries: {
var libs = []
if (qbs.targetOS === "windows") {
return "shell32"
libs.push("shell32")
if (qbs.enableDebugCode)
libs.push("qbscored")
else
libs.push("qbscore")
} else {
libs.push("qbscore")
}
return libs
}
files: [
......
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