diff options
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/qplatformdefs.h | 6 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 6 | ||||
| -rw-r--r-- | mkspecs/features/symbian/qt.prf | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/mkspecs/common/symbian/qplatformdefs.h b/mkspecs/common/symbian/qplatformdefs.h index ebcd295..5f093b7 100644 --- a/mkspecs/common/symbian/qplatformdefs.h +++ b/mkspecs/common/symbian/qplatformdefs.h @@ -157,9 +157,9 @@ #endif -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#if defined(__ISO_C_VISIBLE) && (__ISO_C_VISIBLE >= 1999) +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf #endif diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 4f3e1d2..554bf85 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -118,11 +118,13 @@ INCLUDEPATH = \ $$INCLUDEPATH # Supports S60 3.0, 3.1, 3.2 and 5.0 by default -default_deployment.depends = \ +default_deployment.pkg_prerules = \ + "; Default HW/platform dependencies" \ "[0x101F7961],0,0,0,{\"S60ProductID\"}" \ "[0x102032BE],0,0,0,{\"S60ProductID\"}" \ "[0x102752AE],0,0,0,{\"S60ProductID\"}" \ - "[0x1028315F],0,0,0,{\"S60ProductID\"}" + "[0x1028315F],0,0,0,{\"S60ProductID\"}" \ + " " DEPLOYMENT += default_deployment diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf index 29b39a5..db2ea14 100644 --- a/mkspecs/features/symbian/qt.prf +++ b/mkspecs/features/symbian/qt.prf @@ -7,7 +7,8 @@ CONFIG += qtmain load(qt) contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) { - default_deployment.depends += \ + default_deployment.pkg_prerules += \ + "; Default dependency to Qt libraries" \ "(0x2001E61C), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtLibs pre-release\"}" } |