summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-22 00:05:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-22 00:05:22 (GMT)
commitee9e29a9d203ed1404810aa4097bb8e0db483dda (patch)
tree7965c2ceb85cbe85f37777a08f11a50d8d31d0f7 /src
parent6925ff13f12533428552ab8a77019f84c1a11a88 (diff)
parent1eeec88caa45d7c3f6b8371bc84bb8d172b0b02e (diff)
downloadQt-ee9e29a9d203ed1404810aa4097bb8e0db483dda.zip
Qt-ee9e29a9d203ed1404810aa4097bb8e0db483dda.tar.gz
Qt-ee9e29a9d203ed1404810aa4097bb8e0db483dda.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: Improved output of patch_capabilities.pl script Button remains pressed if release event happens outside of widget
Diffstat (limited to 'src')
-rw-r--r--src/gui/styles/qs60style.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 5996032..bafc5f3 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -3436,8 +3436,7 @@ bool QS60Style::eventFilter(QObject *object, QEvent *event)
break;
}
case QEvent::MouseButtonRelease: {
- const QWidget *w = QApplication::widgetAt(QCursor::pos());
- if (w && d->m_pressedWidget) {
+ if (d->m_pressedWidget) {
d->m_pressedWidget->update();
d->m_pressedWidget = 0;
}