diff options
| author | axis <qt-info@nokia.com> | 2009-07-03 13:13:46 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 09:25:55 (GMT) |
| commit | e4a0fb4d51a359a626856d3febe0822953c81bc7 (patch) | |
| tree | fc9f16596f442e8a95f1115f9ab17cc50b3e1c88 /qmake | |
| parent | a9c7246c6bfddbc69acceb81134a7856e2855dcd (diff) | |
| download | Qt-e4a0fb4d51a359a626856d3febe0822953c81bc7.zip Qt-e4a0fb4d51a359a626856d3febe0822953c81bc7.tar.gz Qt-e4a0fb4d51a359a626856d3febe0822953c81bc7.tar.bz2 | |
Made qmake support mkspecs under the symbian directory.
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/project.cpp | 9 |
1 files 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<QString, QStringList>& 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; |