Commit 1eb88443 authored by Eike Ziller's avatar Eike Ziller

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

parents 16c2ee1b 1a960865
......@@ -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")
......
......@@ -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'
......
......@@ -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();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment