summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-02-10 17:52:43 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-02-10 17:52:43 (GMT)
commite2510486b8857c8f660dfc2d0ef2e4798c60a262 (patch)
tree4d2d776dd2d8af7d796a0c43f857a44be13fa3d3 /qmake
parent670d101d1f8def0c55a1e22d447d4989462ee331 (diff)
downloadQt-e2510486b8857c8f660dfc2d0ef2e4798c60a262.zip
Qt-e2510486b8857c8f660dfc2d0ef2e4798c60a262.tar.gz
Qt-e2510486b8857c8f660dfc2d0ef2e4798c60a262.tar.bz2
Place the generated pkg file in the build dir.
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/symbian/symbiancommon.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index ccbc8cb..652025b 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -118,9 +118,9 @@ 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 pkgFilename = QString("%1/%2_template.%3")
+ .arg(Option::output_dir).arg(fixedTarget).arg("pkg");
+
QFile pkgFile(pkgFilename);
if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
PRINT_FILE_CREATE_ERROR(pkgFilename);