diff options
| author | Sami Merila <sami.merila@nokia.com> | 2011-08-25 08:11:28 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2011-08-25 08:11:28 (GMT) |
| commit | c691fc126a61a6153628a176d4375dd7ac76c0e1 (patch) | |
| tree | caed4c769992570112ceecf0be6b68291d43e12a /src/gui | |
| parent | 7ba3250a1e6cf54c1cacbdf71ac57befd66eed90 (diff) | |
| download | Qt-c691fc126a61a6153628a176d4375dd7ac76c0e1.zip Qt-c691fc126a61a6153628a176d4375dd7ac76c0e1.tar.gz Qt-c691fc126a61a6153628a176d4375dd7ac76c0e1.tar.bz2 | |
QS60Style omits drawing theme background in some Symbian SDKs
Latest internal RnD releases have upgraded Symbian version to 5.4.
As QS60Style was not aware of this, all the textures that didn't
define any version information (i.e. available in all versions)
were not drawn at all.
Task-number: QT-5176
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index 67181af..f1cf2f6 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -91,6 +91,7 @@ enum TSupportRelease { ES60_5_1 = 0x0008, ES60_5_2 = 0x0010, ES60_5_3 = 0x0020, + ES60_5_4 = 0x0040, ES60_3_X = ES60_3_1 | ES60_3_2, // Releases before Symbian Foundation ES60_PreSF = ES60_3_1 | ES60_3_2 | ES60_5_0, @@ -98,8 +99,10 @@ enum TSupportRelease { ES60_Pre52 = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1, // Releases before S60 5.3 ES60_Pre53 = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2, + // Releases before S60 5.4 + ES60_Pre54 = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2 | ES60_5_3, // Add all new releases here - ES60_All = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2 | ES60_5_3 + ES60_All = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2 | ES60_5_3 | ES60_5_4 }; typedef struct { @@ -1264,7 +1267,8 @@ bool QS60StyleModeSpecifics::checkSupport(const int supportedRelease) (currentRelease == QSysInfo::SV_S60_5_0 && supportedRelease & ES60_5_0) || (currentRelease == QSysInfo::SV_S60_5_1 && supportedRelease & ES60_5_1) || (currentRelease == QSysInfo::SV_S60_5_2 && supportedRelease & ES60_5_2) || - (currentRelease == QSysInfo::SV_S60_5_3 && supportedRelease & ES60_5_3) ); + (currentRelease == QSysInfo::SV_S60_5_3 && supportedRelease & ES60_5_3) || + (currentRelease == QSysInfo::SV_S60_5_4 && supportedRelease & ES60_5_4) ); } TAknsItemID QS60StyleModeSpecifics::partSpecificThemeId(int part) |