Commit 87db498e authored by Tobias Hunger's avatar Tobias Hunger Committed by Alessandro Portale
Browse files

Fix warning about || and && usage

Change-Id: Ibdacd1ae51b2203c66030a2191cb3eadc41f630a
Reviewed-on: http://codereview.qt.nokia.com/648

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent f7be9fcc
...@@ -112,7 +112,7 @@ int AbstractMobileAppWizardDialog::addPageWithTitle(QWizardPage *page, const QSt ...@@ -112,7 +112,7 @@ int AbstractMobileAppWizardDialog::addPageWithTitle(QWizardPage *page, const QSt
int AbstractMobileAppWizardDialog::nextId() const int AbstractMobileAppWizardDialog::nextId() const
{ {
if (currentPage() == m_targetsPage) { if (currentPage() == m_targetsPage) {
if (isSymbianTargetSelected() && !m_ignoreGeneralOptions || isFremantleTargetSelected()) if ((isSymbianTargetSelected() && !m_ignoreGeneralOptions) || isFremantleTargetSelected())
return m_genericOptionsPageId; return m_genericOptionsPageId;
// If Symbian target and Qt Quick components for Symbian, skip the mobile options page. // If Symbian target and Qt Quick components for Symbian, skip the mobile options page.
else if (isSymbianTargetSelected() && m_ignoreGeneralOptions) else if (isSymbianTargetSelected() && m_ignoreGeneralOptions)
......
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