diff options
| author | Richard Weickelt <richard@weickelt.de> | 2019-11-20 07:22:06 +0100 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2019-11-20 07:22:39 +0100 |
| commit | 0c17bb8a6c38681c3f0fff92f7ebebfc7a6aabc9 (patch) | |
| tree | 4d3eccd3e449b8bf5b486777a7d5efff385772f0 /share | |
| parent | a0ab55da7b91f00701de9a11a482dd12ba8192b4 (diff) | |
| parent | de04ecbbf59b361320a174ee0117c2cfa8c10012 (diff) | |
Merge branch '1.15' into master
Change-Id: I1755128478ccaa23952a482ed3ea546898807f62
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/cpp/DarwinGCC.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-mingw.qbs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index 8f3fe72fc..9332603ec 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -176,7 +176,7 @@ UnixGCC { ? [minimumDarwinVersionCompilerFlag + "=" + minimumDarwinVersion] : [] readonly property stringList minimumDarwinVersionLinkerFlags: - (minimumDarwinVersionLinkerFlag && minimumDarwinVersion) + (minimumDarwinVersionLinkerFlag && minimumDarwinVersion && compilerVersionMajor < 11) ? [minimumDarwinVersionLinkerFlag, minimumDarwinVersion] : [] readonly property var buildEnv: { diff --git a/share/qbs/modules/cpp/windows-mingw.qbs b/share/qbs/modules/cpp/windows-mingw.qbs index fe9fd4bf8..ffed76cdd 100644 --- a/share/qbs/modules/cpp/windows-mingw.qbs +++ b/share/qbs/modules/cpp/windows-mingw.qbs @@ -44,7 +44,7 @@ MingwBaseModule { property string windresName: "windres" + compilerExtension property path windresPath: { - var filePath = toolchainPrefix + windresName; + var filePath = toolchainPathPrefix + windresName; if (!File.exists(filePath)) filePath = FileInfo.joinPaths(toolchainInstallPath, windresName); return filePath; |