From 8a0573b92924ba3fcf4228730c2c693b52c41c28 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@digia.com>
Date: Wed, 19 Mar 2014 09:30:05 +0100
Subject: 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>
---
 src/quickwidgets/qquickwidget_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/quickwidgets/qquickwidget_p.h')

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;
-- 
cgit v1.2.3