summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2019-10-16 15:43:53 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2019-10-16 15:43:53 +0200
commitd92f3ec645b6f2cd47c3eec4213c528436afec5f (patch)
tree46361d2fe8d75a41a13a58fac359ab220132f9c4
parentd9cfadeb6a433b5a67aaf8b8c5cf30a6fb9e0ffc (diff)
parent665db9c9dd9ced277eebe7dce0f908dc2cb0825b (diff)
Merge 1.14 into master
-rw-r--r--changelogs/changes-1.14.1.md4
-rw-r--r--share/qbs/module-providers/Qt/templates/qml.js4
2 files changed, 6 insertions, 2 deletions
diff --git a/changelogs/changes-1.14.1.md b/changelogs/changes-1.14.1.md
new file mode 100644
index 000000000..695ee3c76
--- /dev/null
+++ b/changelogs/changes-1.14.1.md
@@ -0,0 +1,4 @@
+# Important bugfixes
+* Qt support: Fix static builds on Windows (QBS-1465).
+* Qt support: Fix static builds with Qt >= 5.13.1.
+* Darwin: Adapt to Xcode 11.
diff --git a/share/qbs/module-providers/Qt/templates/qml.js b/share/qbs/module-providers/Qt/templates/qml.js
index 3a86ce695..df69034fe 100644
--- a/share/qbs/module-providers/Qt/templates/qml.js
+++ b/share/qbs/module-providers/Qt/templates/qml.js
@@ -50,14 +50,14 @@ function getLibsForPlugin(pluginData, buildVariant, targetOS, toolchain, qtLibDi
continue;
if (line.startsWith("QMAKE_PRL_TARGET"))
pluginLib = FileInfo.joinPaths(pluginData.path, getPrlRhs(line));
- if (line.startsWith("QMAKE_PRL_LIBS")) {
+ if (line.startsWith("QMAKE_PRL_LIBS = ")) {
var otherLibsLine = ' ' + getPrlRhs(line);
if (toolchain.contains("msvc")) {
otherLibsLine = otherLibsLine.replace(/ -L/g, " /LIBPATH:");
otherLibsLine = otherLibsLine.replace(/-l([^ ]+)/g, "$1" + ".lib");
}
otherLibsLine = otherLibsLine.replace(/\$\$\[QT_INSTALL_LIBS\]/g, qtLibDir);
- otherLibs += otherLibsLine;
+ otherLibs += otherLibsLine + '\n';
}
}
if (!pluginLib)