summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-01-19 10:58:43 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-01-19 10:58:43 +0100
commit13e8c5371709c9e1c337c664062aec19930c306b (patch)
tree5cf5ad7eeffbf136f0bfcb17375a118d8160f584 /changelogs
parent8ba1aa806bdb313161acad22d9b16c33b295e607 (diff)
parentd3e137c20248f6852a91341782011ca58534ed21 (diff)
downloadqbs-13e8c5371709c9e1c337c664062aec19930c306b.tar.gz
Merge 1.10 into 1.11
Change-Id: Iae805216e202e582923a70733caa842e8070cc7e
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).