diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2011-08-26 10:09:38 +0000 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-09-01 13:15:12 +0200 |
| commit | e50344fdda5e48a92105433e3a537da39f47c51f (patch) | |
| tree | 03b2112e9c67d06a6296d5e818ad438f5624e6cf /src | |
| parent | 14ee91dc5425fc95b7a970c7843b5160ecb69642 (diff) | |
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 059e5f30deacdec5ad9449c6247b609be5cf9727)
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp index 02d568e572..94a7010ecb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp @@ -328,7 +328,11 @@ QList<ProjectExplorer::Task> SymbianQtVersion::reportIssuesImpl(const QString &p QList<ProjectExplorer::Task> 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."), |