diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index a7bc8671b185e83537798dfa286f04610e1dd25c..5245cb1aa05289cf10469b2243192ef682f0a1cf 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -280,6 +280,8 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const } if (foldersCount > 0) out << "DEPLOYMENTFOLDERS = " << folders.join(QLatin1String(" ")) << endl; + } else if (line.contains(QLatin1String("# INCLUDE_DEPLOYMENT_PRI"))) { + in.readLine(); // eats 'include(deployment.pri)' } else { handleCurrentProFileTemplateLine(line, in, out, commentOutNextLine); } diff --git a/src/plugins/qt4projectmanager/wizards/html5app.cpp b/src/plugins/qt4projectmanager/wizards/html5app.cpp index 817420193308550ddad1e279910710f592158918..5708711315e679da7c8c92ef4139eb1ca6bf3aea 100644 --- a/src/plugins/qt4projectmanager/wizards/html5app.cpp +++ b/src/plugins/qt4projectmanager/wizards/html5app.cpp @@ -149,12 +149,10 @@ void Html5App::handleCurrentProFileTemplateLine(const QString &line, QTextStream &proFileTemplate, QTextStream &proFile, bool &commentOutNextLine) const { + Q_UNUSED(proFileTemplate) Q_UNUSED(proFile) - if (line.contains(QLatin1String("# INCLUDE_DEPLOYMENT_PRI"))) { - proFileTemplate.readLine(); // eats 'include(deployment.pri)' - } else if (line.contains(QLatin1String("# TOUCH_OPTIMIZED_NAVIGATION"))) { + if (line.contains(QLatin1String("# TOUCH_OPTIMIZED_NAVIGATION"))) commentOutNextLine = !m_touchOptimizedNavigationEnabled; - } } #ifndef CREATORLESSTEST diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp index cfeb1d5c282507991f1a45d43ba8ba8584db7f07..482bbf86672abd238942a2f9c007f1716a85923b 100644 --- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp @@ -243,8 +243,6 @@ void QtQuickApp::handleCurrentProFileTemplateLine(const QString &line, } proFile << endl; - } else if (line.contains(QLatin1String("# INCLUDE_DEPLOYMENT_PRI"))) { - proFileTemplate.readLine(); // eats 'include(deployment.pri)' } }