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 
Conflicts:
	doc/qtdesignstudio/src/views/qtquick-designer.qdoc

Change-Id: I5d7ea23e356add0cbb2ad01ceb5e433377dc51c2
This commit is contained in:
Eike Ziller
2023-07-06 09:49:11 +02:00
parent 29aba31741 ca3f7a7bb2
commit 609510c323
47 changed files with 884 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp
View File

@@ -379,8 +379,10 @@ static QMakeAndCMakePrefixPath qtInfoFromCMakeCache(const CMakeConfig &config,
args.push_back(qtcQMakeProbeDir.path().path());
args.push_back("-B");
args.push_back(qtcQMakeProbeDir.filePath("build").path());
args.push_back("-G");
args.push_back(cmakeGenerator);
if (!cmakeGenerator.isEmpty()) {
args.push_back("-G");
args.push_back(cmakeGenerator);
}
if (!cmakeGeneratorPlatform.isEmpty()) {
args.push_back("-A");
args.push_back(cmakeGeneratorPlatform);
@@ -708,8 +710,9 @@ QList<void *> CMakeProjectImporter::examineDirectory(const FilePath &importPath,
data->sysroot = cache.filePathValueOf("CMAKE_SYSROOT");
CMakeConfig config;
if (cache.valueOf("CMAKE_C_COMPILER").isEmpty()
&& cache.valueOf("CMAKE_CXX_COMPILER").isEmpty()) {
const bool noCompilers = cache.valueOf("CMAKE_C_COMPILER").isEmpty()
&& cache.valueOf("CMAKE_CXX_COMPILER").isEmpty();
if (noCompilers || !configurePreset.generator) {
QApplication::setOverrideCursor(Qt::WaitCursor);
config = configurationFromPresetProbe(importPath, projectDirectory(), configurePreset);
QApplication::restoreOverrideCursor();

18
src/plugins/cmakeprojectmanager/presetsparser.cpp
View File

@@ -296,6 +296,15 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
if (strategy == "external")
preset.architecture->strategy
= PresetsDetails::ValueStrategyPair::Strategy::external;
} else {
preset.architecture->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
}
} else {
const QString value = object.value("architecture").toString();
if (!value.isEmpty()) {
preset.architecture = PresetsDetails::ValueStrategyPair();
preset.architecture->value = value;
preset.architecture->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
}
}
@@ -311,6 +320,15 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
if (strategy == "external")
preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::external;
} else {
preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
}
} else {
const QString value = object.value("toolset").toString();
if (!value.isEmpty()) {
preset.toolset = PresetsDetails::ValueStrategyPair();
preset.toolset->value = value;
preset.toolset->strategy = PresetsDetails::ValueStrategyPair::Strategy::set;
}
}