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

Merge remote-tracking branch 'origin/14.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/qmljseditor/qmljseditordocument.cpp

Change-Id: Ibef70b4c0eba5ccd5da7b05ca2bd3a9e8ee1cc0c
This commit is contained in:
Eike Ziller
2024-07-17 11:43:34 +02:00
parent 75e5b46ec0 01bfa99a92
commit 18937fd44b
87 changed files with 1276 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/ios/iostoolhandler.cpp
View File

@@ -992,12 +992,12 @@ IosToolTaskAdapter::IosToolTaskAdapter() {}
void IosToolTaskAdapter::start()
{
task()->m_iosToolHandler = new IosToolHandler(Internal::IosDeviceType(task()->m_deviceType));
connect(task()->m_iosToolHandler, &IosToolHandler::finished, this, [this] {
task()->m_iosToolHandler->deleteLater();
task()->m_iosToolHandler.reset(new IosToolHandler(Internal::IosDeviceType(task()->m_deviceType)));
connect(task()->m_iosToolHandler.get(), &IosToolHandler::finished, this, [this] {
task()->m_iosToolHandler.release()->deleteLater();
emit done(Tasking::DoneResult::Success);
});
task()->m_startHandler(task()->m_iosToolHandler);
task()->m_startHandler(task()->m_iosToolHandler.get());
}
} // namespace Ios

2
src/plugins/ios/iostoolhandler.h
View File

@@ -82,7 +82,7 @@ public:
private:
friend class IosToolTaskAdapter;
IosToolHandler *m_iosToolHandler = nullptr;
std::unique_ptr<IosToolHandler> m_iosToolHandler;
StartHandler m_startHandler;
Internal::IosDeviceType m_deviceType = Internal::IosDeviceType::IosDevice;
};