diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-19 09:35:50 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-19 09:35:50 +0100 |
| commit | c8a2ea54333b4d0582afb62b4120558f8c6945e7 (patch) | |
| tree | 156b198998adf6b034944ec58bc74cca41830b6d /src/plugins/projectexplorer/appoutputpane.cpp | |
| parent | 070aca8fea5fec0c31542c1b70e60bd9c493300a (diff) | |
| parent | ff6dd4dc2e95ce39fd423ca520c72fe50dc64aa1 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp
Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0
Diffstat (limited to 'src/plugins/projectexplorer/appoutputpane.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/appoutputpane.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index f9a3dfae6c..d9261efa5e 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -111,8 +111,6 @@ private: int m_tabIndexForMiddleClick = -1; }; -} // Internal - TabWidget::TabWidget(QWidget *parent) : QTabWidget(parent) { @@ -881,7 +879,8 @@ AppOutputSettingsPage::AppOutputSettingsPage() setWidgetCreator([] { return new AppOutputSettingsWidget; }); } -} // ProjectExplorer +} // namespace Internal +} // namespace ProjectExplorer #include "appoutputpane.moc" |