summaryrefslogtreecommitdiffstats
path: root/tests/auto/qgraphicswidget
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@nokia.com>2010-07-27 09:32:28 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2010-11-02 14:29:14 (GMT)
commit1409261805af661c0f19d109027d44ec04ddbfc4 (patch)
tree8dad3554e37ca983ba2f545c470e06a5997f984e /tests/auto/qgraphicswidget
parent28b4eb0a10b922581f4f7c6a7cdc60383a35a578 (diff)
downloadQt-1409261805af661c0f19d109027d44ec04ddbfc4.zip
Qt-1409261805af661c0f19d109027d44ec04ddbfc4.tar.gz
Qt-1409261805af661c0f19d109027d44ec04ddbfc4.tar.bz2
Fixed QGraphicsWidget autotest to use PlatformQuirks.
Diffstat (limited to 'tests/auto/qgraphicswidget')
-rw-r--r--tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
index 9d6def8..2368d59 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -53,6 +53,7 @@
#include <qaction.h>
#include <qwidgetaction.h>
#include "../../shared/util.h"
+#include "../platformquirks.h"
class EventSpy : public QObject
@@ -1111,6 +1112,10 @@ void tst_QGraphicsWidget::initStyleOption_data()
// void initStyleOption(QStyleOption* option) const public
void tst_QGraphicsWidget::initStyleOption()
{
+#ifdef Q_WS_MAEMO_5
+ QSKIP("The test passes, but it doesn't work when the display is in energy saving mode", SkipAll);
+#endif
+
QGraphicsScene scene;
QGraphicsView view(&scene);
view.show();
@@ -1773,6 +1778,9 @@ void tst_QGraphicsWidget::verifyFocusChain()
void tst_QGraphicsWidget::updateFocusChainWhenChildDie()
{
+#ifdef Q_WS_MAEMO_5
+ QSKIP("On Maemo 5 the Display Manager is shown on Window change, so the test won't work", SkipAll);
+#endif
QGraphicsScene scene;
QGraphicsView view(&scene);
view.show();
@@ -3144,7 +3152,10 @@ void tst_QGraphicsWidget::initialShow()
MyGraphicsWidget *widget = new MyGraphicsWidget;
QGraphicsView view(&scene);
- view.show();
+ if(PlatformQuirks::isAutoMaximizing())
+ view.showFullScreen();
+ else
+ view.show();
QTest::qWaitForWindowShown(&view);
scene.addItem(widget);
@@ -3186,7 +3197,7 @@ void tst_QGraphicsWidget::initialShow2()
scene.addItem(widget);
QGraphicsView view(&scene);
- view.setWindowFlags(Qt::X11BypassWindowManagerHint);
+ view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint);
view.show();
QTest::qWaitForWindowShown(&view);