Merge remote-tracking branch 'origin/4.13' into 4.14

Conflicts:
    src/shared/qbs

Change-Id: If75741825f5788165f9bf2f0248e976811273b6a

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  

scripts/shiboken2tasks.py

@@ -36,7 +36,8 @@ import re
 
 if __name__ == '__main__':
     # qt.shiboken: (<module>) <file>:<line>:[<column>:] 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:

share/qtcreator/debugger/stdtypes.py

@@ -729,11 +729,22 @@ def qdumpHelper__std__string__QNX(d, value, charType, format):
 
 
 def qdumpHelper__std__string__MSVC(d, value, charType, format):
+    try:
         (proxy, buffer, size, alloc) = value.split("p16spp")
-    _BUF_SIZE = int(16 / charType.size())
         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())
     if _BUF_SIZE <= alloc:
+        if proxy is None:
+            data = value.extractPointer()
+        else:
             (proxy, data) = value.split("pp")
+    else:
+        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()
 
+    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)

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"
+                                                             "helper lines",
-                                                             "highlight"
+                                                             "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,