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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: Iaa647a44accc98ae84aa095d0bd5049588a92387
This commit is contained in:
Eike Ziller
2023-07-14 14:50:44 +02:00
parent a01d7e9a78 eb7c645ee8
commit ac0796926d
10 changed files with 598 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
View File

@@ -16,6 +16,8 @@
#include <ios/iosconstants.h>
#include <webassembly/webassemblyconstants.h>
#include <coreplugin/find/itemviewfind.h>
#include <projectexplorer/buildsteplist.h>
#include <projectexplorer/devicesupport/idevice.h>
@@ -202,7 +204,8 @@ static bool supportsStageForInstallation(const Kit *kit)
QTC_ASSERT(buildDevice, return false);
return runDevice->id() != buildDevice->id()
&& runDevice->type() != Android::Constants::ANDROID_DEVICE_TYPE
&& runDevice->type() != Ios::Constants::IOS_DEVICE_TYPE;
&& runDevice->type() != Ios::Constants::IOS_DEVICE_TYPE
&& runDevice->type() != WebAssembly::Constants::WEBASSEMBLY_DEVICE_TYPE;
}
CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :

2
src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
View File

@@ -244,6 +244,8 @@ void CMakeManager::reloadCMakePresets()
{QMessageBox::Yes, Tr::tr("Reload")},
});
settings().writeSettings();
if (clickedButton == QMessageBox::Cancel)
return;