diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-21 13:02:38 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-21 13:20:13 +0200 |
commit | 0325b1052c065ee842d120d68e37a12b24ce89d2 (patch) | |
tree | 81630327d96eebd48ace5157853c2f7ed62b9383 /tests | |
parent | 66b6cb72b1e755660f8dc3b18b209b395e4dd52e (diff) |
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>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index c8cfd13fcf..9bdf9c14ed 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); } |