From d3e137c20248f6852a91341782011ca58534ed21 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 16 Jan 2018 15:24:50 +0100 Subject: 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 --- changelogs/changes-1.10.1.md | 1 + 1 file changed, 1 insertion(+) (limited to 'changelogs') 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). -- cgit v1.2.3