Commit 2bba8353 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Do not warn on ':' in symbian project names

 ... if it is part of the drive letter only.
parent 1f26640a
...@@ -207,7 +207,7 @@ void QMakeStep::run(QFutureInterface<bool> &fi) ...@@ -207,7 +207,7 @@ void QMakeStep::run(QFutureInterface<bool> &fi)
return; return;
} }
#endif #endif
// Report en error if EPOC root is not set: // Report an error if EPOC root is not set:
if (epocRootDir.isEmpty() || !QDir(epocRootDir).exists()) { if (epocRootDir.isEmpty() || !QDir(epocRootDir).exists()) {
addTask(Task(Task::Error, addTask(Task(Task::Error,
tr("The Symbian SDK was not found for Qt version %1.").arg(qtVersion->displayName()), tr("The Symbian SDK was not found for Qt version %1.").arg(qtVersion->displayName()),
...@@ -223,7 +223,12 @@ void QMakeStep::run(QFutureInterface<bool> &fi) ...@@ -223,7 +223,12 @@ void QMakeStep::run(QFutureInterface<bool> &fi)
return; return;
} }
// Warn of strange characters in project name: // Warn of strange characters in project name:
if (projectDir.contains(QRegExp("[^a-zA-Z0-9./]"))) { QString projectPath = projectDir;
#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./]"))) {
addTask(Task(Task::Warning, addTask(Task(Task::Warning,
tr("The Symbian toolchain does not handle special characters in a project path well."), tr("The Symbian toolchain does not handle special characters in a project path well."),
QString(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM)); QString(), -1, ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment