diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 04:00:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 04:00:51 (GMT) |
| commit | 3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0 (patch) | |
| tree | bd1a7d88e8417e998581c42cdb3fb8745da28238 /tools | |
| parent | 27f6164ecc50546ef31e17e57ea528aabcd6808a (diff) | |
| parent | db4dda63e54731424a2c4b0d406df87c022da462 (diff) | |
| download | Qt-3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0.zip Qt-3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0.tar.gz Qt-3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0.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:
Always prepend drive letter to $$EPOCROOT in Windows Symbian builds
Add files deployed using qmake_emulator_deployment.flm to 'what' list
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/shared/symbian/epocroot.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/shared/symbian/epocroot.cpp b/tools/shared/symbian/epocroot.cpp index e128cd2..5e6bc12 100644 --- a/tools/shared/symbian/epocroot.cpp +++ b/tools/shared/symbian/epocroot.cpp @@ -99,6 +99,11 @@ static void fixEpocRoot(QString &path) if (!path.size() || path[path.size()-1] != QLatin1Char('/')) { path += QLatin1Char('/'); } +#ifdef Q_OS_WIN32 + // Make sure we have drive letter in epocroot + if (path.startsWith(QLatin1Char('/'))) + path.prepend(QDir::currentPath().left(2)); +#endif } /** |