From 009f1c5f7fd9fd6ef47b39f7b0e5e438dd51f641 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 8 Oct 2019 15:43:32 +0200 Subject: Version bump Change-Id: Ibfe460f99c2dae3ccf64169389dd7ddfb11be5ac Reviewed-by: Joerg Bornemann --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 850e74240..63e799cf4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.0 +1.14.1 -- cgit v1.2.3 From 6e630cb5c34c582f97bcee028988d042454eb553 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 9 Oct 2019 17:36:05 +0200 Subject: Qt support: Fix reading plugin prl files Amends 8c290c624d. Change-Id: I9b08b921a46ac56239dd7934f8c3aa9addf70d52 Reviewed-by: Joerg Bornemann --- share/qbs/module-providers/Qt/templates/qml.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qbs/module-providers/Qt/templates/qml.js b/share/qbs/module-providers/Qt/templates/qml.js index 3a86ce695..e6b58d6ec 100644 --- a/share/qbs/module-providers/Qt/templates/qml.js +++ b/share/qbs/module-providers/Qt/templates/qml.js @@ -50,7 +50,7 @@ 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:"); -- cgit v1.2.3 From e69d3bca7cea7785a90fa80e5582edc799fe01fa Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 9 Oct 2019 17:51:23 +0200 Subject: Qt support: Do not put all the QML plugin list content on one line Add a newline after each PRL file entry. Otherwise, a line can get longer than 16K characters, which breaks the MSVC linker. Fixes: QBS-1465 Change-Id: Idb1e39aee8c3ae3ad6ea844723253e7d228bd7de Reviewed-by: Joerg Bornemann --- share/qbs/module-providers/Qt/templates/qml.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qbs/module-providers/Qt/templates/qml.js b/share/qbs/module-providers/Qt/templates/qml.js index e6b58d6ec..df69034fe 100644 --- a/share/qbs/module-providers/Qt/templates/qml.js +++ b/share/qbs/module-providers/Qt/templates/qml.js @@ -57,7 +57,7 @@ function getLibsForPlugin(pluginData, buildVariant, targetOS, toolchain, qtLibDi otherLibsLine = otherLibsLine.replace(/-l([^ ]+)/g, "$1" + ".lib"); } otherLibsLine = otherLibsLine.replace(/\$\$\[QT_INSTALL_LIBS\]/g, qtLibDir); - otherLibs += otherLibsLine; + otherLibs += otherLibsLine + '\n'; } } if (!pluginLib) -- cgit v1.2.3 From 665db9c9dd9ced277eebe7dce0f908dc2cb0825b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 16 Oct 2019 10:04:41 +0200 Subject: Add change log for 1.14.1 Change-Id: Ide01ad4e9abb3e0e1c1ffe3fe10bf14368cb32b6 Reviewed-by: Joerg Bornemann --- changelogs/changes-1.14.1.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changelogs/changes-1.14.1.md 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. -- cgit v1.2.3