From f433247dd611091d192c4893767b640eb452db68 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 22 Jul 2016 15:28:02 +0200 Subject: [PATCH 1/2] QmlDesigner: Fix regression caused by styling The highlight for changed properties was broken for combo boxes. Change-Id: Iaf345f2c4b0a246588a58b970cb7927004a73774 Reviewed-by: Thomas Hartmann --- .../HelperWidgets/CustomComboBoxStyle.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml index 4f5600a0101..680317bd8ab 100644 --- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml +++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml @@ -85,7 +85,7 @@ ComboBoxStyle { anchors.verticalCenter: parent.verticalCenter text: control.currentText renderType: Text.NativeRendering - color: creatorTheme.PanelTextColorLight + color: control.textColor } } From a3bdafcbc8c0b281265b50d571d176fc4b556499 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 24 Jul 2016 09:34:19 +0300 Subject: [PATCH 2/2] Git: Fix MSVC compilation Change-Id: Iaf9c168ec2b62abd945a800d3e99a5af9af2b864 Reviewed-by: Orgad Shaneh --- src/plugins/git/gerrit/gerritparameters.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/gerrit/gerritparameters.cpp b/src/plugins/git/gerrit/gerritparameters.cpp index e541afcda5b..6f1a88cb25e 100644 --- a/src/plugins/git/gerrit/gerritparameters.cpp +++ b/src/plugins/git/gerrit/gerritparameters.cpp @@ -75,7 +75,7 @@ void GerritParameters::setPortFlagBySshType() const QString version = Utils::PathChooser::toolVersion(ssh, QStringList("-V")); isPlink = version.contains("plink", Qt::CaseInsensitive); } - portFlag = isPlink ? "-P" : defaultPortFlag; + portFlag = QLatin1String(isPlink ? "-P" : defaultPortFlag); } GerritParameters::GerritParameters()