summaryrefslogtreecommitdiffstats
path: root/tools/shared/symbian
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2011-02-23 14:17:25 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2011-02-24 14:26:05 (GMT)
commitdb4dda63e54731424a2c4b0d406df87c022da462 (patch)
treeb676f883d2a766325b406bd748c1b9d02e37b08f /tools/shared/symbian
parent435222b11346f9a90a547adab28a81cb31a3a854 (diff)
downloadQt-db4dda63e54731424a2c4b0d406df87c022da462.zip
Qt-db4dda63e54731424a2c4b0d406df87c022da462.tar.gz
Qt-db4dda63e54731424a2c4b0d406df87c022da462.tar.bz2
Always prepend drive letter to $$EPOCROOT in Windows Symbian builds
Internal EPOCROOT handling in Qt already supports paths with and without drive letter in both sbsv2 and abld builds, so we might as well make it consistent and make sure the drive letter is prepended to $$EPOCROOT value if it is missing. This also makes paths deriving from $$EPOCROOT always usable in sbsv2 FLM files, which do not like paths without drive letters. Task-number: QT-4611 Reviewed-by: Janne Koskinen
Diffstat (limited to 'tools/shared/symbian')
-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
}
/**