diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-15 07:47:02 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-04-19 09:18:29 (GMT) |
| commit | c33958190f0e84dd4d4e2615d4dd6a87d2f2dae8 (patch) | |
| tree | f4fc5f5f9cd3cdff86fabee40b2134de5b719aa2 | |
| parent | 15c7e74e0983dac8f21b4cfea7fbef08eb9bbdb0 (diff) | |
| download | Qt-c33958190f0e84dd4d4e2615d4dd6a87d2f2dae8.zip Qt-c33958190f0e84dd4d4e2615d4dd6a87d2f2dae8.tar.gz Qt-c33958190f0e84dd4d4e2615d4dd6a87d2f2dae8.tar.bz2 | |
Shouldn't call epocRoot() in non-epoc builds in generatePkgFile
Reviewed-by: Janne Koskinen
(cherry picked from commit 9e66838d0e766da45524d38c7235441500877c41)
| -rw-r--r-- | qmake/generators/symbian/symbiancommon.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp index 0df2d15..0802c01 100644 --- a/qmake/generators/symbian/symbiancommon.cpp +++ b/qmake/generators/symbian/symbiancommon.cpp @@ -362,8 +362,10 @@ void SymbianCommonGenerator::generatePkgFile(const QString &iconFile, bool epocB // deploy any additional DEPLOYMENT files QString remoteTestPath; + QString zDir; remoteTestPath = QString("!:\\private\\%1").arg(privateDirUid); - QString zDir = epocRoot() + QLatin1String("epoc32/data/z"); + if (epocBuild) + zDir = epocRoot() + QLatin1String("epoc32/data/z"); DeploymentList depList; initProjectDeploySymbian(project, depList, remoteTestPath, true, epocBuild, "$(PLATFORM)", "$(TARGET)", generatedDirs, generatedFiles); |