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 } } 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()