summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-01-31 16:36:17 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-01-31 16:36:17 +0100
commit028a2d908f269958331610b21f86cb03f1957b98 (patch)
tree4fefc28e07411b169412fd7670b039d65f44571c /changelogs
parent606c5cd196e3345b42931306481fe8691f5bb9b6 (diff)
parent764fd1f6ea3f317ad4b50a865ab56b8a8c93080f (diff)
downloadqbs-028a2d908f269958331610b21f86cb03f1957b98.tar.gz
Merge 1.10 into 1.11
Change-Id: I2d6cac6f24144c2c7e463ef7eed2e2c109f50bbf
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/changes-1.10.1.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/changelogs/changes-1.10.1.md b/changelogs/changes-1.10.1.md
index 45b0cfdb3..d0f68a898 100644
--- a/changelogs/changes-1.10.1.md
+++ b/changelogs/changes-1.10.1.md
@@ -2,8 +2,10 @@
* 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 constant rebuilding after moving an external header file (QBS-1285).
* Fix GCC support for "bare metal" systems (QBS-1263, QBS-1265).
* Fix using ids in Depends items (QBS-1264).
* Fix access to module instances in dependency parameters (QBS-1253).
* Fix race condition when creating Inno Setup, NSIS, or WiX installers.
* Fix release builds for Android with NDK r12 and above (QBS-1256).
+* Fix parametrized dependencies in Export and Module items (QBS-1287).