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

android: Do not crash when node is nullptr in CreateAndroidManifectWizard

Browse Source 
Change-Id: I1988fa72be535210e50d9ed18ef9d081e6ae39ed
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Tobias Hunger
2020-02-24 11:08:55 +01:00
parent 2e59ef8c1c
commit 144ee4103f
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -389,20 +389,23 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
if (node) { if (node) {
node->addFiles(addedFiles); node->addFiles(addedFiles);
androidPackageDir = node->data(Android::Constants::AndroidPackageSourceDir).toString(); androidPackageDir = node->data(Android::Constants::AndroidPackageSourceDir).toString();
}
if (androidPackageDir.isEmpty()) { if (androidPackageDir.isEmpty()) {
// and now time for some magic // and now time for some magic
const BuildTargetInfo bti = target->buildTarget(m_buildKey); const BuildTargetInfo bti = target->buildTarget(m_buildKey);
const QString value = "$$PWD/" + bti.projectFilePath.toFileInfo().absoluteDir().relativeFilePath(m_directory); const QString value = "$$PWD/"
+ bti.projectFilePath.toFileInfo().absoluteDir().relativeFilePath(
m_directory);
bool result = node->setData(Android::Constants::AndroidPackageSourceDir, value); bool result = node->setData(Android::Constants::AndroidPackageSourceDir, value);
if (!result) { if (!result) {
QMessageBox::warning(this, tr("Project File not Updated"), QMessageBox::warning(this,
tr("Project File not Updated"),
tr("Could not update the project file %1.") tr("Could not update the project file %1.")
.arg(bti.projectFilePath.toUserOutput())); .arg(bti.projectFilePath.toUserOutput()));
} }
} }
}
Core::EditorManager::openEditor(m_directory + QLatin1String("/AndroidManifest.xml")); Core::EditorManager::openEditor(m_directory + QLatin1String("/AndroidManifest.xml"));
} }