diff options
author | Eike Ziller <eike.ziller@qt.io> | 2016-11-21 17:01:15 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2016-11-21 17:01:15 +0100 |
commit | 0596699dbd0e36c1aa5d75939fd2fad2d55eec37 (patch) | |
tree | 310d65e389a5d763813c59403e48b393a8716985 /dist | |
parent | 584a8c2afea8436ae8c66f21636565e17195ef4d (diff) | |
parent | bc6f90cb2a811269d3559c948ad4e7dce7757c63 (diff) | |
download | qt-creator-0596699dbd0e36c1aa5d75939fd2fad2d55eec37.tar.gz |
Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
src/plugins/qbsprojectmanager/qbsconstants.h
Change-Id: I3800e580faaccdc1dd08da851956ba677d33df51
Diffstat (limited to 'dist')
-rw-r--r-- | dist/changes-4.1.1.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/dist/changes-4.1.1.md b/dist/changes-4.1.1.md index 938843162b..096afd22f2 100644 --- a/dist/changes-4.1.1.md +++ b/dist/changes-4.1.1.md @@ -45,6 +45,8 @@ Debugging * CDB * Fixed display order of vectors in vectors (QTCREATORBUG-16813) * Fixed display of QList contents (QTCREATORBUG-16750) +* QML + * Fixed that expansion state was reset when stepping QML Profiler @@ -69,4 +71,12 @@ Android iOS +* Fixed simulator support with Xcode 8 (QTCREATORBUG-16942) + Known issue: Qt Creator is blocked until simulator finishes starting +* Fixed that standard paths reported by QStandardPaths were wrong when + running on simulator (QTCREATORBUG-13655) * Fixed QML debugging on device (QTCREATORBUG-15812) + +QNX + +* Fixed QML debugging (QTCREATORBUG-17208) |