aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickmenubar
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-06-05 12:48:40 +0300
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-22 12:03:49 +0000
commitadb0f009de9ddc603234913a316744d0f8ca417f (patch)
treee4aae43fe7ce0f17266509403d8f10999c3350ed /tests/auto/qquickmenubar
parentc4e5208dd17196fd6870bd8672cf68ff50873ad1 (diff)
Fix tests for boot2qt
The tests for boot2qt were disabled with commit 28063805bf22b77a93f22a4289ca8afa9f1cb201. The tests can be enabled since qtdeclarative now fallbacks to software renderer if OpenGL is not supported. Some tests involving mouse behavior and window grabbing need to be skipped on minimal/offscreen platforms. Task-number: QTBUG-60268 Change-Id: Ib468638df8d5001bf127dd17aee7dcfe38b11780 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qquickmenubar')
-rw-r--r--tests/auto/qquickmenubar/tst_qquickmenubar.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp
index 932e13bc..19d67eac 100644
--- a/tests/auto/qquickmenubar/tst_qquickmenubar.cpp
+++ b/tests/auto/qquickmenubar/tst_qquickmenubar.cpp
@@ -77,6 +77,10 @@ void tst_qquickmenubar::delegate()
void tst_qquickmenubar::mouse()
{
+ if ((QGuiApplication::platformName() == QLatin1String("offscreen"))
+ || (QGuiApplication::platformName() == QLatin1String("minimal")))
+ QSKIP("Mouse highlight not functional on offscreen/minimal platforms");
+
QQmlApplicationEngine engine(testFileUrl("menubar.qml"));
QScopedPointer<QQuickApplicationWindow> window(qobject_cast<QQuickApplicationWindow *>(engine.rootObjects().value(0)));