diff options
| author | axis <qt-info@nokia.com> | 2009-06-26 13:43:29 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-10-23 09:25:55 (GMT) |
| commit | e3764a552e34c9ac1b853f193e09b02d2631ede4 (patch) | |
| tree | 8cc05fb4a796d958d8dbe0010887b08861c667df | |
| parent | 7bbb5a34ee39d60d4c72df5ed8bd3ac13b5dc554 (diff) | |
| download | Qt-e3764a552e34c9ac1b853f193e09b02d2631ede4.zip Qt-e3764a552e34c9ac1b853f193e09b02d2631ede4.tar.gz Qt-e3764a552e34c9ac1b853f193e09b02d2631ede4.tar.bz2 | |
Enabled Symbian scope when compiling with linux-armcc.
Based on a patch by Simon Hausmann.
| -rw-r--r-- | qmake/project.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index e49441b..f5c905d 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -512,6 +512,7 @@ enum isForSymbian_enum { isForSymbian_FALSE = 0, isForSymbian_ABLD = 1, isForSymbian_SBSV2 = 2, + isForSymbian_MAKEFILE = 3, }; static isForSymbian_enum isForSymbian_value = isForSymbian_NOT_SET; @@ -529,6 +530,8 @@ static void init_symbian(const QMap<QString, QStringList>& vars) isForSymbian_value = isForSymbian_ABLD; } else if (spec.startsWith("symbian-sbsv2", Qt::CaseInsensitive)) { isForSymbian_value = isForSymbian_SBSV2; + } else if (spec.startsWith("symbian/", Qt::CaseInsensitive)) { + isForSymbian_value = isForSymbian_MAKEFILE; } else { QStringList generatorList = vars["MAKEFILE_GENERATOR"]; @@ -557,7 +560,7 @@ bool isForSymbian() if (isForSymbian_value == isForSymbian_NOT_SET) init_symbian(QMap<QString, QStringList>()); - return (isForSymbian_value != isForSymbian_FALSE); + return (isForSymbian_value != isForSymbian_NOT_SET && isForSymbian_value != isForSymbian_FALSE); } bool isForSymbianSbsv2() |