Merge remote-tracking branch 'origin/3.3'

2014-11-26 11:11:46 +01:00
parent cc035a59b1 26920307f0
commit 938326ef2c
39 changed files with 639 additions and 173 deletions
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -149,7 +149,6 @@ void CppEditorWidget::finalizeInitialization()
    d->m_cppEditorDocument = qobject_cast<CppEditorDocument *>(textDocument());

    setLanguageSettingsId(CppTools::Constants::CPP_SETTINGS_ID);
-    setRevisionsVisible(true);

    // function combo box sorting
    connect(CppEditorPlugin::instance(), &CppEditorPlugin::outlineSortingChanged,