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

Code deduplication.

Browse Source 
The 'include(deployment.pri)' is now removed in a central place.
This commit is contained in:
Alessandro Portale
2011-03-18 17:50:15 +01:00
parent dece4dccc7
commit 1cce35ecf5
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp
View File

@@ -280,6 +280,8 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const
} }
if (foldersCount > 0) if (foldersCount > 0)
out << "DEPLOYMENTFOLDERS = " << folders.join(QLatin1String(" ")) << endl; out << "DEPLOYMENTFOLDERS = " << folders.join(QLatin1String(" ")) << endl;
} else if (line.contains(QLatin1String("# INCLUDE_DEPLOYMENT_PRI"))) {
in.readLine(); // eats 'include(deployment.pri)'
} else { } else {
handleCurrentProFileTemplateLine(line, in, out, commentOutNextLine); handleCurrentProFileTemplateLine(line, in, out, commentOutNextLine);
} }

6
src/plugins/qt4projectmanager/wizards/html5app.cpp
View File

@@ -149,13 +149,11 @@ void Html5App::handleCurrentProFileTemplateLine(const QString &line,
QTextStream &proFileTemplate, QTextStream &proFile, QTextStream &proFileTemplate, QTextStream &proFile,
bool &commentOutNextLine) const bool &commentOutNextLine) const
{ {
Q_UNUSED(proFileTemplate)
Q_UNUSED(proFile) Q_UNUSED(proFile)
if (line.contains(QLatin1String("# INCLUDE_DEPLOYMENT_PRI"))) { if (line.contains(QLatin1String("# TOUCH_OPTIMIZED_NAVIGATION")))
proFileTemplate.readLine(); // eats 'include(deployment.pri)'
} else if (line.contains(QLatin1String("# TOUCH_OPTIMIZED_NAVIGATION"))) {
commentOutNextLine = !m_touchOptimizedNavigationEnabled; commentOutNextLine = !m_touchOptimizedNavigationEnabled;
} }
}
#ifndef CREATORLESSTEST #ifndef CREATORLESSTEST
Core::GeneratedFiles Html5App::generateFiles(QString *errorMessage) const Core::GeneratedFiles Html5App::generateFiles(QString *errorMessage) const

2
src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
View File

@@ -243,8 +243,6 @@ void QtQuickApp::handleCurrentProFileTemplateLine(const QString &line,
} }
proFile << endl; proFile << endl;
} else if (line.contains(QLatin1String("# INCLUDE_DEPLOYMENT_PRI"))) {
proFileTemplate.readLine(); // eats 'include(deployment.pri)'
} }
} }