aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/appoutputpane.cpp
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2023-01-10 17:29:02 +0100
committerhjk <hjk@qt.io>2023-01-11 07:32:30 +0000
commit8ee6b14f00ebc1c0d113a2ee092cd0742450fe1e (patch)
treea9ee433cef18e7412d24c5797b8eedb47c5aabe4 /src/plugins/projectexplorer/appoutputpane.cpp
parent2c65bfa0ea54316eda153fa69cf118a56fdb6543 (diff)
ProjectExplorer: Fix compilation with Qt 6.6
appoutputpane.cpp:272:12: error: cannot convert ‘const QList<ProjectExplorer::Internal::AppOutputPane::RunControlTab>::iterator’ to ‘ProjectExplorer::Internal::AppOutputPane::RunControlTab*’ in return Caused by "QList: deprecate iterator<->pointer implicit conversions" 0220484329029fc7598dfe11ba35ea10c3126477 b6cbd9c43afc7e005c1f78e1d0f700524930ed71 Change-Id: I596ead9deafca1154b5a79495e707137b61a14d5 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/appoutputpane.cpp')
-rw-r--r--src/plugins/projectexplorer/appoutputpane.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index 4dc4ae03d1..8bb1341225 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -260,7 +260,7 @@ AppOutputPane::RunControlTab *AppOutputPane::tabFor(const RunControl *rc)
[rc](RunControlTab &t) { return t.runControl == rc; });
if (it == m_runControlTabs.end())
return nullptr;
- return it;
+ return &*it;
}
AppOutputPane::RunControlTab *AppOutputPane::tabFor(const QWidget *outputWindow)
@@ -269,7 +269,7 @@ AppOutputPane::RunControlTab *AppOutputPane::tabFor(const QWidget *outputWindow)
[outputWindow](RunControlTab &t) { return t.window == outputWindow; });
if (it == m_runControlTabs.end())
return nullptr;
- return it;
+ return &*it;
}
const AppOutputPane::RunControlTab *AppOutputPane::tabFor(const QWidget *outputWindow) const