diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-02 19:29:17 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-17 09:51:19 +0000 |
| commit | 19203dd986c494c25798e746245242b22f767643 (patch) | |
| tree | 8f7a55bf5a71d619a6bc7162fd2f932774e6ceaf /src | |
| parent | 4eb7562c2933eddcd1b552042ec1d12eafd9afcb (diff) | |
qt6: Fix installing Qt on Linux
Change-Id: Id9aa640f013271ff9f3a7f4e0cd70f974efcc116
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/bundledqt/bundledqt.qbs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/shared/bundledqt/bundledqt.qbs b/src/shared/bundledqt/bundledqt.qbs index e055a6ac5..c6f3ebbf8 100644 --- a/src/shared/bundledqt/bundledqt.qbs +++ b/src/shared/bundledqt/bundledqt.qbs @@ -66,8 +66,15 @@ Product { var dir = FileInfo.path(fp); list.push(dir + "/" + basename + ".so"); list.push(dir + "/" + basename + ".so." + Qt.core.versionMajor); - list.push(dir + "/" + basename + ".so." + Qt.core.versionMajor + "." + Qt.core.versionMinor); - list.push(fp); + if (Utilities.versionCompare(Qt.core.version, "6") < 0) { + list.push(dir + "/" + basename + ".so." + + Qt.core.versionMajor + "." + + Qt.core.versionMinor); + } + list.push(dir + "/" + basename + ".so." + + Qt.core.versionMajor + "." + + Qt.core.versionMinor + "." + + Qt.core.versionPatch); } else if (Qt.core.frameworkBuild) { var fp = Qt[mod].libFilePathRelease; |