diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-06-03 08:04:26 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-06-03 08:09:01 (GMT) |
| commit | 095e74825d588fc260f06fba3a1c32ac837cf73d (patch) | |
| tree | d3d614e97ca70577cbe25ee96276cb267f2521fb /mkspecs/common/symbian | |
| parent | a7189fb75a168f89db07d07eeb4f7fcd35d69942 (diff) | |
| download | Qt-095e74825d588fc260f06fba3a1c32ac837cf73d.zip Qt-095e74825d588fc260f06fba3a1c32ac837cf73d.tar.gz Qt-095e74825d588fc260f06fba3a1c32ac837cf73d.tar.bz2 | |
Fixed S60_VERSION variable exists checks
Apparently else:exists(xxx)|exists(yyy) syntax doesn't work as I
originally expected if both xxx and yyy exist, so change the check to
use nested exists.
Reviewed-by: Jason Barron
Diffstat (limited to 'mkspecs/common/symbian')
| -rw-r--r-- | mkspecs/common/symbian/symbian-mmp.conf | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf index b0d17be..5a7b2d2 100644 --- a/mkspecs/common/symbian/symbian-mmp.conf +++ b/mkspecs/common/symbian/symbian-mmp.conf @@ -40,15 +40,21 @@ MMP_RULES += "USERINCLUDE ." exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis) { S60_VERSION = 5.2 symbian3 -} else:exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) { - S60_VERSION = 5.1 symbian2 -} else:exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { - S60_VERSION = 5.0 -} else:exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) { - S60_VERSION = 3.2 } else { - S60_VERSION = 3.1 - MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) { + S60_VERSION = 5.1 symbian2 + } else { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) { + S60_VERSION = 5.0 + } else { + exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) { + S60_VERSION = 3.2 + } else { + S60_VERSION = 3.1 + MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET + } + } + } } QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast |