fixup tests to build with refactor

Change-Id: Iab4adc9e19fab67402918bb737fff2fce6c292bd
Reviewed-on: http://codereview.qt-project.org/4545
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

1 files changed, 22 insertions, 24 deletions

diff --git a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
index 2c8f59cb64..83da0bae27 100644
--- a/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
+++ b/tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
@@ -80,9 +80,6 @@ private slots:
 };
 void tst_qsgfocusscope::initTestCase()
 {
-    QSGView canvas;
-    if (!QGLShaderProgram::hasOpenGLShaderPrograms(canvas.context()))
-        QSKIP("FocusScope item needs OpenGL 2.0", SkipAll);
 }
 
 void tst_qsgfocusscope::cleanupTestCase()
@@ -127,7 +124,7 @@ void tst_qsgfocusscope::basic()
     QVERIFY(item3 != 0);
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -135,7 +132,7 @@ void tst_qsgfocusscope::basic()
     qt_x11_wait_for_window_manager(view);
 #endif
 
-    QVERIFY(view->hasFocus());
+    QVERIFY(view->isTopLevel());
     QVERIFY(item0->hasActiveFocus() == true);
     QVERIFY(item1->hasActiveFocus() == true);
     QVERIFY(item2->hasActiveFocus() == false);
@@ -173,7 +170,7 @@ void tst_qsgfocusscope::nested()
     QVERIFY(item5 != 0);
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -181,7 +178,7 @@ void tst_qsgfocusscope::nested()
     qt_x11_wait_for_window_manager(view);
 #endif
 
-    QVERIFY(view->hasFocus());
+    QVERIFY(view->windowState() == Qt::WindowActive);
 
     QVERIFY(item1->hasActiveFocus() == true);
     QVERIFY(item2->hasActiveFocus() == true);
@@ -206,7 +203,7 @@ void tst_qsgfocusscope::noFocus()
     QVERIFY(item3 != 0);
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -214,7 +211,7 @@ void tst_qsgfocusscope::noFocus()
     qt_x11_wait_for_window_manager(view);
 #endif
 
-    QVERIFY(view->hasFocus());
+    QVERIFY(view->windowState() == Qt::WindowActive);
     QVERIFY(item0->hasActiveFocus() == false);
     QVERIFY(item1->hasActiveFocus() == false);
     QVERIFY(item2->hasActiveFocus() == false);
@@ -250,7 +247,7 @@ void tst_qsgfocusscope::textEdit()
     QVERIFY(item3 != 0);
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -258,7 +255,7 @@ void tst_qsgfocusscope::textEdit()
     qt_x11_wait_for_window_manager(view);
 #endif
 
-    QVERIFY(view->hasFocus());
+    QVERIFY(view->windowState() == Qt::WindowActive);
     QVERIFY(item0->hasActiveFocus() == true);
     QVERIFY(item1->hasActiveFocus() == true);
     QVERIFY(item2->hasActiveFocus() == false);
@@ -308,7 +305,7 @@ void tst_qsgfocusscope::forceFocus()
     QVERIFY(item5 != 0);
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -316,7 +313,7 @@ void tst_qsgfocusscope::forceFocus()
     qt_x11_wait_for_window_manager(view);
 #endif
 
-    QVERIFY(view->hasFocus());
+    QVERIFY(view->windowState() == Qt::WindowActive);
     QVERIFY(item0->hasActiveFocus() == true);
     QVERIFY(item1->hasActiveFocus() == true);
     QVERIFY(item2->hasActiveFocus() == false);
@@ -350,7 +347,7 @@ void tst_qsgfocusscope::noParentFocus()
     QVERIFY(view->rootObject());
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -382,7 +379,7 @@ void tst_qsgfocusscope::signalEmission()
     QVERIFY(item4 != 0);
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -393,7 +390,7 @@ void tst_qsgfocusscope::signalEmission()
     QVariant blue(QColor("blue"));
     QVariant red(QColor("red"));
 
-    QVERIFY(view->hasFocus());
+    QVERIFY(view->windowState() == Qt::WindowActive);
     item1->setFocus(true);
     QCOMPARE(item1->property("color"), red);
     QCOMPARE(item2->property("color"), blue);
@@ -434,7 +431,7 @@ void tst_qsgfocusscope::qtBug13380()
 
     view->show();
     QVERIFY(view->rootObject());
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -442,7 +439,7 @@ void tst_qsgfocusscope::qtBug13380()
     qt_x11_wait_for_window_manager(view);
 #endif
 
-    QVERIFY(view->hasFocus());
+    QVERIFY(view->windowState() == Qt::WindowActive);
     QVERIFY(view->rootObject()->property("noFocus").toBool());
 
     view->rootObject()->setProperty("showRect", true);
@@ -457,7 +454,7 @@ void tst_qsgfocusscope::forceActiveFocus()
     view->setSource(QUrl::fromLocalFile(SRCDIR "/data/forceActiveFocus.qml"));
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -600,7 +597,7 @@ void tst_qsgfocusscope::canvasFocus()
     QSignalSpy item2ActiveFocusSpy(item2, SIGNAL(activeFocusChanged(bool)));
 
     // until the canvas widget has gained focus, no one should have active focus
-    QCOMPARE(view->hasFocus(), false);
+    QCOMPARE((view->windowState() == Qt::WindowActive), false);
     QCOMPARE(rootItem->hasFocus(), false);
     QCOMPARE(rootItem->hasActiveFocus(), false);
     QCOMPARE(scope1->hasFocus(), true);
@@ -613,7 +610,7 @@ void tst_qsgfocusscope::canvasFocus()
     QCOMPARE(item2->hasActiveFocus(), false);
 
     view->show();
-    qApp->setActiveWindow(view);
+    view->requestActivateWindow();
     qApp->processEvents();
 
 #ifdef Q_WS_X11
@@ -622,7 +619,7 @@ void tst_qsgfocusscope::canvasFocus()
 #endif
 
     // Now the canvas has focus, active focus given to item1
-    QTRY_COMPARE(view->hasFocus(), true);
+    QTRY_COMPARE((view->windowState() == Qt::WindowActive), true);
     QCOMPARE(rootItem->hasFocus(), true);
     QCOMPARE(rootItem->hasActiveFocus(), true);
     QCOMPARE(scope1->hasFocus(), true);
@@ -640,7 +637,8 @@ void tst_qsgfocusscope::canvasFocus()
     QCOMPARE(item1FocusSpy.count(), 0);
     QCOMPARE(item1ActiveFocusSpy.count(), 1);
 
-    view->clearFocus();
+
+    view->setWindowState(Qt::WindowNoState);
     QCOMPARE(rootItem->hasFocus(), false);
     QCOMPARE(rootItem->hasActiveFocus(), false);
     QCOMPARE(scope1->hasFocus(), true);
@@ -680,7 +678,7 @@ void tst_qsgfocusscope::canvasFocus()
     QCOMPARE(item2ActiveFocusSpy.count(), 0);
 
     // give the canvas focus, and item2 will get active focus
-    view->setFocus();
+    view->setWindowState(Qt::WindowActive);
 
     QCOMPARE(rootItem->hasFocus(), true);
     QCOMPARE(rootItem->hasActiveFocus(), true);