diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-31 08:02:49 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-31 08:02:49 (GMT) |
| commit | f25ea64306a53dae326b322dc40de6d09e347404 (patch) | |
| tree | 6e7fcda3c81fcae6c3e25c319ef255a4cbea15f0 /src/corelib/global/qglobal.h | |
| parent | 8f3cb10d9facc4d6b89c449c97e28a5221d2fabf (diff) | |
| parent | 97902c7f81228fa669acc6e075681dc05b404b1a (diff) | |
| download | Qt-f25ea64306a53dae326b322dc40de6d09e347404.zip Qt-f25ea64306a53dae326b322dc40de6d09e347404.tar.gz Qt-f25ea64306a53dae326b322dc40de6d09e347404.tar.bz2 | |
Merge remote-tracking branch 'mainline/4.7' into 4.7
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 55c96c6..7768b46 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1524,7 +1524,7 @@ public: SV_SF_1 = SV_9_4, SV_SF_2 = 40, SV_SF_3 = 50, - SV_SF_4 = 60 + SV_SF_4 = 60 // Deprecated }; static SymbianVersion symbianVersion(); enum S60Version { @@ -1533,9 +1533,9 @@ public: SV_S60_3_1 = SV_9_2, SV_S60_3_2 = SV_9_3, SV_S60_5_0 = SV_9_4, - //versions beyond 5.0 are to be confirmed - it is better to use symbian version SV_S60_5_1 = SV_SF_2, - SV_S60_5_2 = SV_SF_3 + SV_S60_5_2 = SV_SF_3, + SV_S60_5_3 = 70 }; static S60Version s60Version(); #endif @@ -2459,6 +2459,10 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #define Q_SYMBIAN_SUPPORTS_MULTIPLE_SCREENS #endif +#ifdef SYMBIAN_GRAPHICS_FIXNATIVEORIENTATION +#define Q_SYMBIAN_SUPPORTS_FIXNATIVEORIENTATION +#endif + //Symbian does not support data imports from a DLL #define Q_NO_DATA_RELOCATION |