diff options
| author | hjk <hjk@qt.io> | 2021-08-13 11:41:52 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2021-08-13 14:29:09 +0000 |
| commit | 1afea827bb9360b682990f8aefe94a241bce6c4a (patch) | |
| tree | 4005faf7a3cd651994f58bd98b9c8629e83e520b | |
| parent | c69ef181abe5b4c59ccd2d7fd38dfaf1f1368358 (diff) | |
Don't try to add absolute paths with FilePath::pathAppended()
Change-Id: Ib4cc5cacb33679e4ed8d7aec24b6392c2e000b60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/plugins/android/androidmanager.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/android/createandroidmanifestwizard.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 53bc79cd1f..f2e75a5fd4 100644 --- a/src/plugins/android/androidmanager.cpp +++ b/src/plugins/android/androidmanager.cpp @@ -213,13 +213,13 @@ QJsonObject AndroidManager::deploymentSettings(const Target *target) const QStringList abis = applicationAbis(target); QTC_ASSERT(abis.size() == 1, return {}); settings["stdcpp-path"] = (AndroidConfigurations::currentConfig().toolchainPath(qt) - / "sysroot/usr/lib/" + / "sysroot/usr/lib" / archTriplet(abis.first()) / "libc++_shared.so").toString(); } else { settings["stdcpp-path"] = AndroidConfigurations::currentConfig() .toolchainPath(qt) - .pathAppended("sysroot/usr/lib/") + .pathAppended("sysroot/usr/lib") .toString(); } settings["toolchain-prefix"] = "llvm"; diff --git a/src/plugins/android/createandroidmanifestwizard.cpp b/src/plugins/android/createandroidmanifestwizard.cpp index 54e7717340..a277f7d541 100644 --- a/src/plugins/android/createandroidmanifestwizard.cpp +++ b/src/plugins/android/createandroidmanifestwizard.cpp @@ -319,7 +319,7 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles() if (m_copyGradle) { FilePath gradlePath = version->prefix().pathAppended("src/3rdparty/gradle"); 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); } diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index 463ebc4cb4..e42732c4b5 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -668,7 +668,7 @@ void CMakeBuildSystem::updateProjectData() QList<QByteArray> moduleMappings; for (const RawProjectPart &rpp : qAsConst(rpps)) { FilePath moduleMapFile = cmakeBuildConfiguration()->buildDirectory() - .pathAppended("/qml_module_mappings/" + rpp.buildSystemTarget); + .pathAppended("qml_module_mappings/" + rpp.buildSystemTarget); if (moduleMapFile.exists()) { QFile mmf(moduleMapFile.toString()); if (mmf.open(QFile::ReadOnly)) { |