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

Replace some PathChooser::setFile with setFilePath

Browse Source 
Change-Id: I9a135e27d97b6706ea199b60a0b0b28838c77dcc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-09-08 17:16:43 +02:00
parent f72c4cb8ac
commit 704b0af8db
8 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,24 +217,23 @@ void ChooseDirectoryPage::initializePage()
const Target *target = m_wizard->buildSystem()->target();
const QString buildKey = m_wizard->buildKey();
const BuildTargetInfo bti = target->buildTarget(buildKey);
const QString projectDir = bti.projectFilePath.toFileInfo().absolutePath();
QString androidPackageDir;
FilePath androidPackageDir;
if (const ProjectNode *node = target->project()->findNodeForBuildKey(buildKey))
androidPackageDir = node->data(Android::Constants::AndroidPackageSourceDir).toString();
androidPackageDir = FilePath::fromVariant(node->data(Android::Constants::AndroidPackageSourceDir));
if (androidPackageDir.isEmpty()) {
m_label->setText(tr("Select the Android package source directory.\n\n"
"The files in the Android package source directory are copied to the build directory's "
"Android directory and the default files are overwritten."));
m_androidPackageSourceDir->setPath(projectDir + "/android");
m_androidPackageSourceDir->setFilePath(bti.projectFilePath / "android");
connect(m_androidPackageSourceDir, &PathChooser::rawPathChanged,
this, &ChooseDirectoryPage::checkPackageSourceDir);
} else {
m_label->setText(tr("The Android template files will be created in the %1 set in the .pro "
"file.").arg(QLatin1String(Constants::ANDROID_PACKAGE_SOURCE_DIR)));
m_androidPackageSourceDir->setPath(androidPackageDir);
m_androidPackageSourceDir->setFilePath(androidPackageDir);
m_androidPackageSourceDir->setReadOnly(true);
}