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 <tobias.hunger@nokia.com>
(cherry picked from commit 059e5f30de)
This commit is contained in:
Tobias Hunger
2011-08-26 10:09:38 +00:00
committed by Eike Ziller
parent 14ee91dc54
commit e50344fdda

View File

@@ -328,7 +328,11 @@ QList<ProjectExplorer::Task> SymbianQtVersion::reportIssuesImpl(const QString &p
QList<ProjectExplorer::Task> results = BaseQtVersion::reportIssuesImpl(proFile, buildDir); QList<ProjectExplorer::Task> results = BaseQtVersion::reportIssuesImpl(proFile, buildDir);
const QString epocRootDir = systemRoot(); const QString epocRootDir = systemRoot();
// Report an error if project- and epoc directory are on different drives: // 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, results.append(ProjectExplorer::Task(ProjectExplorer::Task::Error,
QCoreApplication::translate("ProjectExplorer::Internal::S60ProjectChecker", QCoreApplication::translate("ProjectExplorer::Internal::S60ProjectChecker",
"The Symbian SDK and the project sources must reside on the same drive."), "The Symbian SDK and the project sources must reside on the same drive."),