Merge remote-tracking branch 'origin/4.10'

Change-Id: I4a22cdf4d7d5aab2083d5f9f7baaa38e510f83fd
2019-09-23 12:31:58 +02:00
parent 57749e91e8 d8c78538a6
commit 0491c1c06c
6 changed files with 81 additions and 13 deletions
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -456,9 +456,9 @@ void AppOutputPane::createNewOutputWindow(RunControl *rc)
            tab.window->setFontZoom(fontZoom);
    });
    connect(TextEditor::TextEditorSettings::instance(), &TextEditor::TextEditorSettings::fontSettingsChanged,
-            this, updateFontSettings);
+            ow, updateFontSettings);
    connect(TextEditor::TextEditorSettings::instance(), &TextEditor::TextEditorSettings::behaviorSettingsChanged,
-            this, updateBehaviorSettings);
+            ow, updateBehaviorSettings);

    auto *agg = new Aggregation::Aggregate;
    agg->add(ow);