From 56e36ce9d4e1ec81e41f6f74f4e5cd39070b1f8f Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Tue, 26 Jan 2010 19:11:25 +0100
Subject: Fix broken build of simulated QS60Style

The QProgressBar animating code is not meant for the simulated style.
ifdef it out.

Reviewed-by: Sami Merila

	modified:   src/gui/styles/qs60style.cpp
---
 src/gui/styles/qs60style.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 3f4f190..24b2d34 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -2964,11 +2964,13 @@ void QS60Style::unpolish(QWidget *widget)
     if (widget)
         widget->setPalette(QPalette());
 
-#ifndef QT_NO_PROGRESSBAR
+#if defined(Q_WS_S60) && !defined(QT_NO_PROGRESSBAR)
     if (QProgressBar *bar = qobject_cast<QProgressBar *>(widget)) {
         widget->removeEventFilter(this);
         d->m_bars.removeAll(bar);
     }
+#else
+    Q_UNUSED(d)
 #endif
     QCommonStyle::unpolish(widget);
 }
-- 
cgit v0.12