diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-10 11:40:54 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-02-10 13:30:04 +0000 |
| commit | c5f1d2adcee18a81ccac56b94b1458143732ba15 (patch) | |
| tree | 0bb1761ebbbf27a96ffca599bb648fafcb49972c /src/shared/bundledqt/bundledqt.qbs | |
| parent | c369339dee49255407a67228b3af20a9be6b86b7 (diff) | |
| download | qbs-c5f1d2adcee18a81ccac56b94b1458143732ba15.tar.gz | |
qt6: fix Qt library version in bundledqt.qbs
Qt6 uses "A" version instead of "6"
Change-Id: I1e424f0f62659b481545511c9ba5eec3b2f92892
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/shared/bundledqt/bundledqt.qbs')
| -rw-r--r-- | src/shared/bundledqt/bundledqt.qbs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/shared/bundledqt/bundledqt.qbs b/src/shared/bundledqt/bundledqt.qbs index 03630641d..e055a6ac5 100644 --- a/src/shared/bundledqt/bundledqt.qbs +++ b/src/shared/bundledqt/bundledqt.qbs @@ -79,7 +79,9 @@ Product { var suffix = ".framework/"; var frameworkPath = fp.substr(0, fp.lastIndexOf(suffix) + suffix.length - 1); var versionsPath = frameworkPath + "/Versions"; - var versionPath = versionsPath + "/" + Qt.core.versionMajor; + var versionName = Utilities.versionCompare(Qt.core.version, "6") >= 0 + ? "A" : Qt.core.versionMajor; + var versionPath = versionsPath + "/" + versionName; list.push(frameworkPath + "/Resources"); list.push(versionPath + "/Resources/Info.plist"); list.push(versionPath + "/" + FileInfo.fileName(fp)); |