Commit 1cce35ec authored by Alessandro Portale's avatar Alessandro Portale

Code deduplication.

The 'include(deployment.pri)' is now removed in a central place.
parent dece4dcc
......@@ -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);
}
......
......@@ -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
......
......@@ -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)'
}
}
......
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