From: Matthew Cattell <matthew.cattell@nokia.com>
Date: Tue, 6 Sep 2011 14:36:01 +0000 (+0200)
Subject: fixed to work with qsgcanvas
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=757e2d057345846ba7213e3f7fe84e75d3093331;p=konrad%2Fqtdeclarative.git

fixed to work with qsgcanvas

Change-Id: Ia044bb738469fdd2c9ecc6154ac51851db3e0e7f
Reviewed-on: http://codereview.qt.nokia.com/4270
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---

diff --git a/tests/auto/declarative/qsgitem/tst_qsgitem.cpp b/tests/auto/declarative/qsgitem/tst_qsgitem.cpp
index 05e59a6..99c1cf6 100644
--- a/tests/auto/declarative/qsgitem/tst_qsgitem.cpp
+++ b/tests/auto/declarative/qsgitem/tst_qsgitem.cpp
@@ -43,6 +43,7 @@
 
 #include "qsgitem.h"
 #include "qsgcanvas.h"
+#include <QtWidgets/QGraphicsSceneMouseEvent>
 #include "private/qsgfocusscope_p.h"
 #include "../../../shared/util.h"
 #include <QDebug>
@@ -132,9 +133,10 @@ private slots:
     void hoverEventInParent();
 
 private:
-    void ensureFocus(QWidget *w) {
+
+    void ensureFocus(QWindow *w) {
         w->show();
-        qApp->setActiveWindow(w);
+        w->requestActivateWindow();
         qApp->processEvents();
 
 #ifdef Q_WS_X11