diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-07-28 07:23:46 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-07-28 07:23:46 (GMT) |
| commit | 369d1e0999d1fd130777e0f48831734d30d03efa (patch) | |
| tree | 8b3ef878c6fc36697439d2991101bdfe54dfc7bc | |
| parent | 86b545a41bb1c6163315a88512d488c2b99607e4 (diff) | |
| download | Qt-369d1e0999d1fd130777e0f48831734d30d03efa.zip Qt-369d1e0999d1fd130777e0f48831734d30d03efa.tar.gz Qt-369d1e0999d1fd130777e0f48831734d30d03efa.tar.bz2 | |
Changed .pkg files to follow the naming scheme of make targets.
Task: 246499
QMake now generates the package files like deform_debug-gcce.pkg
instead of deform_gcce_udeb.pkg. The new naming scheme is inline
with make target which in this example was debug-gcce.
| -rw-r--r-- | qmake/generators/symbian/symmake.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp index 374d058..ec19675 100644 --- a/qmake/generators/symbian/symmake.cpp +++ b/qmake/generators/symbian/symmake.cpp @@ -269,10 +269,11 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t) { } bool SymbianMakefileGenerator::generatePkgFile(const QString &compiler, const QString &config, const QString &iconFile) { - QString pkgFilename = QString("%1_%2_%3.%4") + QString build = ( config == "udeb" ) ? "debug" : "release"; + QString pkgFilename = QString("%1_%2-%3.%4") .arg(fileInfo(project->projectFile()).completeBaseName()) + .arg(build) .arg(compiler) - .arg(config) .arg("pkg"); QFile pkgFile(pkgFilename); if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) |