diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-09-11 22:20:30 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-09-12 13:02:55 +0200 |
| commit | 9df379e0dc72d2abb17040b17a505ece607b589f (patch) | |
| tree | 3e8ad9f2b8786c4d65c46ae743bd7d43c5fbc9aa /src/plugins/vcsbase/vcsbaseeditor.cpp | |
| parent | f69b994896304126976848d474bdd6da589dc78d (diff) | |
| download | qt-creator-9df379e0dc72d2abb17040b17a505ece607b589f.tar.gz | |
Git: Fix crash on diff
Task-number: QTCREATORBUG-10138
Change-Id: I7c7f054e6253c677b52a3ea24d7ace562f1ad4af
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseeditor.cpp')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseeditor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 62f862e881..5f62830981 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -31,6 +31,7 @@ #include "diffhighlighter.h" #include "baseannotationhighlighter.h" #include "vcsbaseplugin.h" +#include "vcsbaseeditorparameterwidget.h" #include <coreplugin/icore.h> #include <coreplugin/vcsmanager.h> @@ -566,7 +567,7 @@ public: QString m_copyRevisionTextFormat; bool m_fileLogAnnotateEnabled; TextEditor::BaseTextEditor *m_editor; - QWidget *m_configurationWidget; + VcsBaseEditorParameterWidget *m_configurationWidget; bool m_mouseDragging; QList<AbstractTextCursorHandler *> m_textCursorHandlers; @@ -1324,7 +1325,7 @@ QString VcsBaseEditorWidget::getTitleId(const QString &workingDirectory, return rc; } -bool VcsBaseEditorWidget::setConfigurationWidget(QWidget *w) +bool VcsBaseEditorWidget::setConfigurationWidget(VcsBaseEditorParameterWidget *w) { if (!d->m_editor || d->m_configurationWidget) return false; @@ -1335,7 +1336,7 @@ bool VcsBaseEditorWidget::setConfigurationWidget(QWidget *w) return true; } -QWidget *VcsBaseEditorWidget::configurationWidget() const +VcsBaseEditorParameterWidget *VcsBaseEditorWidget::configurationWidget() const { return d->m_configurationWidget; } |