Merge remote-tracking branch 'origin/3.6'

Change-Id: Ia5e169a276e21db59b4b26a1ed3f253bff9e2ab9

share/qtcreator/debugger/dumper.py

@@ -967,7 +967,10 @@ class DumperBase:
             # This should not happen. But it does, see QTCREATORBUG-14755.
             # GDB/GCC produce sizeof == 0 for QProcess arr[3]
             s = str(value.type)
-            arrayByteSize = int(s[s.find('[')+1:s.find(']')]) * ts;
+            itemCount = s[s.find('[')+1:s.find(']')]
+            if not itemCount:
+                itemCount = '100'
+            arrayByteSize = int(itemCount) * ts;
 
         n = int(arrayByteSize / ts)
         if displayFormat != RawFormat and p:

share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json

@@ -43,6 +43,14 @@
                         "index": 2,
                         "items":
                         [
+                            {
+                                "trKey": "Qt 5.6",
+                                "value":
+                                "{
+                                    'qtQuickVersion': '2.6',
+                                    'qtQuickWindowVersion': '2.2'
+                                }"
+                            },
                             {
                                 "trKey": "Qt 5.5",
                                 "value":

share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json

@@ -45,6 +45,16 @@
                         "index": 2,
                         "items":
                         [
+                            {
+                                "trKey": "Qt 5.6",
+                                "value":
+                                "{
+                                    'qtQuickVersion': '2.6',
+                                    'qtQuickControlsVersion': '1.5',
+                                    'qtQuickDialogsVersion': '1.2',
+                                    'qtQuickLayoutsVersion': '1.3'
+                                }"
+                            },
                             {
                                 "trKey": "Qt 5.5",
                                 "value":

src/plugins/clangcodemodel/clangmodelmanagersupport.cpp

@@ -69,12 +69,11 @@ ModelManagerSupportClang::ModelManagerSupportClang()
     m_instance_forTestsOnly = this;
 
     Core::EditorManager *editorManager = Core::EditorManager::instance();
+    connect(editorManager, &Core::EditorManager::editorOpened,
+            this, &ModelManagerSupportClang::onEditorOpened);
     connect(editorManager, &Core::EditorManager::currentEditorChanged,
             this, &ModelManagerSupportClang::onCurrentEditorChanged,
             Qt::QueuedConnection);
-    connect(editorManager, &Core::EditorManager::editorOpened,
-            this, &ModelManagerSupportClang::onEditorOpened,
-            Qt::QueuedConnection);
     connect(editorManager, &Core::EditorManager::editorsClosed,
             this, &ModelManagerSupportClang::onEditorClosed,
             Qt::QueuedConnection);

src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

@@ -751,6 +751,21 @@ const CppComponentValue *NodeMetaInfoPrivate::getCppComponentValue() const
     // maybe 'type' is a cpp name
     const CppComponentValue *cppValue = context()->valueOwner()->cppQmlTypes().objectByCppName(type);
 
+    if (cppValue) {
+        foreach (const LanguageUtils::FakeMetaObject::Export &exportValue, cppValue->metaObject()->exports()) {
+            if (exportValue.package.toUtf8() != "<cpp>") {
+                foreach (const QmlJS::Import &import, context()->imports(document())->all()) {
+                    if (import.info.path() != exportValue.package)
+                        continue;
+                    const Value *lookupResult = import.object->lookupMember(exportValue.type, context());
+                    const CppComponentValue *cppValue = value_cast<CppComponentValue>(lookupResult);
+                    if (cppValue)
+                        return cppValue;
+                }
+            }
+        }
+    }
+
     return cppValue;
 }
 

src/plugins/qtsupport/baseqtversion.cpp

@@ -453,6 +453,12 @@ QSet<Id> BaseQtVersion::availableFeatures() const
     if (qtVersion().matches(5, 5))
         return features;
 
+    features |= FeatureSet::versionedFeatures(Constants::FEATURE_QT_QUICK_PREFIX, 2, 6);
+    features |= FeatureSet::versionedFeatures(Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1, 5);
+
+    if (qtVersion().matches(5, 6))
+        return features;
+
     return features;
 }
 

src/plugins/texteditor/texteditoractionhandler.cpp

@@ -429,11 +429,11 @@ void TextEditorActionHandlerPrivate::createActions()
             QKeySequence(),
             G_EDIT_COLLAPSING, advancedEditMenu);
     m_increaseFontSizeAction = registerAction(INCREASE_FONT_SIZE,
-            [this] (TextEditorWidget *w) { w->zoomIn(); }, false, tr("Increase Font Size"),
+            [this] (TextEditorWidget *w) { w->zoomF(1.f); }, false, tr("Increase Font Size"),
             QKeySequence(tr("Ctrl++")),
             G_EDIT_FONT, advancedEditMenu);
     m_decreaseFontSizeAction = registerAction(DECREASE_FONT_SIZE,
-            [this] (TextEditorWidget *w) { w->zoomOut(); }, false, tr("Decrease Font Size"),
+            [this] (TextEditorWidget *w) { w->zoomF(-1.f); }, false, tr("Decrease Font Size"),
             QKeySequence(tr("Ctrl+-")),
             G_EDIT_FONT, advancedEditMenu);
     m_resetFontSizeAction = registerAction(RESET_FONT_SIZE,