From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 21 Sep 2011 11:02:38 +0000 (+0200)
Subject: Make qdeclarativeapplication test compile again
X-Git-Tag: qt-v5.0.0-alpha1~1600
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0325b1052c065ee842d120d68e37a12b24ce89d2;p=profile%2Fivi%2Fqtdeclarative.git

Make qdeclarativeapplication test compile again

It shouldn't depend on QtWidgets, but using
QGuiApplication doesn't work yet, so skip the
tests for now.

Change-Id: I79473a9ed0486d51c37f498a5e58c503f9533759
Reviewed-on: http://codereview.qt-project.org/5314
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---

diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
index c8cfd13..9bdf9c1 100644
--- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
+++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
@@ -66,6 +66,8 @@ tst_qdeclarativeapplication::tst_qdeclarativeapplication()
 
 void tst_qdeclarativeapplication::active()
 {
+    QSKIP("QTBUG-21573", SkipAll);
+
     QDeclarativeComponent component(&engine);
     component.setData("import QtQuick 2.0; Item { property bool active: Qt.application.active }", QUrl::fromLocalFile(""));
     QSGItem *item = qobject_cast<QSGItem *>(component.create());
@@ -75,27 +77,30 @@ void tst_qdeclarativeapplication::active()
 
     // not active
     QVERIFY(!item->property("active").toBool());
-    QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0);
+    QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0);
 
     // active
     view.show();
     view.requestActivateWindow();
     QTest::qWait(50);
     QTRY_COMPARE(view.status(), QSGView::Ready);
-    QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0);
+    QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0);
 
     // not active again
     // on mac, setActiveWindow(0) on mac does not deactivate the current application
     // (you have to switch to a different app or hide the current app to trigger this)
 #if !defined(Q_WS_MAC)
-    QApplication::setActiveWindow(0);
+// QTBUG-21573
+//    QGuiApplication::setActiveWindow(0);
     QVERIFY(!item->property("active").toBool());
-    QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0);
+    QCOMPARE(item->property("active").toBool(), QGuiApplication::activeWindow() != 0);
 #endif
 }
 
 void tst_qdeclarativeapplication::layoutDirection()
 {
+    QSKIP("QTBUG-21573", SkipAll);
+
     QDeclarativeComponent component(&engine);
     component.setData("import QtQuick 2.0; Item { property bool layoutDirection: Qt.application.layoutDirection }", QUrl::fromLocalFile(""));
     QSGItem *item = qobject_cast<QSGItem *>(component.create());
@@ -107,11 +112,11 @@ void tst_qdeclarativeapplication::layoutDirection()
     QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::LeftToRight);
 
     // mirrored
-    QApplication::setLayoutDirection(Qt::RightToLeft);
+    QGuiApplication::setLayoutDirection(Qt::RightToLeft);
     QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::RightToLeft);
 
     // not mirrored again
-    QApplication::setLayoutDirection(Qt::LeftToRight);
+    QGuiApplication::setLayoutDirection(Qt::LeftToRight);
     QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::LeftToRight);
 }