From 369d1e0999d1fd130777e0f48831734d30d03efa Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 28 Jul 2009 10:23:46 +0300 Subject: 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. --- qmake/generators/symbian/symmake.cpp | 5 +++-- 1 file 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)) -- cgit v0.12