summaryrefslogtreecommitdiffstats
path: root/tools/shared/symbian/epocroot.cpp
diff options
context:
space:
mode:
authorEckhart Koppen <eckhart.koppen@nokia.com>2011-03-08 07:12:58 (GMT)
committerEckhart Koppen <eckhart.koppen@nokia.com>2011-03-08 07:12:58 (GMT)
commitcddc9fd3913fa511fbe5feac4c6ff61464bc78fa (patch)
tree9ae83863ed3b805d3bb0639d1268906564f9801a /tools/shared/symbian/epocroot.cpp
parentf96b9e139dd67d2be992e86af9fb41e4cdfcb6cf (diff)
parent0766bf2fa4a89e629bbdad185e4919fd49c033a1 (diff)
downloadQt-cddc9fd3913fa511fbe5feac4c6ff61464bc78fa.zip
Qt-cddc9fd3913fa511fbe5feac4c6ff61464bc78fa.tar.gz
Qt-cddc9fd3913fa511fbe5feac4c6ff61464bc78fa.tar.bz2
Merge remote branch 'qt-master/master'
Diffstat (limited to 'tools/shared/symbian/epocroot.cpp')
-rw-r--r--tools/shared/symbian/epocroot.cpp5
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
}
/**