diff options
| author | hjk <hjk@qt.io> | 2023-01-10 17:29:02 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2023-01-12 11:06:25 +0000 |
| commit | 3f528de7db07b735bea9676a0be43d3493009680 (patch) | |
| tree | 6b611baacab80f4199f428dc34385a877d48ee10 | |
| parent | 5d7aaf28cb9989392bd5661d1de5dff71b707129 (diff) | |
| download | qt-creator-3f528de7db07b735bea9676a0be43d3493009680.tar.gz | |
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>
(cherry picked from commit 8ee6b14f00ebc1c0d113a2ee092cd0742450fe1e)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/projectexplorer/appoutputpane.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index 1f58332b8b..758965c108 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 |