Merge remote-tracking branch 'origin/4.6'

 Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f

8 files changed, 69 insertions, 10 deletions

diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 503fae19c3..4805545d24 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -2245,6 +2245,11 @@ class DumperBase:
                         p += 1
 
     def extractPointer(self, value):
+        try:
+            if value.type.code == TypeCodeArray:
+                return value.address()
+        except:
+            pass
         code = 'I' if self.ptrSize() == 4 else 'Q'
         return self.extractSomething(value, code, 8 * self.ptrSize())
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
index 647d1d7470..a20e0350ae 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
@@ -193,14 +193,14 @@ void QuickItemNodeInstance::doComponentComplete()
 {
     ObjectNodeInstance::doComponentComplete();
 
-    QQmlProperty contentItemProperty(quickItem(), "contentItem", engine());
-    if (contentItemProperty.isValid())
-        m_contentItem = contentItemProperty.read().value<QQuickItem*>();
-
     QmlPrivateGate::disableTextCursor(quickItem());
 
     DesignerSupport::emitComponentCompleteSignalForAttachedProperty(quickItem());
 
+    QQmlProperty contentItemProperty(quickItem(), "contentItem", engine());
+    if (contentItemProperty.isValid())
+        m_contentItem = contentItemProperty.read().value<QQuickItem*>();
+
     quickItem()->update();
 }
 
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json
index ecaa1309f9..3038b29b1c 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/canvas3d/wizard.json
@@ -80,10 +80,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 1,
+                        "index": 2,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.11",
+                                "value":
+                                "{
+                                    'QtQuickVersion': '2.11',
+                                    'QtQuickWindowVersion': '2.11',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
+                                }"
+                            },
+                            {
                                 "trKey": "Qt 5.10",
                                 "value":
                                 "{
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
index 5faa66de91..c2542d5c0a 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
@@ -80,10 +80,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 1,
+                        "index": 2,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.11",
+                                "value":
+                                "{
+                                    'QtQuickVersion': '2.11',
+                                    'QtQuickWindowVersion': '2.11',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
+                                }"
+                            },
+                            {
                                 "trKey": "Qt 5.10",
                                 "value":
                                 "{
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
index ba7fc0c261..ed6f876923 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
@@ -83,10 +83,19 @@
                     "visible": false,
                     "data":
                     {
-                        "index": 1,
+                        "index": 2,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.11",
+                                "value":
+                                "{
+                                    'QtQuickVersion': '2.11',
+                                    'QtQuickControlsVersion': '2.4',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
+                                }"
+                            },
+                            {
                                 "trKey": "Qt 5.10",
                                 "value":
                                 "{
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
index 3c77af45c0..dec5441fa9 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
@@ -82,10 +82,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 1,
+                        "index": 2,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.11",
+                                "value":
+                                "{
+                                    'QtQuickVersion': '2.11',
+                                    'QtQuickControlsVersion': '2.4',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
+                                }"
+                            },
+                            {
                                 "trKey": "Qt 5.10",
                                 "value":
                                 "{
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
index d9d3f9b271..1867cf3757 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
@@ -82,10 +82,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 1,
+                        "index": 2,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.11",
+                                "value":
+                                "{
+                                    'QtQuickVersion': '2.11',
+                                    'QtQuickControlsVersion': '2.4',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
+                                }"
+                            },
+                            {
                                 "trKey": "Qt 5.10",
                                 "value":
                                 "{
diff --git a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
index 62305835df..9b748cf3d7 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
@@ -40,10 +40,19 @@
                     "type": "ComboBox",
                     "data":
                     {
-                        "index": 1,
+                        "index": 2,
                         "items":
                         [
                             {
+                                "trKey": "Qt 5.11",
+                                "value":
+                                "{
+                                    'QtQuickVersion': '2.11',
+                                    'QtQuickWindowVersion': '2.11',
+                                    'QtQuickVirtualKeyboardImport': 'QtQuick.VirtualKeyboard 2.3'
+                                }"
+                            },
+                            {
                                 "trKey": "Qt 5.10",
                                 "value":
                                 "{