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

Android: Use FilePath operations in AndroidConfig::parseDependenciesJson()

Browse Source 
Change-Id: I32bd5cbce4f486132be338c4318f499ce0b03325
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2021-08-17 17:47:03 +02:00
parent 43b82bfc5f
commit 1b6c212928
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/android/androidconfigurations.cpp
View File

@@ -275,15 +275,15 @@ void AndroidConfig::parseDependenciesJson()
const FilePath sdkConfigFile = Core::ICore::resourcePath(JsonFilePath); const FilePath sdkConfigFile = Core::ICore::resourcePath(JsonFilePath);
if (!sdkConfigUserFile.exists()) { if (!sdkConfigUserFile.exists()) {
QDir(sdkConfigUserFile.toFileInfo().absolutePath()).mkpath("."); sdkConfigUserFile.absolutePath().ensureWritableDir();
QFile::copy(sdkConfigFile.toString(), sdkConfigUserFile.toString()); sdkConfigFile.copyFile(sdkConfigUserFile);
} }
if (sdkConfigFile.lastModified() > sdkConfigUserFile.lastModified()) { if (sdkConfigFile.lastModified() > sdkConfigUserFile.lastModified()) {
const QString oldUserFile = (sdkConfigUserFile + ".old").toString(); const FilePath oldUserFile = sdkConfigUserFile + ".old";
QFile::remove(oldUserFile); oldUserFile.removeFile();
QFile::rename(sdkConfigUserFile.toString(), oldUserFile); sdkConfigUserFile.renameFile(oldUserFile);
QFile::copy(sdkConfigFile.toString(), sdkConfigUserFile.toString()); sdkConfigFile.copyFile(sdkConfigUserFile);
} }
QFile jsonFile(sdkConfigUserFile.toString()); QFile jsonFile(sdkConfigUserFile.toString());