Merge remote-tracking branch 'origin/4.8'

 Conflicts:
	src/plugins/winrt/winrtdevicefactory.cpp

Change-Id: I33b8697e2ebf2bea051d7f1144449e0743ee16a5

8 files changed, 151 insertions, 128 deletions

diff --git a/share/qtcreator/debugger/cdbbridge.py b/share/qtcreator/debugger/cdbbridge.py
index b7ed57d106..2e7b0a073d 100644
--- a/share/qtcreator/debugger/cdbbridge.py
+++ b/share/qtcreator/debugger/cdbbridge.py
@@ -323,15 +323,18 @@ class Dumper(DumperBase):
         return namespace
 
     def qtVersion(self):
-        qtVersion = self.parseAndEvaluate('((void**)&%s)[2]' % self.qtHookDataSymbolName()).integer()
-        if qtVersion is None and self.qtCoreModuleName() is not None:
-            try:
-                versionValue = cdbext.call(self.qtCoreModuleName() + '!qVersion()')
-                version = self.extractCString(self.fromNativeValue(versionValue).address())
-                (major, minor, patch) = version.decode('latin1').split('.')
-                qtVersion = 0x10000 * int(major) + 0x100 * int(minor) + int(patch)
-            except:
-                pass
+        qtVersion = None
+        try:
+            qtVersion = self.parseAndEvaluate('((void**)&%s)[2]' % self.qtHookDataSymbolName()).integer()
+        except:
+            if self.qtCoreModuleName() is not None:
+                try:
+                    versionValue = cdbext.call(self.qtCoreModuleName() + '!qVersion()')
+                    version = self.extractCString(self.fromNativeValue(versionValue).address())
+                    (major, minor, patch) = version.decode('latin1').split('.')
+                    qtVersion = 0x10000 * int(major) + 0x100 * int(minor) + int(patch)
+                except:
+                    pass
         if qtVersion is None:
             qtVersion = self.fallbackQtVersion
         self.qtVersion = lambda: qtVersion
diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 8ad0e52a9e..6446131608 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -1103,7 +1103,8 @@ class DumperBase:
     def putType(self, typish, priority = 0):
         # Higher priority values override lower ones.
         if priority >= self.currentType.priority:
-            if isinstance(typish, str):
+            types = (str) if sys.version_info[0] >= 3 else (str, unicode)
+            if isinstance(typish, types):
                 self.currentType.value = typish
             else:
                 self.currentType.value = typish.name
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
index 3701a4c1ff..e50efacfe7 100644
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -249,12 +249,6 @@ class Dumper(DumperBase):
             if bitsize == 0:
                 bitsize = f.GetType().GetByteSize() * 8
             bitpos = f.GetOffsetInBits()
-            # Correction for some bitfields. Size 0 can occur for
-            # types without debug information.
-            if bitsize > 0:
-                pass
-                #bitpos = bitpos % bitsize
-                #bitpos = bitpos % 8 # Reported type is always wrapping type!
             fieldBits[f.name] = (bitsize, bitpos, f.IsBitfield())
 
         # Normal members and non-empty base classes.
@@ -1638,7 +1632,6 @@ class Dumper(DumperBase):
 
     def activateFrame(self, args):
         self.reportToken(args)
-        thread = args['thread']
         self.currentThread().SetSelectedFrame(args['index'])
         self.reportResult('', args)
 
@@ -1747,13 +1740,39 @@ class Dumper(DumperBase):
         value = frame.FindVariable(exp)
         return value
 
+    def setValue(self, address, typename, value):
+        sbtype = self.lookupNativeType(typename)
+        error = lldb.SBError()
+        sbaddr = lldb.SBAddress(address, self.target)
+        sbvalue = self.target.CreateValueFromAddress('x', sbaddr, sbtype)
+        sbvalue.SetValueFromCString(str(value), error)
+
+    def setValues(self, address, typename, values):
+        sbtype = self.lookupNativeType(typename)
+        sizeof = sbtype.GetByteSize()
+        error = lldb.SBError()
+        for i in range(len(values)):
+            sbaddr = lldb.SBAddress(address + i * sizeof, self.target)
+            sbvalue = self.target.CreateValueFromAddress('x', sbaddr, sbtype)
+            sbvalue.SetValueFromCString(str(values[i]), error)
+
     def assignValue(self, args):
         self.reportToken(args)
         error = lldb.SBError()
-        exp = self.hexdecode(args['exp'])
+        expr = self.hexdecode(args['expr'])
         value = self.hexdecode(args['value'])
