diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-25 12:43:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-25 12:43:53 (GMT) |
| commit | 4bd7d10a4a366e49808ed72aae1cbdfe5c9c520b (patch) | |
| tree | 1f3ba9fd2339da2d07cdead8b6ac51e972f4d42c | |
| parent | f42cb3b60daee222490a305a3efeed13d8beb065 (diff) | |
| parent | 338346ceae99ec0d8f7227af12333d63393992be (diff) | |
| download | Qt-4bd7d10a4a366e49808ed72aae1cbdfe5c9c520b.zip Qt-4bd7d10a4a366e49808ed72aae1cbdfe5c9c520b.tar.gz Qt-4bd7d10a4a366e49808ed72aae1cbdfe5c9c520b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Crash when creating scroll bar skin graphics on S60 (debug only)
| -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); } |