Commit 3970f608 authored by Alessandro Portale's avatar Alessandro Portale
Browse files

Include touchnavigation.pri from main .pro file

And have that entry removed by the wizard. REMOVE_NEXT_LINE
is now the keyword for line removal. INCLUDE_DEPLOYMENT_PRI
was replaced by REMOVE_NEXT_LINE.
parent 28843faa
......@@ -32,6 +32,8 @@ SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
include(html5applicationviewer/html5applicationviewer.pri)
# INCLUDE_DEPLOYMENT_PRI (wizard will remove the include and append deployment.pri to qmlapplicationviewer.pri, instead) #
# REMOVE_NEXT_LINE (wizard will remove the include and merge the touchnavigation code into html5applicationviewer.cpp, instead) #
include(html5applicationviewer/touchnavigation/touchnavigation.pri)
# REMOVE_NEXT_LINE (wizard will remove the include and append deployment.pri to qmlapplicationviewer.pri, instead) #
include(../shared/deployment.pri)
qtcAddDeployment()
......@@ -8,5 +8,3 @@ QT += webkit
SOURCES += $$PWD/html5applicationviewer.cpp
HEADERS += $$PWD/html5applicationviewer.h
INCLUDEPATH += $$PWD
include(touchnavigation/touchnavigation.pri)
......@@ -33,6 +33,6 @@ SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
include(qmlapplicationviewer/qmlapplicationviewer.pri)
# INCLUDE_DEPLOYMENT_PRI (wizard will remove the include and append deployment.pri to qmlapplicationviewer.pri, instead) #
# REMOVE_NEXT_LINE (wizard will remove the include and append deployment.pri to qmlapplicationviewer.pri, instead) #
include(../shared/deployment.pri)
qtcAddDeployment()
......@@ -279,8 +279,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 if (line.contains(QLatin1String("# REMOVE_NEXT_LINE"))) {
in.readLine(); // eats the following line
} else {
handleCurrentProFileTemplateLine(line, in, out, commentOutNextLine);
}
......
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