diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-17 00:19:39 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-17 08:44:03 +0000 |
| commit | b5953a0c2967bb126c6281ffb1a6c3f625f9ed1f (patch) | |
| tree | f61d9cec6faf750bd06ceb521b22b305f632780e /dist | |
| parent | 071e04c18f1218a01a88f0dffe8be83301f74f7a (diff) | |
Fix Qt .zip distribution building with Qt < 5.6.
Change-Id: I0b4a248d85f70d6f16cd6bc8443560b938d4e354
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/dist.qbs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/dist/dist.qbs b/dist/dist.qbs index 94f25fbce..3ffd8baa9 100644 --- a/dist/dist.qbs +++ b/dist/dist.qbs @@ -23,13 +23,18 @@ Product { Depends { name: "archiver" } Depends { name: "Qt.core" } + readonly property bool hasQt56: { + if (Qt.core.versionMajor === 5) + return Qt.core.versionMinor >= 6; + return Qt.core.versionMajor > 5; + } + property stringList windeployqtArgs: [ "--no-svg", "--no-system-d3d-compiler", "--no-angle", - "--no-opengl-sw", "--no-compiler-runtime", - ] + ].concat(hasQt56 ? ["--no-opengl-sw"] : []) // List of path prefixes to be excluded from the generated archive property stringList excludedPathPrefixes: [ |