diff options
author | Sami Merila <sami.merila@nokia.com> | 2011-08-25 11:21:30 (GMT) |
---|---|---|
committer | Sami Merila <sami.merila@nokia.com> | 2011-08-25 11:21:30 (GMT) |
commit | 338346ceae99ec0d8f7227af12333d63393992be (patch) | |
tree | 1f3ba9fd2339da2d07cdead8b6ac51e972f4d42c | |
parent | c691fc126a61a6153628a176d4375dd7ac76c0e1 (diff) | |
download | Qt-338346ceae99ec0d8f7227af12333d63393992be.zip Qt-338346ceae99ec0d8f7227af12333d63393992be.tar.gz Qt-338346ceae99ec0d8f7227af12333d63393992be.tar.bz2 |
Crash when creating scroll bar skin graphics on S60 (debug only)
When fetching bitmap graphics from native without fallback information,
do not define fallback-mif file, since native side uses ASSERT_DEBUG
to crash the client if file info exists, but bitmap ID is not defined.
This started crashing when root theme removed default scrollbar
graphics from its content for Belle release.
Task-number: QTBUG-15993
Reviewed-by: Miikka Heikkinen
-rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index f1cf2f6..2051362 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -711,7 +711,7 @@ QPixmap QS60StyleModeSpecifics::colorSkinnedGraphicsLX( colorIndex, icon, iconMask, - AknIconUtils::AvkonIconFileName(), + (fallbackGraphicID != KErrNotFound ? AknIconUtils::AvkonIconFileName() : KNullDesC), fallbackGraphicID, fallbackGraphicsMaskID, defaultColor); @@ -949,7 +949,7 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX( skinId, icon, iconMask, - AknIconUtils::AvkonIconFileName(), + (fallbackGraphicID != KErrNotFound ? AknIconUtils::AvkonIconFileName() : KNullDesC), fallbackGraphicID , fallbackGraphicsMaskID); @@ -1043,7 +1043,7 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX( KAknsIIDDefault, //animation is not themed, lets force fallback graphics animationFrame, frameMask, - AknIconUtils::AvkonIconFileName(), + (fallbackGraphicID != KErrNotFound ? AknIconUtils::AvkonIconFileName() : KNullDesC), fallbackGraphicID , fallbackGraphicsMaskID); } |