diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-08-09 00:25:24 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-08-09 17:51:42 +0000 |
| commit | ae08a8440e8a3c71115af750f54766c124fe7182 (patch) | |
| tree | 4f6642ee81e64d134a4ec6cae8244af49e4c4643 /src/packages | |
| parent | a4459844ff4d344cb3c0ec9b97a92bef383d6339 (diff) | |
Clean up the archive product a bit
Base it on QbsProduct, which handles some bits automatically.
Change-Id: I280e6b31cddfa8f1551e7282e8d946d70f8fb60b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/packages')
| -rw-r--r-- | src/packages/archive/archive.qbs | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/packages/archive/archive.qbs b/src/packages/archive/archive.qbs index 589f39875..1ce23147e 100644 --- a/src/packages/archive/archive.qbs +++ b/src/packages/archive/archive.qbs @@ -4,7 +4,7 @@ import qbs.ModUtils import qbs.Process import qbs.TextFile -Product { +QbsProduct { Depends { name: "qbs-config" } Depends { name: "qbs-config-ui" } Depends { name: "qbs-qmltypes" } @@ -13,7 +13,6 @@ Product { Depends { name: "qbs-setup-toolchains" } Depends { name: "qbs_app" } Depends { name: "qbs_processlauncher" } - Depends { name: "qbsversion" } Depends { name: "qbscore" } Depends { name: "qbsqtprofilesetup" } Depends { name: "qbs_cpp_scanner" } @@ -22,20 +21,14 @@ Product { Depends { name: "qbs resources" } 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-compiler-runtime", - ].concat(hasQt56 ? ["--no-opengl-sw"] : []) + "--no-opengl-sw", + ] // List of path prefixes to be excluded from the generated archive property stringList excludedPathPrefixes: [ |