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

Adapt to upstream changes

Browse Source 
Change-Id: I105277aba8e7d897ed65f8bba4cd803091046212
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2019-12-19 15:13:45 +01:00
parent f199d6f57d
commit b418e205cf
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/fossil/fossilclient.cpp
View File

@@ -70,7 +70,7 @@ public:
VcsBase::VcsBaseClientSettings &settings = client->settings(); VcsBase::VcsBaseClientSettings &settings = client->settings();
FossilClient::SupportedFeatures features = client->supportedFeatures(); FossilClient::SupportedFeatures features = client->supportedFeatures();
addButton(tr("Reload"), Icons::RELOAD.icon()); addReloadButton();
if (features.testFlag(FossilClient::DiffIgnoreWhiteSpaceFeature)) { if (features.testFlag(FossilClient::DiffIgnoreWhiteSpaceFeature)) {
mapSetting(addToggleButton("-w", tr("Ignore All Whitespace")), mapSetting(addToggleButton("-w", tr("Ignore All Whitespace")),
settings.boolPointer(FossilSettings::diffIgnoreAllWhiteSpaceKey)); settings.boolPointer(FossilSettings::diffIgnoreAllWhiteSpaceKey));
@@ -117,8 +117,7 @@ public:
VcsBase::VcsBaseEditorConfig(toolBar) VcsBase::VcsBaseEditorConfig(toolBar)
{ {
QTC_ASSERT(client, return); QTC_ASSERT(client, return);
addReloadButton();
addButton(tr("Reload"), Icons::RELOAD.icon());
} }
}; };
@@ -134,7 +133,7 @@ public:
{ {
QTC_ASSERT(client, return); QTC_ASSERT(client, return);
addButton(tr("Reload"), Icons::RELOAD.icon()); addReloadButton();
addLineageComboBox(); addLineageComboBox();
addVerboseToggleButton(); addVerboseToggleButton();
addItemTypeComboBox(); addItemTypeComboBox();

2
plugins/fossil/pullorpushdialog.cpp
View File

@@ -91,7 +91,7 @@ void PullOrPushDialog::setDefaultRemoteLocation(const QString &url)
void PullOrPushDialog::setLocalBaseDirectory(const QString &dir) void PullOrPushDialog::setLocalBaseDirectory(const QString &dir)
{ {
m_ui->localPathChooser->setBaseDirectory(dir); m_ui->localPathChooser->setBaseDirectory(Utils::FilePath::fromString(dir));
} }
void PullOrPushDialog::changeEvent(QEvent *e) void PullOrPushDialog::changeEvent(QEvent *e)