From 28b09227e4f872867523f65c1387b424d5738a43 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Wed, 21 Oct 2020 11:19:53 +0200 Subject: [PATCH 1/6] Update Qbs submodule to the top of 1.17 branch Change-Id: I9551c70eaa1b5f2c3f9413f90c8c1d7b7394622f Reviewed-by: Christian Kandeler --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 1f2900f4181..120b460a849 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 1f2900f4181d44b53f2a36ee637b8570f611515f +Subproject commit 120b460a8498526280f316089deeacc8d4d74cb6 From e062f542dd537e66c501bbca6a50f4baf9c78820 Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Mon, 26 Oct 2020 12:11:59 +0100 Subject: [PATCH 2/6] Update Qbs submodule to the top of 1.17 branch Change-Id: Ibcd9d1b05d66038e4a9071cedc5c236cd8edb649 Reviewed-by: Christian Kandeler --- src/shared/qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/qbs b/src/shared/qbs index 120b460a849..6668da028ba 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 120b460a8498526280f316089deeacc8d4d74cb6 +Subproject commit 6668da028ba9a3854a2190191a899efc6bccb2f8 From 6f489a10c14b40c3e182b81853d74a0d63bff361 Mon Sep 17 00:00:00 2001 From: Lukasz Ornatek Date: Mon, 26 Oct 2020 17:17:58 +0100 Subject: [PATCH 3/6] Fix predefined annotations Task-number: QDS-3002 Change-Id: I1ccc586e19d3059a419431188bab58c84441c08c Reviewed-by: Michael Winkelmann Reviewed-by: Thomas Hartmann --- .../components/annotationeditor/annotationcommenttab.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp b/src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp index c7e1ab192c2..29e38362418 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp +++ b/src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp @@ -43,16 +43,16 @@ AnnotationCommentTab::AnnotationCommentTab(QWidget *parent) ui->titleEdit->setModel(new QStringListModel{QStringList{"Description", "Display Condition", - "helper_lines" - "highlight" + "helper lines", + "highlight", "project author", "project confirmed", "project developer", "project distributor", "project modified", - "project type" + "project type", "project version", - "Screen Description" + "Screen Description", "Section"}}); connect(ui->titleEdit, &QComboBox::currentTextChanged, From f0048ae9515d9d1aa67fd82d37b815d2307e71ae Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 21 Oct 2020 14:37:43 +0200 Subject: [PATCH 4/6] shiboken2tasks.py: Fix for Windows File names were not captured since ':' was excluded which can appear in a file name on Windows. Change-Id: I4bbf08c63faa12d3b76d73e927aef1457c09e02f Reviewed-by: Cristian Maureira-Fredes --- scripts/shiboken2tasks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/shiboken2tasks.py b/scripts/shiboken2tasks.py index 024f53cd15c..9465ad7f786 100755 --- a/scripts/shiboken2tasks.py +++ b/scripts/shiboken2tasks.py @@ -36,7 +36,8 @@ import re if __name__ == '__main__': # qt.shiboken: () ::[:] text - pattern = re.compile(r'^qt\.shiboken: \(([^)]+)\) ([^:]+):(\d+):(?:\d+:)? (.*)$') + # file might be c:\ on Windows + pattern = re.compile(r'^qt\.shiboken: \(([^)]+)\) (..[^:]+):(\d+):(?:\d+:)? (.*)$') while True: line = sys.stdin.readline() if not line: From 30b6147e80ae81c075a4704b4924192252e6349b Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 4 Nov 2020 09:44:17 +0100 Subject: [PATCH 5/6] Debugger: fix dumper for msvc release builds ... for std::vector and std::string. Change-Id: I5c823b6c1b7b510344eeea4e1d5db0791d5c8e53 Reviewed-by: hjk Reviewed-by: Christian Stenger --- share/qtcreator/debugger/stdtypes.py | 33 +++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py index bf2f95fcf2e..6c69c4cefdf 100644 --- a/share/qtcreator/debugger/stdtypes.py +++ b/share/qtcreator/debugger/stdtypes.py @@ -730,13 +730,24 @@ def qdumpHelper__std__string__QNX(d, value, charType, format): def qdumpHelper__std__string__MSVC(d, value, charType, format): - (proxy, buffer, size, alloc) = value.split("p16spp") + try: + (proxy, buffer, size, alloc) = value.split("p16spp") + d.check(0 <= size and size <= alloc and alloc <= 100 * 1000 * 1000) + except RuntimeError: + proxy = None + (buffer, size, alloc) = value.split("16spp") + d.check(0 <= size and size <= alloc and alloc <= 100 * 1000 * 1000) _BUF_SIZE = int(16 / charType.size()) - d.check(0 <= size and size <= alloc and alloc <= 100 * 1000 * 1000) if _BUF_SIZE <= alloc: - (proxy, data) = value.split("pp") + if proxy is None: + data = value.extractPointer() + else: + (proxy, data) = value.split("pp") else: - data = value.address() + d.ptrSize() + if proxy is None: + data = value.address() + else: + data = value.address() + d.ptrSize() d.putCharArrayHelper(data, size, charType, format) @@ -1099,8 +1110,18 @@ def qdumpHelper__std__vector__QNX(d, value): (proxy, start, last, end) = value.split("pppp") size = (last - start) // innerType.size() - d.check(0 <= size and size <= 1000 * 1000 * 1000) - d.check(last <= end) + try: + d.check(0 <= size and size <= 1000 * 1000 * 1000) + d.check(last <= end) + except RuntimeError: + if isBool: + (start, last, end, size) = value.split("pppi") + else: + (start, last, end) = value.split("ppp") + size = (last - start) // innerType.size() + d.check(0 <= size and size <= 1000 * 1000 * 1000) + d.check(last <= end) + if size > 0: d.checkPointer(start) d.checkPointer(last) From 524cad144a80f1bddbc0aed09648e9cf307b2ba3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 12 Nov 2020 09:46:02 +0100 Subject: [PATCH 6/6] Add changes file for 4.13.3 Change-Id: I88b845af94e16951b78c23668ba3eba07da594a7 Reviewed-by: Leena Miettinen --- dist/changes-4.13.3.md | 77 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 dist/changes-4.13.3.md diff --git a/dist/changes-4.13.3.md b/dist/changes-4.13.3.md new file mode 100644 index 00000000000..5f8c0ea8661 --- /dev/null +++ b/dist/changes-4.13.3.md @@ -0,0 +1,77 @@ +Qt Creator 4.13.3 +================= + +Qt Creator version 4.13.3 contains bug fixes. + +The most important changes are listed in this document. For a complete list of +changes, see the Git log for the Qt Creator sources that you can check out from +the public Git repository. For example: + + git clone git://code.qt.io/qt-creator/qt-creator.git + git log --cherry-pick --pretty=oneline origin/v4.13.2..v4.13.3 + +General +------- + +* Updated prebuilt binaries to Qt 5.15.2 which fixes drag & drop on macOS + +Editing +------- + +### QML + +* Fixed reformatting of required properties (QTCREATORBUG-24376) +* Fixed importing without specific version for Qt 6 (QTCREATORBUG-24533) + +Projects +-------- + +* Fixed auto-scrolling of compile output window (QTCREATORBUG-24728) +* Fixed GitHub Actions for Qt Creator plugin wizard (QTCREATORBUG-24412) +* Fixed crash with `Manage Sessions` (QTCREATORBUG-24797) + +Qt Quick Designer +----------------- + +* Fixed crash when opening malformed `.ui.qml` file (QTCREATORBUG-24587) + +Debugging +--------- + +### CDB + +* Fixed pretty printing of `std::vector` and `std::string` in release mode + +Analyzer +-------- + +### QML Profiler + +* Fixed crash with `Analyze Current Range` (QTCREATORBUG-24730) + +Platforms +--------- + +### Android + +* Fixed modified state of manifest editor when changing app icons + (QTCREATORBUG-24700) + +Credits for these changes go to: +-------------------------------- +Alexandru Croitor +Christian Kandeler +Christian Stenger +David Schulz +Dominik Holland +Eike Ziller +Fawzi Mohamed +Friedemann Kleint +Ivan Komissarov +Johanna Vanhatapio +Leena Miettinen +Lukasz Ornatek +Robert Löhning +Tim Jenssen +Ville Voutilainen +Xiaofeng Wang