diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-05-17 16:33:10 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2016-06-08 09:12:31 +0000 |
| commit | 4b82633706c82c1daaf1ac0fd0d72c0fff64dfd5 (patch) | |
| tree | 6b56dbb2450f00f3131c21c67117ced4def55094 | |
| parent | 0f0d91a384ce776fb016b0de227fb75bcca0d145 (diff) | |
qbs build: Adapt to introduction of qtc module.
Change-Id: Ifcb94d7960a5aa0a95386b42bb306dd80da97224
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | 3rdparty/elfutils/qbs/imports/ElfUtilsDynamicLib.qbs | 4 | ||||
| -rw-r--r-- | app/app.qbs | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/3rdparty/elfutils/qbs/imports/ElfUtilsDynamicLib.qbs b/3rdparty/elfutils/qbs/imports/ElfUtilsDynamicLib.qbs index 083a581..c2c2524 100644 --- a/3rdparty/elfutils/qbs/imports/ElfUtilsDynamicLib.qbs +++ b/3rdparty/elfutils/qbs/imports/ElfUtilsDynamicLib.qbs @@ -4,10 +4,12 @@ ElfUtilsProduct { type: ["dynamiclibrary", "dynamiclibrary_symlink"] property bool isBackend: false + Depends { name: "qtc" } + Group { fileTagsFilter: product.type qbs.install: true - qbs.installDir: project.ide_library_path + (isBackend ? "/elfutils" : "") + qbs.installDir: qtc.ide_library_path + (isBackend ? "/elfutils" : "") } cpp.rpaths: [ "$ORIGIN/", diff --git a/app/app.qbs b/app/app.qbs index 58d4c5a..9540774 100644 --- a/app/app.qbs +++ b/app/app.qbs @@ -12,6 +12,8 @@ QtcTool { Depends { name: "elf32"; condition: !project.useSystemElfUtils } Depends { name: "elf64"; condition: !project.useSystemElfUtils } + Depends { name: "qtc" } + Depends { name: "Qt.network" } Properties { @@ -22,8 +24,8 @@ QtcTool { cpp.allowUnresolvedSymbols: true cpp.rpaths: [ - "$ORIGIN/" + FileInfo.relativePath('/' + project.ide_libexec_path, - '/' + project.ide_library_path) + '/', + "$ORIGIN/" + FileInfo.relativePath('/' + qtc.ide_libexec_path, + '/' + qtc.ide_library_path) + '/', ] files: [ |