From 0640d343838f91e9230f14bff23861ce2438ca3a Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Wed, 13 Feb 2013 16:55:14 +0100
Subject: [PATCH] QbsProjectManager: Adapt to qbs changes.
We have a shared library now.
Change-Id: Id5d3d879d19f502d79b190b8d28cfef43e8ca825
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
.../qbsprojectmanager/qbsprojectmanager.pro | 2 ++
.../qbsprojectmanager/qbsprojectmanager.qbs | 24 +++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
index 5258cb133fa..778d0b8a508 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
@@ -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\\\"
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
index ecc617edf8b..4879d532075 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
@@ -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: [
--
GitLab