diff options
| -rw-r--r-- | qmake/generators/symbian/symbiancommon.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp index 670f5f5..9992faa 100644 --- a/qmake/generators/symbian/symbiancommon.cpp +++ b/qmake/generators/symbian/symbiancommon.cpp @@ -65,7 +65,10 @@ SymbianCommonGenerator::SymbianCommonGenerator(MakefileGenerator *generator) void SymbianCommonGenerator::init() { QMakeProject *project = generator->project; - fixedTarget = generator->escapeFilePath(project->first("TARGET")); + fixedTarget = project->first("QMAKE_ORIG_TARGET"); + if (fixedTarget.isEmpty()) + fixedTarget = project->first("TARGET"); + fixedTarget = generator->escapeFilePath(fixedTarget); fixedTarget = removePathSeparators(fixedTarget); removeSpecialCharacters(fixedTarget); @@ -126,7 +129,12 @@ void SymbianCommonGenerator::removeSpecialCharacters(QString& str) void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, DeploymentList &depList, bool epocBuild) { QMakeProject *project = generator->project; - QString pkgFilename = QString("%1_template.%2").arg(fixedTarget).arg("pkg"); + QString pkgTarget = project->first("QMAKE_ORIG_TARGET"); + if (pkgTarget.isEmpty()) + pkgTarget = project->first("TARGET"); + pkgTarget = generator->escapeFilePath(pkgTarget); + pkgTarget = removePathSeparators(pkgTarget); + QString pkgFilename = QString("%1_template.%2").arg(pkgTarget).arg("pkg"); if (!Option::output_dir.isEmpty()) pkgFilename = Option::output_dir + '/' + pkgFilename; @@ -147,7 +155,7 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, Deployment // Header info QString wrapperPkgFilename = QString("%1_installer.%2") - .arg(fixedTarget) + .arg(pkgTarget) .arg("pkg"); QString headerComment = "; %1 generated by qmake at %2\n" "; This file is generated by qmake and should not be modified by the user\n" @@ -383,7 +391,7 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, Deployment // Wrapped files deployment QString currentPath = qmake_getpwd(); - QString sisName = QString("%1.sis").arg(fixedTarget); + QString sisName = QString("%1.sis").arg(pkgTarget); twf << "\"" << currentPath << "/" << sisName << "\" - \"c:\\adm\\" << sisName << "\"" << endl; QString bootStrapPath = QLibraryInfo::location(QLibraryInfo::PrefixPath); |