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

Fix a build with Qt 6

Browse Source 
In Qt 6 implicit conversion between QFuture and other types
is forbidden. Make it explicit instead.
See ff0ba7e2d7b91fd5809cb314935a1ca1a436f6c9.

Change-Id: Ie42e6b9b5047ba5eeec9f63fd03179e73f95314d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2020-11-03 12:49:20 +01:00
parent 8ffd3d20a5
commit 34c97ac868
12 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/ios/simulatorinfomodel.cpp
View File

@@ -130,8 +130,9 @@ void SimulatorInfoModel::requestSimulatorInfo()
return; // Ignore the request if the last request is still pending.
m_fetchFuture.clearFutures();
m_fetchFuture.addFuture(Utils::onResultReady(SimulatorControl::updateAvailableSimulators(),
this, &SimulatorInfoModel::populateSimulators));
m_fetchFuture.addFuture(QFuture<void>(Utils::onResultReady(
SimulatorControl::updateAvailableSimulators(),
this, &SimulatorInfoModel::populateSimulators)));
}
void SimulatorInfoModel::populateSimulators(const SimulatorInfoList &simulatorList)