diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-12-19 15:13:45 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-12-19 15:42:01 +0000 |
| commit | b418e205cf3661a491afa5f608a612dee316141b (patch) | |
| tree | 0c44d2dda502525958c93bb3da3f4239e0273c6d | |
| parent | f199d6f57db8a1b4ae31bbbf0ff959211ca5f6a5 (diff) | |
Adapt to upstream changes
Change-Id: I105277aba8e7d897ed65f8bba4cd803091046212
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | plugins/fossil/fossilclient.cpp | 7 | ||||
| -rw-r--r-- | plugins/fossil/pullorpushdialog.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index 5b59104..7e7fe80 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -70,7 +70,7 @@ public: VcsBase::VcsBaseClientSettings &settings = client->settings(); FossilClient::SupportedFeatures features = client->supportedFeatures(); - addButton(tr("Reload"), Icons::RELOAD.icon()); + addReloadButton(); if (features.testFlag(FossilClient::DiffIgnoreWhiteSpaceFeature)) { mapSetting(addToggleButton("-w", tr("Ignore All Whitespace")), settings.boolPointer(FossilSettings::diffIgnoreAllWhiteSpaceKey)); @@ -117,8 +117,7 @@ public: VcsBase::VcsBaseEditorConfig(toolBar) { QTC_ASSERT(client, return); - - addButton(tr("Reload"), Icons::RELOAD.icon()); + addReloadButton(); } }; @@ -134,7 +133,7 @@ public: { QTC_ASSERT(client, return); - addButton(tr("Reload"), Icons::RELOAD.icon()); + addReloadButton(); addLineageComboBox(); addVerboseToggleButton(); addItemTypeComboBox(); diff --git a/plugins/fossil/pullorpushdialog.cpp b/plugins/fossil/pullorpushdialog.cpp index 4977c90..f9fda3c 100644 --- a/plugins/fossil/pullorpushdialog.cpp +++ b/plugins/fossil/pullorpushdialog.cpp @@ -91,7 +91,7 @@ void PullOrPushDialog::setDefaultRemoteLocation(const QString &url) void PullOrPushDialog::setLocalBaseDirectory(const QString &dir) { - m_ui->localPathChooser->setBaseDirectory(dir); + m_ui->localPathChooser->setBaseDirectory(Utils::FilePath::fromString(dir)); } void PullOrPushDialog::changeEvent(QEvent *e) |