From 059e5f30deacdec5ad9449c6247b609be5cf9727 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 26 Aug 2011 10:09:38 +0000 Subject: [PATCH] Symbian: Warn if EPOCROOT is on different drive from the sources ... even when using SBSv2 Task-Number: QTCREATORBUG-5907 Change-Id: Ibb79dc798b8146f9e5658e186f499bfd47fb3d9e Reviewed-on: http://codereview.qt.nokia.com/3660 Reviewed-by: Tobias Hunger --- src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp index e1c1e25a513..69b9b45d611 100644 --- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp @@ -329,7 +329,11 @@ QList SymbianQtVersion::reportIssuesImpl(const QString &p QList results = BaseQtVersion::reportIssuesImpl(proFile, buildDir); const QString epocRootDir = systemRoot(); // Report an error if project- and epoc directory are on different drives: - if (!epocRootDir.startsWith(proFile.left(3), Qt::CaseInsensitive) && !isBuildWithSymbianSbsV2()) { + if (!epocRootDir.startsWith(proFile.left(3), Qt::CaseInsensitive)) { + // Note: SBSv2 works fine with the EPOCROOT and the sources being on different drives, + // but it fails when Qt is on a different drive than the sources. Since + // the SDK installs Qt and the EPOCROOT on the same drive we just stick with this + // warning. results.append(ProjectExplorer::Task(ProjectExplorer::Task::Error, QCoreApplication::translate("ProjectExplorer::Internal::S60ProjectChecker", "The Symbian SDK and the project sources must reside on the same drive."),