Skip to content
Snippets Groups Projects
Commit 1cce35ec authored by Alessandro Portale's avatar Alessandro Portale
Browse files

Code deduplication.

The 'include(deployment.pri)' is now removed in a central place.
parent dece4dcc
No related branches found
No related tags found
No related merge requests found
...@@ -280,6 +280,8 @@ QByteArray AbstractMobileApp::generateProFile(QString *errorMessage) const ...@@ -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);
} }
......
...@@ -149,12 +149,10 @@ void Html5App::handleCurrentProFileTemplateLine(const QString &line, ...@@ -149,12 +149,10 @@ 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
......
...@@ -243,8 +243,6 @@ void QtQuickApp::handleCurrentProFileTemplateLine(const QString &line, ...@@ -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)'
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment