diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-11-22 15:58:01 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-11-23 16:21:05 +0100 |
| commit | 196417ce595690a05d4e72e86ed6938069e2cf02 (patch) | |
| tree | 76f1103844c62fe50999685094a09097cf326542 | |
| parent | 425a82d4121761ff7233111f3f8495e292779535 (diff) | |
Windows: link against debug Qt libs if qbs.enableDebugCode is true
This way "release with debug info" can link against the release libs.
Change-Id: Ib9b888320bcfb0208a6009226d085cf45b1d0566
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | share/qbs/modules/qt/QtModule.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/qt/core/qtcore.qbs | 4 | ||||
| -rw-r--r-- | share/qbs/modules/qt/qtfunctions.js | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/share/qbs/modules/qt/QtModule.qbs b/share/qbs/modules/qt/QtModule.qbs index 4a7e6cfa1..bc4a015f5 100644 --- a/share/qbs/modules/qt/QtModule.qbs +++ b/share/qbs/modules/qt/QtModule.qbs @@ -15,7 +15,7 @@ Module { property string qtLibInfix: qt.core.libInfix property string repository: qt.core.versionMajor === 5 ? 'qtbase' : undefined property string includeDirName: 'Qt' + qtModuleName - property string internalLibraryName: QtFunctions.getLibraryName(qtModuleName + qtLibInfix, qt.core.versionMajor, qbs, cpp) + property string internalLibraryName: QtFunctions.getLibraryName(qtModuleName + qtLibInfix, qt.core.versionMajor, qbs) property string qtVersion: qt.core.version Properties { diff --git a/share/qbs/modules/qt/core/qtcore.qbs b/share/qbs/modules/qt/core/qtcore.qbs index f56a1055c..4c266871f 100644 --- a/share/qbs/modules/qt/core/qtcore.qbs +++ b/share/qbs/modules/qt/core/qtcore.qbs @@ -53,9 +53,9 @@ Module { if (qbs.targetOS === 'windows' && !product.consoleApplication) return ["qtmain" + libInfix + (cpp.debugInformation ? "d" : "") + (qbs.toolchain !== "mingw" ? ".lib" : "")]; } - cpp.dynamicLibraries: qbs.targetOS !== 'mac' ? [QtFunctions.getLibraryName('Core' + libInfix, versionMajor, qbs, cpp)] : undefined + cpp.dynamicLibraries: qbs.targetOS !== 'mac' ? [QtFunctions.getLibraryName('Core' + libInfix, versionMajor, qbs)] : undefined cpp.frameworkPaths: qbs.targetOS === 'mac' ? [libPath] : undefined - cpp.frameworks: qbs.targetOS === 'mac' ? [QtFunctions.getLibraryName('Core' + libInfix, versionMajor, qbs, cpp)] : undefined + cpp.frameworks: qbs.targetOS === 'mac' ? [QtFunctions.getLibraryName('Core' + libInfix, versionMajor, qbs)] : undefined cpp.rpaths: qbs.targetOS === 'linux' ? [libPath] : undefined cpp.positionIndependentCode: versionMajor >= 5 ? true : undefined diff --git a/share/qbs/modules/qt/qtfunctions.js b/share/qbs/modules/qt/qtfunctions.js index 50c6ae6a7..fa0ca7243 100644 --- a/share/qbs/modules/qt/qtfunctions.js +++ b/share/qbs/modules/qt/qtfunctions.js @@ -1,13 +1,13 @@ // helper functions for the Qt modules -function getLibraryName(qtModule, versionMajor, qbs, cpp) +function getLibraryName(qtModule, versionMajor, qbs) { var libName = "Qt"; if (versionMajor >= 5) libName += versionMajor; libName += qtModule; if (qbs.targetOS === 'windows') { - libName += (cpp.debugInformation ? 'd' : ''); + libName += (qbs.enableDebugCode ? 'd' : ''); if (versionMajor < 5) libName += versionMajor; if (qbs.toolchain !== "mingw") |