From e4a0fb4d51a359a626856d3febe0822953c81bc7 Mon Sep 17 00:00:00 2001 From: axis Date: Fri, 3 Jul 2009 15:13:46 +0200 Subject: Made qmake support mkspecs under the symbian directory. --- qmake/project.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qmake/project.cpp b/qmake/project.cpp index f5c905d..035362d 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -525,10 +525,13 @@ static void init_symbian(const QMap& vars) if (isForSymbian_value != isForSymbian_NOT_SET) return; - QString spec = QFileInfo(Option::mkfile::qmakespec).fileName(); - if (spec.startsWith("symbian-abld", Qt::CaseInsensitive)) { + QString spec = QDir::fromNativeSeparators(QFileInfo(Option::mkfile::qmakespec).canonicalFilePath()); + int pos = spec.lastIndexOf('/'); + pos = spec.lastIndexOf('/', pos - 1); + spec = spec.mid(pos + 1); + if (spec.endsWith("symbian-abld", Qt::CaseInsensitive)) { isForSymbian_value = isForSymbian_ABLD; - } else if (spec.startsWith("symbian-sbsv2", Qt::CaseInsensitive)) { + } else if (spec.endsWith("symbian-sbsv2", Qt::CaseInsensitive)) { isForSymbian_value = isForSymbian_SBSV2; } else if (spec.startsWith("symbian/", Qt::CaseInsensitive)) { isForSymbian_value = isForSymbian_MAKEFILE; -- cgit v0.12