From 1cce35ecf53b6785a7c495c10db4863ff31d7c51 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Fri, 18 Mar 2011 17:50:15 +0100
Subject: [PATCH] Code deduplication.
The 'include(deployment.pri)' is now removed in a central place.
---
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp | 2 ++
src/plugins/qt4projectmanager/wizards/html5app.cpp | 6 ++----
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp | 2 --
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
index a7bc8671b18..5245cb1aa05 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 81742019330..5708711315e 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 cfeb1d5c282..482bbf86672 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)'
}
}
--
GitLab