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

Merge remote-tracking branch 'origin/10.0'

Browse Source 
Change-Id: I8b36c1812b61dbe08fe3e7930f950e6b8e8a7079
This commit is contained in:
Eike Ziller
2023-04-24 08:52:35 +02:00
parent bb9ba4349a 05f80a132d
commit c9696fbabb
33 changed files with 699 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1470,7 +1470,7 @@ CMakeBuildConfiguration::CMakeBuildConfiguration(Target *target, Id id)
// Android magic:
if (DeviceTypeKitAspect::deviceTypeId(k) == Android::Constants::ANDROID_DEVICE_TYPE) {
buildSteps()->appendStep(Android::Constants::ANDROID_BUILD_APK_ID);
const auto &bs = buildSteps()->steps().constLast();
const auto bs = buildSteps()->steps().constLast();
cmd.addArg("-DANDROID_PLATFORM:STRING="
+ bs->data(Android::Constants::AndroidNdkPlatform).toString());
auto ndkLocation = bs->data(Android::Constants::NdkLocation).value<FilePath>();

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

@@ -411,7 +411,7 @@ RawProjectParts generateRawProjectParts(const PreprocessedData &input,
continue;
const auto mimeTypes = Utils::mimeTypesForFileName(si.path);
for (const auto &mime : mimeTypes)
if (mime.name() == headerMimeType)
if (mime.inherits(headerMimeType))
sources.push_back(sourceDir.absoluteFilePath(si.path));
}
}