aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/subversion
diff options
context:
space:
mode:
authorJarek Kobus <jaroslaw.kobus@qt.io>2015-08-24 13:39:40 +0200
committerOrgad Shaneh <orgads@gmail.com>2016-10-24 16:23:33 +0000
commit2c6adc1e747575af5198cc7ea2277b9a70366d3c (patch)
tree67cb25bd5fa7ff603fa1daf10bf29a7c4af01b9c /src/plugins/subversion
parent6cd68d5401d05187ec3c1eef4e2b9d7846fbfa75 (diff)
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/subversion')
-rw-r--r--src/plugins/subversion/subversionclient.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 93b4dcf5f4..bf10bf8f47 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -56,8 +56,8 @@ class SubversionLogParameterWidget : public VcsBaseEditorParameterWidget
{
Q_OBJECT
public:
- SubversionLogParameterWidget(VcsBaseClientSettings &settings, QWidget *parent = 0) :
- VcsBaseEditorParameterWidget(parent)
+ SubversionLogParameterWidget(VcsBaseClientSettings &settings, QToolBar *toolBar) :
+ VcsBaseEditorParameterWidget(toolBar)
{
mapSetting(addToggleButton(QLatin1String("--verbose"), tr("Verbose"),
tr("Show files changed in each revision")),
@@ -67,7 +67,9 @@ public:
SubversionClient::SubversionClient() : VcsBaseClient(new SubversionSettings)
{
- setLogParameterWidgetCreator([this] { return new SubversionLogParameterWidget(settings()); });
+ setLogParameterWidgetCreator([this](QToolBar *toolBar) {
+ return new SubversionLogParameterWidget(settings(), toolBar);
+ });
}
VcsCommand *SubversionClient::createCommitCmd(const QString &repositoryRoot,