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

Don't try to add absolute paths with FilePath::pathAppended()

Browse Source 
Change-Id: Ib4cc5cacb33679e4ed8d7aec24b6392c2e000b60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-08-13 11:41:52 +02:00
parent c69ef181ab
commit 1afea827bb
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androidmanager.cpp
View File

@@ -213,13 +213,13 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target)
const QStringList abis = applicationAbis(target); const QStringList abis = applicationAbis(target);
QTC_ASSERT(abis.size() == 1, return {}); QTC_ASSERT(abis.size() == 1, return {});
settings["stdcpp-path"] = (AndroidConfigurations::currentConfig().toolchainPath(qt) settings["stdcpp-path"] = (AndroidConfigurations::currentConfig().toolchainPath(qt)
/ "sysroot/usr/lib/" / "sysroot/usr/lib"
/ archTriplet(abis.first()) / archTriplet(abis.first())
/ "libc++_shared.so").toString(); / "libc++_shared.so").toString();
} else { } else {
settings["stdcpp-path"] = AndroidConfigurations::currentConfig() settings["stdcpp-path"] = AndroidConfigurations::currentConfig()
.toolchainPath(qt) .toolchainPath(qt)
.pathAppended("sysroot/usr/lib/") .pathAppended("sysroot/usr/lib")
.toString(); .toString();
} }
settings["toolchain-prefix"] = "llvm"; settings["toolchain-prefix"] = "llvm";

2
src/plugins/android/createandroidmanifestwizard.cpp
View File

@@ -319,7 +319,7 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
if (m_copyGradle) { if (m_copyGradle) {
FilePath gradlePath = version->prefix().pathAppended("src/3rdparty/gradle"); FilePath gradlePath = version->prefix().pathAppended("src/3rdparty/gradle");
if (!gradlePath.exists()) if (!gradlePath.exists())
gradlePath = AndroidConfigurations::currentConfig().sdkLocation().pathAppended("/tools/templates/gradle/wrapper"); gradlePath = AndroidConfigurations::currentConfig().sdkLocation().pathAppended("tools/templates/gradle/wrapper");
FileUtils::copyRecursively(gradlePath, FilePath::fromString(m_directory), nullptr, copy); FileUtils::copyRecursively(gradlePath, FilePath::fromString(m_directory), nullptr, copy);
} }

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

@@ -668,7 +668,7 @@ void CMakeBuildSystem::updateProjectData()
QList<QByteArray> moduleMappings; QList<QByteArray> moduleMappings;
for (const RawProjectPart &rpp : qAsConst(rpps)) { for (const RawProjectPart &rpp : qAsConst(rpps)) {
FilePath moduleMapFile = cmakeBuildConfiguration()->buildDirectory() FilePath moduleMapFile = cmakeBuildConfiguration()->buildDirectory()
.pathAppended("/qml_module_mappings/" + rpp.buildSystemTarget); .pathAppended("qml_module_mappings/" + rpp.buildSystemTarget);
if (moduleMapFile.exists()) { if (moduleMapFile.exists()) {
QFile mmf(moduleMapFile.toString()); QFile mmf(moduleMapFile.toString());
if (mmf.open(QFile::ReadOnly)) { if (mmf.open(QFile::ReadOnly)) {