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

Fix potential crash.

Browse Source 
Change-Id: I03c86d2071ce612424bac9bf92a25208d0ba9443
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
BogDan Vatra
2014-11-18 18:26:08 +02:00
parent 298e2de7df
commit 079711953a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -304,7 +304,9 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles()
QStringList addedFiles; QStringList addedFiles;
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(m_target->kit()); QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(m_target->kit());
if (!version || version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) { if (!version)
return;
if (version->qtVersion() < QtSupport::QtVersionNumber(5, 4, 0)) {
const QString src(version->qmakeProperty("QT_INSTALL_PREFIX") const QString src(version->qmakeProperty("QT_INSTALL_PREFIX")
.append(QLatin1String("/src/android/java/AndroidManifest.xml"))); .append(QLatin1String("/src/android/java/AndroidManifest.xml")));
FileUtils::copyRecursively(FileName::fromString(src), FileUtils::copyRecursively(FileName::fromString(src),