3 files changed, 14 insertions, 16 deletions
diff --git a/qmake/generators/symbian/initprojectdeploy_symbian.cpp b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
index 6407412..4552185 100644
--- a/qmake/generators/symbian/initprojectdeploy_symbian.cpp
+++ b/qmake/generators/symbian/initprojectdeploy_symbian.cpp
@@ -91,12 +91,13 @@ static void createPluginStub(const QFileInfo& info,
                              QStringList& generatedDirs,
                              QStringList& generatedFiles)
 {
-    QDir().mkpath(QLatin1String(PLUGIN_STUB_DIR));
-    if (!generatedDirs.contains(PLUGIN_STUB_DIR))
-        generatedDirs << PLUGIN_STUB_DIR;
+    QString pluginStubDir = Option::output_dir + QLatin1Char('/') + QLatin1String(PLUGIN_STUB_DIR);
+    QDir().mkpath(pluginStubDir);
+    if (!generatedDirs.contains(pluginStubDir))
+        generatedDirs << pluginStubDir;
     // Plugin stubs must have different name from the actual plugins, because
     // the toolchain for creating ROM images cannot handle non-binary .dll files properly.
-    QFile stubFile(QLatin1String(PLUGIN_STUB_DIR "/") + info.completeBaseName() + "." SUFFIX_QTPLUGIN);
+    QFile stubFile(pluginStubDir + QLatin1Char('/') + info.completeBaseName() + QLatin1Char('.') + QLatin1String(SUFFIX_QTPLUGIN));
     if (stubFile.open(QIODevice::WriteOnly)) {
         if (!generatedFiles.contains(stubFile.fileName()))
             generatedFiles << stubFile.fileName();
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index b730d9e..adbd009 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -150,9 +150,8 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
         pkgTarget = project->first("TARGET");
     pkgTarget = generator->unescapeFilePath(pkgTarget);
     pkgTarget = removePathSeparators(pkgTarget);
-    QString pkgFilename = QString("%1_template.%2").arg(pkgTarget).arg("pkg");
-    if (!Option::output_dir.isEmpty())
-        pkgFilename = Option::output_dir + '/' + pkgFilename;
+    QString pkgFilename = Option::output_dir + QLatin1Char('/') + QString("%1_template.%2")
+                          .arg(pkgTarget).arg("pkg");
 
     QFile pkgFile(pkgFilename);
     if (!pkgFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -173,9 +172,9 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB
     QString dateStr = QDateTime::currentDateTime().toString(Qt::ISODate);
 
     // Header info
-    QString wrapperPkgFilename = QString("%1_installer.%2")
-                                .arg(pkgTarget)
-                                .arg("pkg");
+    QString wrapperPkgFilename = Option::output_dir + QLatin1Char('/') + QString("%1_installer.%2")
+                                 .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"
         ";\n\n";
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index 1dee4ac..1006e39 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -214,7 +214,7 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
     // Generate empty wrapper makefile here, because wrapper makefile must exist before writeMkFile,
     // but all required data is not yet available.
     bool isPrimaryMakefile = true;
-    QString wrapperFileName("Makefile");
+    QString wrapperFileName = Option::output_dir + QLatin1Char('/') + QLatin1String("Makefile");
     QString outputFileName = fileInfo(Option::output.fileName()).fileName();
     if (outputFileName != BLD_INF_FILENAME) {
         wrapperFileName.append(".").append(outputFileName.startsWith(BLD_INF_FILENAME)
@@ -246,10 +246,8 @@ bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
     shortProFilename.replace(0, shortProFilename.lastIndexOf("/") + 1, QString(""));
     shortProFilename.replace(Option::pro_ext, QString(""));
 
-    QString mmpFilename = shortProFilename;
-    mmpFilename.append("_");
-    mmpFilename.append(uid3);
-    mmpFilename.append(Option::mmp_ext);
+    QString mmpFilename = Option::output_dir + QLatin1Char('/') + shortProFilename + QLatin1Char('_')
+                          + uid3 + Option::mmp_ext;
     writeMmpFile(mmpFilename, symbianLangCodes);
 
     if (targetType == TypeExe) {
@@ -270,7 +268,7 @@ void SymbianMakefileGenerator::writeCustomDefFile()
 {
     if (targetType == TypePlugin && !project->isActiveConfig("stdbinary")) {
         // Create custom def file for plugin
-        QFile ft(QLatin1String(PLUGIN_COMMON_DEF_FILE_ACTUAL));
+        QFile ft(Option::output_dir + QLatin1Char('/') + QLatin1String(PLUGIN_COMMON_DEF_FILE_ACTUAL));
 
         if (ft.open(QIODevice::WriteOnly)) {
             generatedFiles << ft.fileName();