diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 08:38:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-15 08:38:11 (GMT) |
| commit | c5a0190054421ac5c3325bba6835b63c70b6bda2 (patch) | |
| tree | 1aec799bfb418d135496193750887915c9dc6094 /qmake | |
| parent | 6ce4e6247fa6e438a34a498cd803a5542ff338b7 (diff) | |
| parent | 9e66838d0e766da45524d38c7235441500877c41 (diff) | |
| download | Qt-c5a0190054421ac5c3325bba6835b63c70b6bda2.zip Qt-c5a0190054421ac5c3325bba6835b63c70b6bda2.tar.gz Qt-c5a0190054421ac5c3325bba6835b63c70b6bda2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Shouldn't call epocRoot() in non-epoc builds in generatePkgFile
Diffstat (limited to 'qmake')
| -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); |