diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 16:03:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-25 16:03:46 (GMT) |
| commit | 2ccf2a09653d25c87e9a50dc842d2aff54fa914c (patch) | |
| tree | d846c6f967545dd7f5480250e890de066b726244 /tools | |
| parent | 184398f4ada4b34fc9834c2341597a3b8c18e842 (diff) | |
| parent | 3ea6d3e9d7c66cc9058c75c2fb38d4e38d2352b0 (diff) | |
| download | Qt-2ccf2a09653d25c87e9a50dc842d2aff54fa914c.zip Qt-2ccf2a09653d25c87e9a50dc842d2aff54fa914c.tar.gz Qt-2ccf2a09653d25c87e9a50dc842d2aff54fa914c.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
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 } /** |