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

Qt Quick app wizard: Merge two .pri files into one

Browse Source 
As an project tree unclutter measure, we now append the
deployment.pri to the qmlapplicationviewer.pri while generating
the stub for Qt Quick Apps.

At the same tame we keep te Qt Mobile App wizard intact, which
continues to generate the deployment.pri file.

And we also keep the qmlapp/app.pro template functioning as
project, therefore we leave the include(../shared/deployment.pri)
in qmlapp/app.pro and let the wizard remove that incude.

Task-Number: QTCREATORBUG-2568
Reviewed-By: ck
This commit is contained in:
Alessandro Portale
2010-10-04 04:10:54 +02:00
parent a95ed6420d
commit e1aa293544
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,7 +319,6 @@ Core::GeneratedFiles AbstractMobileApp::generateFiles(QString *errorMessage) con
files << file(generateFile(AbstractGeneratedFileInfo::SymbianSvgIconFile, errorMessage), path(SymbianSvgIcon));
files << file(generateFile(AbstractGeneratedFileInfo::MaemoPngIconFile, errorMessage), path(MaemoPngIcon));
files << file(generateFile(AbstractGeneratedFileInfo::DesktopFile, errorMessage), path(Desktop));
files << file(generateFile(AbstractGeneratedFileInfo::DeploymentPriFile, errorMessage), path(DeploymentPri));
return files;
}
#endif // CREATORLESSTEST