Merge remote-tracking branch 'origin/2.8' into 3.0

3 files changed, 33 insertions, 7 deletions

diff --git a/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/FontGroupBox.qml
index 3ecd6aaf64..85f552b6dc 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/FontGroupBox.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/HelperWidgets/FontGroupBox.qml
@@ -44,6 +44,14 @@ GroupBox {
     property variant underlineStyle: backendValues.font_underline
     property variant strikeoutStyle: backendValues.font_strikeout
 
+    onPointSizeChanged: {
+        sizeWidget.setPointPixelSize();
+    }
+
+    onPixelSizeChanged: {
+        sizeWidget.setPointPixelSize();
+    }
+
     layout: VerticalLayout {
 
         QWidget {
@@ -61,17 +69,22 @@ GroupBox {
         QWidget {
             id: sizeWidget
             property bool selectionFlag: selectionChanged
-            
+
             property bool pixelSize: sizeType.currentText == "pixels"
             property bool isSetup;
-            
-            onSelectionFlagChanged: {
+
+            function setPointPixelSize() {
                 isSetup = true;
                 sizeType.currentText = "points";
-                if (pixelSize.isInModel)
+                if (fontGroupBox.pixelSize.isInModel)
                     sizeType.currentText = "pixels";
                 isSetup = false;
-            }            
+            }
+
+            onSelectionFlagChanged: {
+                setPointPixelSize();
+            }
+
             layout: HorizontalLayout {
                 Label {
                     text: qsTr("Size")
diff --git a/src/plugins/git/stashdialog.cpp b/src/plugins/git/stashdialog.cpp
index ffbf7ecb3f..fecdedddd8 100644
--- a/src/plugins/git/stashdialog.cpp
+++ b/src/plugins/git/stashdialog.cpp
@@ -212,7 +212,7 @@ void StashDialog::showCurrent()
 {
     const int index = currentRow();
     QTC_ASSERT(index >= 0, return);
-    gitClient()->show(m_repository, m_model->at(index).name);
+    gitClient()->show(m_repository, QString(m_model->at(index).name));
 }
 
 // Suggest Branch name to restore 'stash@{0}' -> 'stash0-date'
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
index 94e9bbc018..9d56d7a857 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
@@ -40,6 +40,7 @@
 #include <qmljs/qmljsscopechain.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
+#include <languageutils/fakemetaobject.h>
 
 namespace QmlDesigner {
 
@@ -775,8 +776,20 @@ QString NodeMetaInfoPrivate::propertyEnumScope(const PropertyName &propertyName)
         return QString();
     const CppComponentValue *definedIn = 0;
     qmlObjectValue->getEnum(propertyType(propertyName), &definedIn);
-    if (definedIn)
+    if (definedIn) {
+        QString nonCppPackage;
+        foreach (const LanguageUtils::FakeMetaObject::Export &qmlExport, definedIn->metaObject()->exports()) {
+            if (qmlExport.package != QLatin1String("<cpp>"))
+                nonCppPackage = qmlExport.package;
+        }
+
+        const LanguageUtils::FakeMetaObject::Export qmlExport =
+                definedIn->metaObject()->exportInPackage(nonCppPackage);
+        if (qmlExport.isValid())
+            return qmlExport.type;
+
         return definedIn->className();
+    }
 
     return QString();
 }