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

Fix copy/paste, check both Qt versions.

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

Change-Id: Icc3d10cda0a6e17088445c9feba862fd2d468b70
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
This commit is contained in:
Thomas Zander
2013-09-06 16:51:48 +02:00
committed by Mehdi Fekari
parent a9ab174f9b
commit eea64bea49
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qnx/blackberryconfiguration.cpp
View File

@@ -300,7 +300,7 @@ bool BlackBerryConfiguration::activate()
return false; return false;
QString errorMessage = tr("The following errors occurred while activating Target: %1").arg(m_targetName); 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."); errorMessage += QLatin1Char('\n') + tr("- No Qt version found.");
if (m_gccCompiler.isEmpty()) if (m_gccCompiler.isEmpty())
@@ -324,7 +324,7 @@ bool BlackBerryConfiguration::activate()
if (!m_qmake4BinaryFile.isEmpty()) if (!m_qmake4BinaryFile.isEmpty())
setupConfigurationPerQtVersion(m_qmake4BinaryFile, tc); setupConfigurationPerQtVersion(m_qmake4BinaryFile, tc);
if (!m_qmake4BinaryFile.isEmpty()) if (!m_qmake5BinaryFile.isEmpty())
setupConfigurationPerQtVersion(m_qmake5BinaryFile, tc); setupConfigurationPerQtVersion(m_qmake5BinaryFile, tc);
return true; return true;