-        lhs = self.findValueByExpression(exp)
-        lhs.SetValueFromCString(value, error)
+        simpleType = int(args['simpleType'])
+        lhs = self.findValueByExpression(expr)
+        typeName = lhs.GetType().GetName()
+        typeName = typeName.replace('::', '__')
+        pos = typeName.find('<')
+        if pos != -1:
+            typeName = typeName[0:pos]
+        if typeName in self.qqEditable and not simpleType:
+            expr = self.parseAndEvaluate(expr)
+            self.qqEditable[typeName](self, expr, value)
+        else:
+            lhs.SetValueFromCString(value, error)
         self.reportResult(self.describeError(error), args)
 
     def watchPoint(self, args):
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
index 90c1133ebc..4ced9e026b 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
@@ -86,65 +86,65 @@
                             {
                                 "trKey": "Qt 5.12",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.12',
                                     'QtQuickWindowVersion': '2.12',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.11",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.11',
                                     'QtQuickWindowVersion': '2.11',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.10",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.10',
                                     'QtQuickWindowVersion': '2.10',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.9",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.9',
                                     'QtQuickWindowVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.8",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.8',
                                     'QtQuickWindowVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.7",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.7',
                                     'QtQuickWindowVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.6",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.6',
                                     'QtQuickWindowVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.Enterprise.VirtualKeyboard 2.0'
-                                }"
+                                })"
                             }
                         ]
                     }
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
index ab8115d3fc..656f5d3596 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
@@ -89,38 +89,38 @@
                             {
                                 "trKey": "Qt 5.12",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.12',
                                     'QtQuickControlsVersion': '2.5',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.11",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.11',
                                     'QtQuickControlsVersion': '2.4',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.10",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.10',
                                     'QtQuickControlsVersion': '2.3',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.9",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.9',
                                     'QtQuickControlsVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
-                                }"
+                                })"
                             }
                         ]
                     }
@@ -137,66 +137,66 @@
                             {
                                 "trKey": "Default",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Default',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Material Light",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Material',
                                     'QtQuickControlsStyleTheme': 'Light'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Material Dark",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Material',
                                     'QtQuickControlsStyleTheme': 'Dark'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal Light",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'Light'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal Dark",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'Dark'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal System",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'System'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Fusion (Qt 5.10+)",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Fusion',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Imagine (Qt 5.10+)",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Imagine',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             }
                         ]
                     }
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
index aad751bc51..99cf484850 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
@@ -88,56 +88,56 @@
                             {
                                 "trKey": "Qt 5.12",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.12',
                                     'QtQuickControlsVersion': '2.5',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.11",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.11',
                                     'QtQuickControlsVersion': '2.4',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.10",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.10',
                                     'QtQuickControlsVersion': '2.3',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.9",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.9',
                                     'QtQuickControlsVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.8",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.8',
                                     'QtQuickControlsVersion': '2.1',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.7",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.7',
                                     'QtQuickControlsVersion': '2.0',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
-                                }"
+                                })"
                             }
                         ]
                     }
@@ -154,66 +154,66 @@
                             {
                                 "trKey": "Default",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Default',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Material Light",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Material',
                                     'QtQuickControlsStyleTheme': 'Light'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Material Dark",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Material',
                                     'QtQuickControlsStyleTheme': 'Dark'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal Light",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'Light'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal Dark",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'Dark'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal System",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'System'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Fusion (Qt 5.10+)",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Fusion',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Imagine (Qt 5.10+)",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Imagine',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             }
                         ]
                     }
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
index 4df5b3cf4d..f5918f35e0 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
@@ -88,56 +88,56 @@
                             {
                                 "trKey": "Qt 5.12",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.12',
                                     'QtQuickControlsVersion': '2.5',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.11",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.11',
                                     'QtQuickControlsVersion': '2.4',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.10",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.10',
                                     'QtQuickControlsVersion': '2.3',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.9",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.9',
                                     'QtQuickControlsVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.8",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.8',
                                     'QtQuickControlsVersion': '2.1',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.7",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.7',
                                     'QtQuickControlsVersion': '2.0',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
-                                }"
+                                })"
                             }
                         ]
                     }
@@ -154,66 +154,66 @@
                             {
                                 "trKey": "Default",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Default',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Material Light",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Material',
                                     'QtQuickControlsStyleTheme': 'Light'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Material Dark",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Material',
                                     'QtQuickControlsStyleTheme': 'Dark'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal Light",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'Light'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal Dark",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'Dark'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Universal System",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Universal',
                                     'QtQuickControlsStyleTheme': 'System'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Fusion (Qt 5.10+)",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Fusion',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Imagine (Qt 5.10+)",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickControlsStyle': 'Imagine',
                                     'QtQuickControlsStyleTheme': ''
-                                }"
+                                })"
                             }
                         ]
                     }
diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
index 41ac39342b..89dbe871d6 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
@@ -46,65 +46,65 @@
                             {
                                 "trKey": "Qt 5.12",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.12',
                                     'QtQuickWindowVersion': '2.12',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.4'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.11",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.11',
                                     'QtQuickWindowVersion': '2.11',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.10",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.10',
                                     'QtQuickWindowVersion': '2.10',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.9",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.9',
                                     'QtQuickWindowVersion': '2.3',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.2'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.8",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.8',
                                     'QtQuickWindowVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.7",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.7',
                                     'QtQuickWindowVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.1'
-                                }"
+                                })"
                             },
                             {
                                 "trKey": "Qt 5.6",
                                 "value":
-                                "{
+                                "({
                                     'QtQuickVersion': '2.6',
                                     'QtQuickWindowVersion': '2.2',
                                     'QtQuickVirtualKeyboardImport': 'QtQuick.Enterprise.VirtualKeyboard 2.0'
-                                }"
+                                })"
                             }
                         ]
                     }