diff options
Diffstat (limited to 'src/shared/bundledqt/bundledqt.qbs')
| -rw-r--r-- | src/shared/bundledqt/bundledqt.qbs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/shared/bundledqt/bundledqt.qbs b/src/shared/bundledqt/bundledqt.qbs index 5995ae4d6..e055a6ac5 100644 --- a/src/shared/bundledqt/bundledqt.qbs +++ b/src/shared/bundledqt/bundledqt.qbs @@ -1,6 +1,7 @@ import qbs import qbs.File import qbs.FileInfo +import qbs.Utilities Product { Depends { name: "qbsbuildconfig" } @@ -8,6 +9,10 @@ Product { Depends { name: "Qt.test"; condition: project.withTests === true } Depends { name: "Qt.script"; condition: !qbsbuildconfig.useBundledQtScript; required: false } Depends { + name: "Qt.core5compat"; + condition: Utilities.versionCompare(Qt.core.version, "6") >= 0 + } + Depends { name: "Qt"; submodules: [ "dbus", "xcb_qpa_lib-private" ]; required: false @@ -74,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)); @@ -105,6 +112,8 @@ Product { return libraries; } + fileTags: [] + qbs.install: true qbs.installDir: qbsbuildconfig.libInstallDir qbs.installSourceBase: qbs.targetOS.contains("windows") ? Qt.core.binPath : Qt.core.libPath |