diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
index d845093ab7b51f201b7ff84e0f70ba9cc8e25bc7..80325c14771895baec6ef2122ab1976c9b3c09e3 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
+++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
@@ -10,6 +10,7 @@ SOURCES += $$PWD/s60devices.cpp \
$$PWD/s60emulatorrunconfiguration.cpp \
$$PWD/s60devicerunconfiguration.cpp \
$$PWD/s60devicerunconfigurationwidget.cpp \
+ $$PWD/s60projectchecker.cpp \
$$PWD/rvcttoolchain.cpp \
$$PWD/s60runconfigbluetoothstarter.cpp \
$$PWD/abldparser.cpp \
@@ -24,6 +25,7 @@ HEADERS += $$PWD/s60devices.h \
$$PWD/s60emulatorrunconfiguration.h \
$$PWD/s60devicerunconfiguration.h \
$$PWD/s60devicerunconfigurationwidget.h \
+ $$PWD/s60projectchecker.h \
$$PWD/rvcttoolchain.h \
$$PWD/s60runconfigbluetoothstarter.h \
$$PWD/abldparser.h \
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp b/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b0611e3add1223d52027d4f8804aad864f1a26d7
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp
@@ -0,0 +1,85 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#include "s60projectchecker.h"
+
+#include <projectexplorer/projectexplorerconstants.h>
+#include <qt4projectmanager/qt-s60/s60manager.h>
+#include <qt4projectmanager/qt4project.h>
+#include <qt4projectmanager/qtversionmanager.h>
+
+using namespace ProjectExplorer;
+using namespace Qt4ProjectManager;
+using namespace Qt4ProjectManager::Internal;
+
+QList<ProjectExplorer::Task>
+S60ProjectChecker::reportIssues(const QString &proFile, const QtVersion *version)
+{
+ QList<ProjectExplorer::Task> results;
+ const QString epocRootDir = QDir(Internal::S60Manager::instance()->deviceForQtVersion(version).epocRoot).absolutePath();
+ QFileInfo cppheader(epocRootDir + QLatin1String("/epoc32/include/stdapis/string.h"));
+#if defined (Q_OS_WIN)
+ // Report an error if project- and epoc directory are on different drives:
+ if (!epocRootDir.startsWith(proFile.left(3), Qt::CaseInsensitive)) {
+ results.append(Task(Task::Error,
+ QObject::tr("The Symbian SDK and the project sources must reside on the same drive."),
+ QString(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
+ }
+#endif
+ // Report an error if EPOC root is not set:
+ if (epocRootDir.isEmpty() || !QDir(epocRootDir).exists()) {
+ results.append(Task(Task::Error,
+ QObject::tr("The Symbian SDK was not found for Qt version %1.").arg(version->displayName()),
+ QString(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
+ }
+ if (!cppheader.exists()) {
+ results.append(Task(Task::Error,
+ QObject::tr("The \"Open C/C++ plugin\" is not installed in the Symbian SDK or the Symbian SDK path is misconfigured for Qt version %1.").arg(version->displayName()),
+ QString(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
+ }
+ // Warn of strange characters in project name:
+ QString projectPath = proFile;
+#if defined (Q_OS_WIN)
+ if (projectPath.at(1) == QChar(':') && projectPath.at(0).toUpper() >= QChar('A') && projectPath.at(0).toUpper() <= QChar('Z'))
+ projectPath = projectPath.mid(2);
+#endif
+ if (projectPath.contains(QRegExp("[^a-zA-Z0-9./]"))) {
+ results.append(Task(Task::Warning,
+ QObject::tr("The Symbian toolchain does not handle special characters in a project path well."),
+ QString(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
+ }
+ return results;
+}
+
+QList<ProjectExplorer::Task>
+S60ProjectChecker::reportIssues(const Qt4Project *project, const QtVersion *version)
+{
+ QString proFile = project->file()->fileName();
+ return reportIssues(proFile, version);
+}
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.h b/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.h
new file mode 100644
index 0000000000000000000000000000000000000000..ac87f0d6cfbd5171dcf18546732ae04c4f2fa916
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.h
@@ -0,0 +1,62 @@
+/**************************************************************************
+**
+** This file is part of Qt Creator
+**
+** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** Commercial Usage
+**
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+**
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+**
+**************************************************************************/
+
+#ifndef S60PROJECTCHECKER_H
+#define S60PROJECTCHECKER_H
+
+#include <projectexplorer/taskwindow.h>
+
+namespace Qt4ProjectManager {
+class QtVersion;
+class Qt4Project;
+
+namespace Internal {
+
+class S60ProjectChecker
+{
+public:
+ /// Check a .pro-file/Qt version combination on possible issues with
+ /// its symbian setup.
+ /// @return a list of tasks, ordered on severity (errors first, then
+ /// warnings and finally info items.
+ static QList<ProjectExplorer::Task>
+ reportIssues(const QString &proFile, const QtVersion *version);
+
+ /// Check a project/Qt version combination on possible issues with
+ /// its symbian setup.
+ /// @return a list of tasks, ordered on severity (errors first, then
+ /// warnings and finally info items.
+ static QList<ProjectExplorer::Task>
+ reportIssues(const Qt4Project *project, const QtVersion *version);
+};
+
+} // namespace Internal
+} // namespace Qt4ProjectExplorer
+
+#endif // S60PROJECTCHECKER_H