feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Fix compilation with Qt 6.6

Browse Source 
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>
This commit is contained in:
hjk
2023-01-10 17:29:02 +01:00
parent 2c65bfa0ea
commit 8ee6b14f00
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/appoutputpane.cpp
View File

@@ -260,7 +260,7 @@ AppOutputPane::RunControlTab *AppOutputPane::tabFor(const RunControl *rc)
[rc](RunControlTab &t) { return t.runControl == rc; }); [rc](RunControlTab &t) { return t.runControl == rc; });
if (it == m_runControlTabs.end()) if (it == m_runControlTabs.end())
return nullptr; return nullptr;
return it; return &*it;
} }
AppOutputPane::RunControlTab *AppOutputPane::tabFor(const QWidget *outputWindow) 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; }); [outputWindow](RunControlTab &t) { return t.window == outputWindow; });
if (it == m_runControlTabs.end()) if (it == m_runControlTabs.end())
return nullptr; return nullptr;
return it; return &*it;
} }
const AppOutputPane::RunControlTab *AppOutputPane::tabFor(const QWidget *outputWindow) const const AppOutputPane::RunControlTab *AppOutputPane::tabFor(const QWidget *outputWindow) const