diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2010-01-26 18:11:25 (GMT) |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@nokia.com> | 2010-01-26 18:12:55 (GMT) |
| commit | 56e36ce9d4e1ec81e41f6f74f4e5cd39070b1f8f (patch) | |
| tree | bd0e30aec9ae834a4a8150ea276485d7959e1831 | |
| parent | f98901601fee4947fd0248f113b3a39a142292d5 (diff) | |
| download | Qt-56e36ce9d4e1ec81e41f6f74f4e5cd39070b1f8f.zip Qt-56e36ce9d4e1ec81e41f6f74f4e5cd39070b1f8f.tar.gz Qt-56e36ce9d4e1ec81e41f6f74f4e5cd39070b1f8f.tar.bz2 | |
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
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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); } |