diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-15 07:47:02 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-04-15 07:51:24 (GMT) |
| commit | 9e66838d0e766da45524d38c7235441500877c41 (patch) | |
| tree | f9b3fb768616a990198f9835b387227f1e446de0 /qmake/generators | |
| parent | ca52a35fa6bf4a86310d06c22aa256ab654712de (diff) | |
| download | Qt-9e66838d0e766da45524d38c7235441500877c41.zip Qt-9e66838d0e766da45524d38c7235441500877c41.tar.gz Qt-9e66838d0e766da45524d38c7235441500877c41.tar.bz2 | |
Shouldn't call epocRoot() in non-epoc builds in generatePkgFile
Reviewed-by: Janne Koskinen
Diffstat (limited to 'qmake/generators')
| -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); |