feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: If3b6ebdb2aeb6fabadea1d06a1fe1c9211adcb8e
This commit is contained in:
Orgad Shaneh
2016-07-25 07:27:15 +03:00
parent 6d63ac6972 a3bdafcbc8
commit 9c72b5bec2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/CustomComboBoxStyle.qml
View File

@@ -85,7 +85,7 @@ ComboBoxStyle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: control.currentText text: control.currentText
renderType: Text.NativeRendering renderType: Text.NativeRendering
color: creatorTheme.PanelTextColorLight color: control.textColor
} }
} }

2
src/plugins/git/gerrit/gerritparameters.cpp
View File

@@ -75,7 +75,7 @@ void GerritParameters::setPortFlagBySshType()
const QString version = Utils::PathChooser::toolVersion(ssh, QStringList("-V")); const QString version = Utils::PathChooser::toolVersion(ssh, QStringList("-V"));
isPlink = version.contains("plink", Qt::CaseInsensitive); isPlink = version.contains("plink", Qt::CaseInsensitive);
} }
portFlag = isPlink ? "-P" : defaultPortFlag; portFlag = QLatin1String(isPlink ? "-P" : defaultPortFlag);
} }
GerritParameters::GerritParameters() GerritParameters::GerritParameters()