From 3fe525f265ad1b08201c7b7c01e645bfa8066201 Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Fri, 23 Jan 2015 12:57:44 +0100 Subject: [PATCH] Android: Fix building packages Accidental logic error in 21a5766ceec9a2ee9f3d223524bf5abb44a2ebd7 Change-Id: I3eca9a5ebfecb9846051142bd54b30962472b740 Reviewed-by: BogDan Vatra --- .../qmakeandroidsupport/qmakeandroidbuildapkstep.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp index 360e7ce6534..cf77566d93d 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidbuildapkstep.cpp @@ -205,16 +205,11 @@ bool QmakeAndroidBuildApkStep::init() QString outputDir = bc->buildDirectory().appendPath(QLatin1String(Constants::ANDROID_BUILDDIRECTORY)).toString(); const auto *pro = static_cast(project()); - m_skipBuilding = m_proFilePathForInputFile.isEmpty(); + const QmakeProjectManager::QmakeProFileNode *node = pro->rootQmakeProjectNode()->findProFileFor(proFilePathForInputFile()); + m_skipBuilding = !node; if (m_skipBuilding) return true; - const QmakeProjectManager::QmakeProFileNode *node = pro->rootQmakeProjectNode()->findProFileFor(m_proFilePathForInputFile); - if (!node) { // should never happen - emit addOutput(tr("Internal Error: Could not find .pro file."), BuildStep::ErrorMessageOutput); - return false; - } - QString inputFile = node->singleVariableValue(QmakeProjectManager::AndroidDeploySettingsFile); if (inputFile.isEmpty()) { // should never happen emit addOutput(tr("Internal Error: Unknown Android deployment JSON file location."), BuildStep::ErrorMessageOutput);