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

VCS: Set user choices on editor reload

Browse Source 
Broke by 2c6adc1e74.

Change-Id: Iba435899c7b0da4b270f4ef8ece84c1839bf6b72
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-06-11 17:44:32 +03:00
committed by Orgad Shaneh
parent 771d9f222c
commit a36536813f
5 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -559,7 +559,7 @@ public:
QString m_annotateRevisionTextFormat;
QString m_annotatePreviousRevisionTextFormat;
QString m_copyRevisionTextFormat;
bool m_configurationAdded = false;
VcsBaseEditorConfig *m_config = nullptr;
QList<AbstractTextCursorHandler *> m_textCursorHandlers;
QPointer<VcsCommand> m_command;
VcsBaseEditorWidget::DescribeFunc m_describeFunc = nullptr;
@@ -1380,14 +1380,14 @@ QString VcsBaseEditor::getTitleId(const QString &workingDirectory,
return rc;
}
void VcsBaseEditorWidget::setConfigurationAdded()
void VcsBaseEditorWidget::setEditorConfig(VcsBaseEditorConfig *config)
{
d->m_configurationAdded = true;
d->m_config = config;
}
bool VcsBaseEditorWidget::configurationAdded() const
VcsBaseEditorConfig *VcsBaseEditorWidget::editorConfig() const
{
return d->m_configurationAdded;
return d->m_config;
}
void VcsBaseEditorWidget::setCommand(VcsCommand *command)