diff options
| author | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-04-05 07:49:59 (GMT) |
|---|---|---|
| committer | Guoqing Zhang <guoqing.zhang@nokia.com> | 2011-04-05 07:49:59 (GMT) |
| commit | 81921596f6083eedb926c214c3e6324ba4b40cab (patch) | |
| tree | 089f0bbd39c46afbae5e47f8ac990977024bc91c /mkspecs/features/symbian | |
| parent | ebe4edf58728f4dc5cf633ba6fb92dea721b2bdc (diff) | |
| parent | c3e903409b96fede96cb4a7b95ba308663c88879 (diff) | |
| download | Qt-81921596f6083eedb926c214c3e6324ba4b40cab.zip Qt-81921596f6083eedb926c214c3e6324ba4b40cab.tar.gz Qt-81921596f6083eedb926c214c3e6324ba4b40cab.tar.bz2 | |
Merge remote branch 'qt-master/master'
Diffstat (limited to 'mkspecs/features/symbian')
| -rw-r--r-- | mkspecs/features/symbian/default_post.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf index 98ab547..470372e 100644 --- a/mkspecs/features/symbian/default_post.prf +++ b/mkspecs/features/symbian/default_post.prf @@ -85,13 +85,13 @@ contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0 isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000 -# Supports Symbian^3 and Symbian^4 by default and also S60 3.1, 3.2, and 5.0 if built against any of those. +# Supports Symbian^3 platforms by default and also S60 3.1, 3.2, and 5.0 if built against any of those. platform_product_id = S60ProductID platform_product_id = $$addLanguageDependentPkgItem(platform_product_id) pkg_platform_dependencies = \ "; Default HW/platform dependencies" \ "[0x20022E6D],0,0,0,{$$platform_product_id}" \ - "[0x20032DE7],0,0,0,{$$platform_product_id}" + "[0x2003A678],0,0,0,{$$platform_product_id}" contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { pkg_platform_dependencies += \ "[0x102032BE],0,0,0,{$$platform_product_id}" \ |