From 6567ba691332aa6f97ace22ca9a5e127a9881c60 Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Wed, 20 Apr 2011 14:57:51 +0300
Subject: Build break fix for simulated QS60Style

Recent changes in QS60Style (to support placeholder background texture)
causes the simulated style not to build. The implementation
for new method placeHolderTexture() is on the Symbian-specific
sourcefile, which is omitted in the simulator builds.

As a fix, move the implementation to the "generic" style source
file qs60style.cpp, since the method does not contain any
Symbian specific code.

Task-number: QTBUG-18863
Reviewed-by: owolff
---
 src/gui/styles/qs60style.cpp     | 11 +++++++++++
 src/gui/styles/qs60style_s60.cpp | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index f146075..9958316 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -965,6 +965,17 @@ bool QS60StylePrivate::isWidgetPressed(const QWidget *widget)
     return (widget && widget == m_pressedWidget);
 }
 
+// Generates 1*1 white 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::green);
+    }
+    return *m_placeHolderTexture;
+}
+
 /*!
   \class QS60Style
   \brief The QS60Style class provides a look and feel suitable for applications on S60.
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index dc64872..7f19c35 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -1440,17 +1440,6 @@ QPixmap QS60StylePrivate::backgroundTexture(bool skipCreation)
     return *m_background;
 }
 
-// Generates 1*1 white 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::white);
-    }
-    return *m_placeHolderTexture;
-}
-
 QSize QS60StylePrivate::screenSize()
 {
     return QSize(S60->screenWidthInPixels, S60->screenHeightInPixels);
-- 
cgit v0.12