summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qs60style_s60.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-15 14:20:23 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-15 14:20:23 (GMT)
commitef93b78f38d7f35f42bc896ad23263668ac9f2e7 (patch)
tree2c460390dfc10b0ae1f5f784d378a3f53ccd8d75 /src/gui/styles/qs60style_s60.cpp
parent45c31fee7deea7800a2ef86dad7d6966ee2ceafd (diff)
parentb3b332a50a6288164ca86d0691e9615f9c19abda (diff)
downloadQt-ef93b78f38d7f35f42bc896ad23263668ac9f2e7.zip
Qt-ef93b78f38d7f35f42bc896ad23263668ac9f2e7.tar.gz
Qt-ef93b78f38d7f35f42bc896ad23263668ac9f2e7.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: (46 commits) Fix the license info for bin/elf2e32_qtwrapper.pl. Avoid panics in QDesktopWidget on Symbian emulator. QS60Style: use placeholder texture when polishing widgets and palette Regression: QS60Style: Theme background is incorrect Remove changes from fix to QTBUG-17045 that were not related to the fix Prevent null pointer crash when closing splitview QS60Style slows down layout switch by updating widgets unnecessarily Fix qgraphicstransform autotest for Symbian, where qreal is float. Removed reference to nonexistant profile. Disable capabilities example for symbian-gcce due to a bug in elf2e32 Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. Corrected a mismerge in GCCE link parameters. Fixed incorrect referral to an include file. Fixed win32-msvc2008 build regression. Made qmake strip trailing \ from libdirs. Fixed GCCE libdir handling if the paths have spaces in them. Added MinGW support for adding lib prefix and extension via profile. Added support for various special compiler/linker flags on MinGW. ...
Diffstat (limited to 'src/gui/styles/qs60style_s60.cpp')
-rw-r--r--src/gui/styles/qs60style_s60.cpp16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 600c631..1ff195d 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -66,7 +66,6 @@
#include <aknnavi.h>
#include <gulicon.h>
#include <AknBitmapAnimation.h>
-
#include <centralrepository.h>
#if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN)
@@ -1408,12 +1407,23 @@ QPixmap QS60StylePrivate::backgroundTexture()
if (createNewBackground) {
QPixmap background = part(QS60StyleEnums::SP_QsnBgScreen,
- QSize(applicationRect.Width(), applicationRect.Height()), 0, SkinElementFlags());
+ QSize(applicationRect.Width(), applicationRect.Height()), 0, SkinElementFlags());
m_background = new QPixmap(background);
}
return *m_background;
}
+// Generates 1*1 red pixmap as a placeholder for real texture.
+// The actual theme texture is drawn in qt_s60_fill_background().
+QPixmap QS60StylePrivate::placeHolderTexture()
+{
+ if (!m_placeHolderTexture) {
+ m_placeHolderTexture = new QPixmap(1,1);
+ m_placeHolderTexture->fill(Qt::red);
+ }
+ return *m_placeHolderTexture;
+}
+
QSize QS60StylePrivate::screenSize()
{
return QSize(S60->screenWidthInPixels, S60->screenHeightInPixels);
@@ -1428,8 +1438,8 @@ QS60Style::QS60Style()
void QS60StylePrivate::handleDynamicLayoutVariantSwitch()
{
clearCaches(QS60StylePrivate::CC_LayoutChange);
+ setBackgroundTexture(qApp);
setActiveLayout();
- refreshUI();
foreach (QWidget *widget, QApplication::allWidgets())
widget->ensurePolished();
}