From 079711953a7979d318860d08d5d690323c29367b Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Tue, 18 Nov 2014 18:26:08 +0200 Subject: [PATCH] Fix potential crash. Change-Id: I03c86d2071ce612424bac9bf92a25208d0ba9443 Reviewed-by: Daniel Teske --- .../qmakeandroidsupport/createandroidmanifestwizard.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp index 3b6dbda3159..a7ced8234ee 100644 --- a/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp +++ b/src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp @@ -304,7 +304,9 @@ void CreateAndroidManifestWizard::createAndroidTemplateFiles() QStringList addedFiles; 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") .append(QLatin1String("/src/android/java/AndroidManifest.xml"))); FileUtils::copyRecursively(FileName::fromString(src),