Remove Q_WS_*, symbian and maemo code in QtDeclarative

[profile/ivi/qtdeclarative.git] / tests / auto / declarative / qquickitem / tst_qquickitem.cpp

diff --git a/tests/auto/declarative/qquickitem/tst_qquickitem.cpp b/tests/auto/declarative/qquickitem/tst_qquickitem.cpp
index 694fdc0..a5f908c 100644 (file)
--- a/tests/auto/declarative/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/declarative/qquickitem/tst_qquickitem.cpp
@@ -137,11 +137,6 @@ private:
         w->show();
         w->requestActivateWindow();
         qApp->processEvents();
-
-#ifdef Q_WS_X11
-        // to be safe and avoid failing setFocus with window managers
-        qt_x11_wait_for_window_manager(w);
-#endif
     }
 };
 
@@ -239,6 +234,7 @@ void tst_qquickitem::simpleFocus()
 {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
 
     QQuickItem *l1c1 = new TestItem(canvas.rootItem());
     QQuickItem *l1c2 = new TestItem(canvas.rootItem());
@@ -289,6 +285,7 @@ void tst_qquickitem::scopedFocus()
 {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
 
     QQuickItem *l1c1 = new TestItem(canvas.rootItem());
     QQuickItem *l1c2 = new TestItem(canvas.rootItem());
@@ -368,6 +365,7 @@ void tst_qquickitem::addedToCanvas()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
 
     QQuickItem *item = new TestItem;
 
@@ -387,6 +385,7 @@ void tst_qquickitem::addedToCanvas()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
 
     QQuickItem *item = new TestItem(canvas.rootItem());
 
@@ -415,6 +414,7 @@ void tst_qquickitem::addedToCanvas()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
 
     QQuickItem *tree = new TestItem;
     QQuickItem *c1 = new TestItem(tree);
@@ -438,6 +438,7 @@ void tst_qquickitem::addedToCanvas()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
     QQuickItem *tree = new TestFocusScope;
     QQuickItem *c1 = new TestItem(tree);
     QQuickItem *c2 = new TestItem(tree);
@@ -465,6 +466,7 @@ void tst_qquickitem::addedToCanvas()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
     QQuickItem *tree = new TestFocusScope;
     QQuickItem *c1 = new TestItem(tree);
     QQuickItem *c2 = new TestItem(tree);
@@ -490,6 +492,7 @@ void tst_qquickitem::addedToCanvas()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
     QQuickItem *child = new TestItem(canvas.rootItem());
     QQuickItem *tree = new TestFocusScope;
     QQuickItem *c1 = new TestItem(tree);
@@ -529,6 +532,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
     QQuickItem *child = new TestItem(canvas.rootItem());
 
     FocusState focusState;
@@ -550,6 +554,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
     QQuickItem *child = new TestItem(canvas.rootItem());
     QQuickItem *child2 = new TestItem(canvas.rootItem());
 
@@ -570,6 +575,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
     QQuickItem *child = new TestItem(canvas.rootItem());
     QQuickItem *child2 = new TestFocusScope(canvas.rootItem());
     QQuickItem *item = new TestItem(child);
@@ -591,6 +597,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
     QQuickItem *child = new TestItem(canvas.rootItem());
     QQuickItem *child2 = new TestFocusScope(canvas.rootItem());
     QQuickItem *item = new TestItem(child2);
@@ -612,6 +619,7 @@ void tst_qquickitem::changeParent()
     {
     QQuickCanvas canvas;
     ensureFocus(&canvas);
+    QTRY_VERIFY(QGuiApplication::focusWindow() == &canvas);
     QQuickItem *child = new TestItem(canvas.rootItem());
     QQuickItem *child2 = new TestFocusScope(canvas.rootItem());
     QQuickItem *item = new TestItem(child2);