Commit eea64bea authored by Thomas Zander's avatar Thomas Zander Committed by Mehdi Fekari
Browse files

Fix copy/paste, check both Qt versions.

The Blackberry plugin could give an error due to a copy/paste
issue which checked one item twice.

Change-Id: Icc3d10cda0a6e17088445c9feba862fd2d468b70
Reviewed-by: default avatarMehdi Fekari <>
Reviewed-by: Nicolas Arnaud-Cormos's avatarNicolas Arnaud-Cormos <>
parent a9ab174f
......@@ -300,7 +300,7 @@ bool BlackBerryConfiguration::activate()
return false;
QString errorMessage = tr("The following errors occurred while activating Target: %1").arg(m_targetName);
if (m_qmake4BinaryFile.isEmpty() && m_qmake4BinaryFile.isEmpty())
if (m_qmake4BinaryFile.isEmpty() && m_qmake5BinaryFile.isEmpty())
errorMessage += QLatin1Char('\n') + tr("- No Qt version found.");
if (m_gccCompiler.isEmpty())
......@@ -324,7 +324,7 @@ bool BlackBerryConfiguration::activate()
if (!m_qmake4BinaryFile.isEmpty())
setupConfigurationPerQtVersion(m_qmake4BinaryFile, tc);
if (!m_qmake4BinaryFile.isEmpty())
if (!m_qmake5BinaryFile.isEmpty())
setupConfigurationPerQtVersion(m_qmake5BinaryFile, tc);
return true;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment