diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-03-04 14:04:07 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-03-04 14:04:07 +0100 |
| commit | 3ba9db48edcf13643fe744ffa4a46a4e03ab4990 (patch) | |
| tree | 11a43e4ffb884719999015280927e23fce29a2fa /qtcreator.qbs | |
| parent | 73c5eae31103c7906c5eb70bc4df0c8af787d9b8 (diff) | |
| parent | 3ee64ed69938cce93a7cfd90926f7d8b91782366 (diff) | |
Merge remote-tracking branch 'origin/3.1'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
Diffstat (limited to 'qtcreator.qbs')
| -rw-r--r-- | qtcreator.qbs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qtcreator.qbs b/qtcreator.qbs index 5b575391eb..490fafb2b5 100644 --- a/qtcreator.qbs +++ b/qtcreator.qbs @@ -16,19 +16,20 @@ Project { property pathList additionalPlugins: [] property pathList additionalLibs: [] property pathList additionalTools: [] + property string libDirName: "lib" property string ide_library_path: { if (qbs.targetOS.contains("osx")) return ide_app_target + ".app/Contents/PlugIns" else if (qbs.targetOS.contains("windows")) return ide_app_path else - return "lib/qtcreator" + return libDirName + "/qtcreator" } property string ide_plugin_path: { if (qbs.targetOS.contains("osx")) return ide_library_path else if (qbs.targetOS.contains("windows")) - return "lib/qtcreator/plugins" + return libDirName + "/qtcreator/plugins" else return ide_library_path + "/plugins" } @@ -47,7 +48,7 @@ Project { property bool testsEnabled: qbs.getenv("TEST") || qbs.buildVariant === "debug" property stringList generalDefines: [ "QT_CREATOR", - 'IDE_LIBRARY_BASENAME="lib"', + 'IDE_LIBRARY_BASENAME="' + libDirName + '"', "QT_DISABLE_DEPRECATED_BEFORE=0x040900", "QT_NO_CAST_TO_ASCII", "QT_NO_CAST_FROM_ASCII" |