diff options
author | Paul Olav Tvete <paul.tvete@digia.com> | 2014-03-19 09:30:05 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 17:24:01 +0100 |
commit | 8a0573b92924ba3fcf4228730c2c693b52c41c28 (patch) | |
tree | 954bc549db908b651aa666ad0259b337d2a334b9 /src/quickwidgets/qquickwidget_p.h | |
parent | 1145d76ebad94acee602c83b59d125337d0ff193 (diff) |
QQuickWidget: Fix SizeViewToRootObject
There were two problems: 1) QWidget does not have a default size of (0,0)
or (1,1), but uses WA_Resized. 2) event() would eat timer events without
checking the timerId.
Change-Id: I355acbb10d3d5073e117c29de18bb94857881141
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src/quickwidgets/qquickwidget_p.h')
-rw-r--r-- | src/quickwidgets/qquickwidget_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget_p.h b/src/quickwidgets/qquickwidget_p.h index 6a822ffba0..5cf2bfbf1d 100644 --- a/src/quickwidgets/qquickwidget_p.h +++ b/src/quickwidgets/qquickwidget_p.h @@ -113,7 +113,7 @@ public: QSize initialSize; QElapsedTimer frameTimer; - int updateTimer; + QBasicTimer updateTimer; bool eventPending; bool updatePending; bool fakeHidden; |