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:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: If3ada34dcc764fa1d0cce04fd343fb5a02c2fbaa
This commit is contained in:
Eike Ziller
2023-07-10 09:29:51 +02:00
parent 9039ede034 3745394fde
commit 3d3c78dfc6
61 changed files with 830 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -754,6 +754,8 @@ QList<void *> CMakeProjectImporter::examineDirectory(const FilePath &importPath,
// Update QT_QMAKE_EXECUTABLE and CMAKE_C|XX_COMPILER config values
updateConfigWithDirectoryData(config, data);
data->hasQmlDebugging = CMakeBuildConfiguration::hasQmlDebugging(config);
QByteArrayList buildConfigurationTypes = {cache.valueOf("CMAKE_BUILD_TYPE")};
if (buildConfigurationTypes.front().isEmpty()) {
buildConfigurationTypes.clear();
@@ -774,6 +776,13 @@ QList<void *> CMakeProjectImporter::examineDirectory(const FilePath &importPath,
DirectoryData *newData = new DirectoryData(*data);
newData->cmakeBuildType = buildType;
// Handle QML Debugging
auto type = CMakeBuildConfigurationFactory::buildTypeFromByteArray(
newData->cmakeBuildType);
if (type == CMakeBuildConfigurationFactory::BuildTypeDebug
|| type == CMakeBuildConfigurationFactory::BuildTypeProfile)
newData->hasQmlDebugging = true;
result.emplace_back(newData);
}