summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-01-16 15:24:50 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-01-17 09:09:30 +0000
commitd3e137c20248f6852a91341782011ca58534ed21 (patch)
treece9935dffb3deb8cc5625a57f9a62f74390cb025 /changelogs
parentd9b6a84900552b55117c8034743964726c2bc102 (diff)
downloadqbs-d3e137c20248f6852a91341782011ca58534ed21.tar.gz
ModuleLoader: Fix order of module merging
Dependencies must be merged before their dependents, because the merging process for the former sets up data to be consumed by the merging process for the latter. Task-number: QBS-1275 Change-Id: Ide9146add79bf2b4fcf80d7ce95ac1d9d4ac20b2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/changes-1.10.1.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/changelogs/changes-1.10.1.md b/changelogs/changes-1.10.1.md
index 213251f49..45b0cfdb3 100644
--- a/changelogs/changes-1.10.1.md
+++ b/changelogs/changes-1.10.1.md
@@ -1,4 +1,5 @@
# Important bugfixes
+* Fix assertion on project loading (QBS-1275).
* Fix crash when the "original" value is misused (QBS-1255).
* Fix qtquickcompiler support for qml files in subdirectories (QBS-1261).
* Fix GCC support for "bare metal" systems (QBS-1263, QBS-1265).