Core: Add a default parameter to various ICore::*path functions

Saves some code on the user side.

Change-Id: I32cd220b6e533f5497a1865f9c34ab9db4cfda79
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-04-26 15:46:09 +02:00
parent c236a25339
commit 8e352af0ec
70 changed files with 142 additions and 150 deletions

View File

@@ -142,7 +142,7 @@ namespace {
static QString sdkSettingsFileName()
{
return Core::ICore::installerResourcePath().pathAppended("android.xml").toString();
return Core::ICore::installerResourcePath("android.xml").toString();
}
static bool is32BitUserSpace()
@@ -270,8 +270,8 @@ void AndroidConfig::save(QSettings &settings) const
void AndroidConfig::parseDependenciesJson()
{
FilePath sdkConfigUserFile(Core::ICore::userResourcePath() / JsonFilePath);
FilePath sdkConfigFile(Core::ICore::resourcePath() / JsonFilePath);
const FilePath sdkConfigUserFile = Core::ICore::userResourcePath(JsonFilePath);
const FilePath sdkConfigFile = Core::ICore::resourcePath(JsonFilePath);
if (!sdkConfigUserFile.exists()) {
QDir(sdkConfigUserFile.toFileInfo().absolutePath()).mkpath(".");