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

Utils: Replace FileChooser::path() by filePath().toString()

Browse Source 
Keep the old method for now to ease downstream porting.

The change is kept mechanical, there's a lot of cleanup possible now
on the user code side.

Change-Id: I936baedd45b7ba057f1c789a1bec896886f48eff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2020-04-09 11:35:12 +02:00
parent 79b680e7f0
commit 68c539bb9d
51 changed files with 91 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -990,7 +990,7 @@ void AndroidSettingsWidget::downloadSdk()
if (javaSummaryWidget->allRowsOk()) {
auto javaPath = Utils::FilePath::fromUserInput(m_ui->OpenJDKLocationPathChooser->rawPath());
m_sdkDownloader->downloadAndExtractSdk(javaPath.toString(),
m_ui->SDKLocationPathChooser->path());
m_ui->SDKLocationPathChooser->filePath().toString());
}
}
}

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

@@ -196,7 +196,7 @@ void ChooseDirectoryPage::checkPackageSourceDir()
const BuildTargetInfo bti = m_wizard->buildSystem()->buildTarget(buildKey);
const QString projectDir = bti.projectFilePath.toFileInfo().absolutePath();
const QString newDir = m_androidPackageSourceDir->path();
const QString newDir = m_androidPackageSourceDir->filePath().toString();
bool isComplete = QFileInfo(projectDir) != QFileInfo(newDir);
m_sourceDirectoryWarning->setVisible(!isComplete);
@@ -238,7 +238,7 @@ void ChooseDirectoryPage::initializePage()
}
m_wizard->setDirectory(m_androidPackageSourceDir->path());
m_wizard->setDirectory(m_androidPackageSourceDir->filePath().toString());
}
//