diff options
| author | Richard Weickelt <richard@weickelt.de> | 2021-01-28 22:17:19 +0100 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2021-02-09 09:10:03 +0000 |
| commit | 66067b05faa48efe7e5c6eb81e12766b997ca65d (patch) | |
| tree | 0322059ce9e282c3dcd9b9d5e2b709f9d40f0a00 /qbs.pro | |
| parent | ca486ad0b138d75a6ef73bfc2517424406155d7c (diff) | |
Fix static build with qmake
Building Qbs statically did not work since Qbs 1.17 because the application
target did not correctly track the plugins as a dependency. The condition in
qbs.pro was simply wrong.
Fixes: QBS-1594
Change-Id: Id906423bd0d8d85b7a4f3342df4b9d39f60c4e36
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs.pro')
| -rw-r--r-- | qbs.pro | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -35,12 +35,10 @@ msbuildlib.subdir = src/lib/msbuild msbuildlib.depends = corelib src_app.subdir = src/app src_app.depends = corelib +CONFIG(static, static|shared): src_app.depends += src_plugins src_libexec.subdir = src/libexec src_plugins.subdir = src/plugins -CONFIG(shared, static|shared) { - src_plugins.depends = corelib - src_app.depends += src_plugins -} +CONFIG(shared, static|shared): src_plugins.depends = corelib src_plugins.depends += msbuildlib tests.depends = static_res static_res.file = static-res.pro |