diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-12 14:20:11 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-17 09:10:34 +0000 |
| commit | 94d7d18404645affb544182e0e29a2105049cd6a (patch) | |
| tree | 8e5aa7ac8007d6773e07b118b1f8294992cdbfd4 /qbs/imports | |
| parent | bab9b1bbe12a90b670ba2c4dc08ce44037fbcdb9 (diff) | |
qbs build: Remove some differences to qmake build results.
- Install library symlinks.
- Do not create symlinks for plugins.
- Skip some translations.
- Rename some binaries.
- Do not install the ptracepreload library.
Change-Id: I0faa98034154e3840cd2695cab14b72c34cfc5c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'qbs/imports')
| -rw-r--r-- | qbs/imports/QtcLibrary.qbs | 2 | ||||
| -rw-r--r-- | qbs/imports/QtcPlugin.qbs | 1 | ||||
| -rw-r--r-- | qbs/imports/QtcProduct.qbs | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/qbs/imports/QtcLibrary.qbs b/qbs/imports/QtcLibrary.qbs index 98920ee87f..c0f8a5c95b 100644 --- a/qbs/imports/QtcLibrary.qbs +++ b/qbs/imports/QtcLibrary.qbs @@ -2,7 +2,7 @@ import qbs 1.0 import QtcFunctions QtcProduct { - type: "dynamiclibrary" + type: ["dynamiclibrary", "dynamiclibrary_symlink"] installDir: project.ide_library_path Depends { condition: project.testsEnabled diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs index d1a3c6fd79..c1d6b70ccc 100644 --- a/qbs/imports/QtcPlugin.qbs +++ b/qbs/imports/QtcPlugin.qbs @@ -23,6 +23,7 @@ QtcProduct { name: "Qt.test" } + cpp.createSymlinks: false cpp.defines: base.concat([name.toUpperCase() + "_LIBRARY"]) cpp.installNamePrefix: "@rpath" cpp.rpaths: qbs.targetOS.contains("osx") diff --git a/qbs/imports/QtcProduct.qbs b/qbs/imports/QtcProduct.qbs index 075237d463..daf56077ba 100644 --- a/qbs/imports/QtcProduct.qbs +++ b/qbs/imports/QtcProduct.qbs @@ -3,6 +3,7 @@ import QtcFunctions Product { version: project.qtcreator_version + property bool install: true property string installDir Depends { name: "cpp" } @@ -22,7 +23,7 @@ Product { Group { fileTagsFilter: product.type - qbs.install: true + qbs.install: install qbs.installDir: installDir } } |