diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-23 19:04:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-23 19:04:06 (GMT) |
| commit | 660f881f04a0880c83a0b43b4f4d0e89da082d92 (patch) | |
| tree | fc5cd9fb8716eaf6837a31be1be7af718f495d3d /src/gui/styles/qs60style_s60.cpp | |
| parent | 3274c40dee91aff48d5345187b43613be6e9f4d9 (diff) | |
| parent | 9a42d9815b73e5ceb25360af02936bcb0454a965 (diff) | |
| download | Qt-660f881f04a0880c83a0b43b4f4d0e89da082d92.zip Qt-660f881f04a0880c83a0b43b4f4d0e89da082d92.tar.gz Qt-660f881f04a0880c83a0b43b4f4d0e89da082d92.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:
Icon in QMessageBox::question is deformed on Symbian
Prevent crash when connecting signal in splitview
GraphicsViews: Focused widget is not visible after orientation change
GraphicsViews: Focused widget is not visible after orientation change
Add missing nullify for the s60 style's background pixmap pointer.
Diffstat (limited to 'src/gui/styles/qs60style_s60.cpp')
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index c5149a3..64d2ad2 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -1402,6 +1402,7 @@ QPixmap QS60StylePrivate::backgroundTexture(bool skipCreation) if (m_background->width() != applicationRect.Width() || m_background->height() != applicationRect.Height()) { delete m_background; + m_background = 0; createNewBackground = true; } } |