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 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: diff --git a/share/qtcreator/debugger/stdtypes.py b/share/qtcreator/debugger/stdtypes.py index 0d8623e89b3..4de5baf4f91 100644 --- a/share/qtcreator/debugger/stdtypes.py +++ b/share/qtcreator/debugger/stdtypes.py @@ -729,13 +729,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) @@ -1098,8 +1109,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) 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,