summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qwidget_s60.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2010-02-15 08:24:36 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2010-02-15 08:24:36 (GMT)
commit22157cb26419ddcaa927cbfa88ad04486b1d1ee0 (patch)
treef84ff6878248c791319fc6be1f1956f2177b5bdb /src/gui/kernel/qwidget_s60.cpp
parentfa6dc19b9212706532f3f88da0fb3542e9c3eafe (diff)
parenta14b8805945c5e00be26092406a468fd8b8acc14 (diff)
downloadQt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.zip
Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.gz
Qt-22157cb26419ddcaa927cbfa88ad04486b1d1ee0.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Diffstat (limited to 'src/gui/kernel/qwidget_s60.cpp')
-rw-r--r--src/gui/kernel/qwidget_s60.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index a844430..ebd289c 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -878,6 +878,7 @@ void QWidgetPrivate::registerDropSite(bool /* on */)
void QWidgetPrivate::createTLSysExtra()
{
extra->topextra->backingStore = 0;
+ extra->topextra->inExpose = 0;
}
void QWidgetPrivate::deleteTLSysExtra()
@@ -891,7 +892,6 @@ void QWidgetPrivate::createSysExtra()
extra->activated = 0;
extra->nativePaintMode = QWExtra::Default;
extra->receiveNativePaintEvents = 0;
- extra->inExpose = 0;
}
void QWidgetPrivate::deleteSysExtra()