aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-11-09 12:43:32 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-11-09 12:43:32 +0100
commit66e1be8b18967aba395238cc71bb13eff631eaac (patch)
tree69582da0c4b8d29cb671b4bf0f18b9f12a3263da
parent932d25082da2965c55a13785cca848692d9c8b9b (diff)
parent03be661fee6394e08d122e22a40b7ba6e3818155 (diff)
Merge 1.12 into master
-rw-r--r--changelogs/changes-1.12.2.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/changes-1.12.2.md b/changelogs/changes-1.12.2.md
index f578c8357..94ecc68e3 100644
--- a/changelogs/changes-1.12.2.md
+++ b/changelogs/changes-1.12.2.md
@@ -1,2 +1,10 @@
# Important bugfixes
* The Visual Studio 2017 Build Tools are properly supported now.
+* Android NDK r18 is properly supported now.
+* Removed invalid assertion that prevented deriving from the Properties item.
+* Fixed build error on some BSD hosts (QBS-1395).
+* setup-qt fixes:
+ * The QtWebkit module is now properly detected (QBS-1399).
+ * The case of the qtmain library being called "qt5main" is properly handled now (QBS-767).
+ * Building against a Qt that was built with sanitizing support
+ works out of the box now (QBS-1387).