diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2015-08-24 13:39:40 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-10-24 16:23:33 +0000 |
| commit | 2c6adc1e747575af5198cc7ea2277b9a70366d3c (patch) | |
| tree | 67cb25bd5fa7ff603fa1daf10bf29a7c4af01b9c /src/plugins/mercurial | |
| parent | 6cd68d5401d05187ec3c1eef4e2b9d7846fbfa75 (diff) | |
| download | qt-creator-2c6adc1e747575af5198cc7ea2277b9a70366d3c.tar.gz | |
VCS: Replace QToolButtons in VCS toolbar with QActions
Change VcsBaseEditorParameterWidget to add actions/widgets to an
existing toolbar, instead of being a widget itself.
The class is renamed in a follow-up commit.
Task-number: QTCREATORBUG-14934
Change-Id: I473a439d12a096f4cbb64f06faa0598ee72000de
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/mercurial')
| -rw-r--r-- | src/plugins/mercurial/mercurialclient.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index d0646f7324..c7e920caec 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -54,8 +54,8 @@ class MercurialDiffParameterWidget : public VcsBaseEditorParameterWidget { Q_OBJECT public: - MercurialDiffParameterWidget(VcsBaseClientSettings &settings, QWidget *parent = 0) : - VcsBaseEditorParameterWidget(parent) + MercurialDiffParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar) : + VcsBaseEditorParameterWidget(toolBar) { mapSetting(addToggleButton(QLatin1String("-w"), tr("Ignore Whitespace")), settings.boolPointer(MercurialSettings::diffIgnoreWhiteSpaceKey)); @@ -66,7 +66,9 @@ public: MercurialClient::MercurialClient() : VcsBaseClient(new MercurialSettings) { - setDiffParameterWidgetCreator([this] { return new MercurialDiffParameterWidget(settings()); }); + setDiffParameterWidgetCreator([this](QToolBar *toolBar) { + return new MercurialDiffParameterWidget(settings(), toolBar); + }); } bool MercurialClient::manifestSync(const QString &repository, const QString &relativeFilename) |