diff options
author | The Qt Project <gerrit-noreply@qt-project.org> | 2020-02-05 13:07:43 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2020-02-05 13:07:43 +0000 |
commit | 40ae3324be2790e8fa0c19fe21c6551084970dcc (patch) | |
tree | 2fddf532a1f156e43b2bc5f76f5d67922c51403b /share | |
parent | d853817741ebf62721a32540775f47d08668712b (diff) | |
parent | 7e91a76534f5d45ea0901074d4afafacb2fcec9b (diff) |
Merge "Merge branch '1.15' into master"
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 5 | ||||
-rw-r--r-- | share/qbs/modules/cpp/msvc.js | 5 | ||||
-rw-r--r-- | share/qbs/modules/java/utils.js | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index 6960b15d9..b30cdfd7a 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -652,11 +652,14 @@ function doSetupLibraries(modInfo, qtProps, debugBuild, nonExistingPrlFiles, and var prlFilePath = modInfo.isPlugin ? FileInfo.joinPaths(qtProps.pluginPath, modInfo.pluginData.type) : (modInfo.libDir ? modInfo.libDir : qtProps.libraryPath); + var libDir = prlFilePath; if (isFramework(modInfo, qtProps)) { prlFilePath = FileInfo.joinPaths(prlFilePath, libraryBaseName(modInfo, qtProps, false) + ".framework"); + libDir = prlFilePath; + if (Utilities.versionCompare(qtProps.qtVersion, "5.14") >= 0) + prlFilePath = FileInfo.joinPaths(prlFilePath, "Resources"); } - var libDir = prlFilePath; var baseName = libraryBaseName(modInfo, qtProps, debugBuild); if (!qtProps.mkspecName.startsWith("win") && !isFramework(modInfo, qtProps)) baseName = "lib" + baseName; diff --git a/share/qbs/modules/cpp/msvc.js b/share/qbs/modules/cpp/msvc.js index 479f7f416..c06286cbe 100644 --- a/share/qbs/modules/cpp/msvc.js +++ b/share/qbs/modules/cpp/msvc.js @@ -593,7 +593,10 @@ function prepareLinker(project, product, inputs, outputs, input, output) { cmd.responseFileSeparator = useCompilerDriver ? ' ' : '\n'; cmd.stdoutFilterFunction = function(output) { res = output.replace(/^.*performing full link.*\s*/, ""); - return res.replace(/^ *Creating library.*\r\n$/, ""); + res = res.replace(/^ *Creating library.*\s*/, ""); + res = res.replace(/^\s*Generating code\s*/, ""); + res = res.replace(/^\s*Finished generating code\s*/, ""); + return res; }; commands.push(cmd); diff --git a/share/qbs/modules/java/utils.js b/share/qbs/modules/java/utils.js index ae0c1356b..0e11b7d3e 100644 --- a/share/qbs/modules/java/utils.js +++ b/share/qbs/modules/java/utils.js @@ -136,7 +136,7 @@ function findJdkVersion(compilerFilePath) { var p = new Process(); try { p.exec(compilerFilePath, ["-version"]); - var re = /^javac (([0-9]+(?:\.[0-9]+){0,2})(_([0-9]+))?)$/m; + var re = /^javac (([0-9]+(?:\.[0-9]+){0,2})(_([0-9]+))?)(.*)?$/m; var match = p.readStdErr().trim().match(re); if (!match) match = p.readStdOut().trim().match(re); |