diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp index 53bc79cd1f7..f2e75a5fd4d 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 54e77173406..a277f7d541f 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 463ebc4cb41..e42732c4b51 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -668,7 +668,7 @@ void CMakeBuildSystem::updateProjectData() QList 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)) {