1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip test which depends on window activations on Wayland

Browse Source 
Wayland does not support window activation, so rather than skipping
tests based on platform name, we can use the platform capability
(which will also cover future platforms with the same issue)

Task-number: QTBUG-104241
Change-Id: Ibf5f8968f3979b789ef68f92768419bef4500fb3
Reviewed-by: Inho Lee <inho.lee@qt.io>
(cherry picked from commit 3fee97c4ab0796fcafcdea692ff7c7e83005a2aa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2022-06-30 07:01:53 +02:00 committed by Qt Cherry-pick Bot
parent 34751307bf
commit 70ec343b9e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
View File

@ -20,6 +20,8 @@
#include <private/qstatictext_p.h> #include <private/qstatictext_p.h>
#include <private/qopengltextureglyphcache_p.h> #include <private/qopengltextureglyphcache_p.h>
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
#include <private/qguiapplication_p.h>
#include <qpa/qplatformintegration.h>
class tst_QOpenGLWidget : public QObject class tst_QOpenGLWidget : public QObject
{ {
@ -652,8 +654,8 @@ void tst_QOpenGLWidget::stackWidgetOpaqueChildIsVisible()
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); QSKIP("Crashes on Android, figure out why (QTBUG-102043)");
#endif #endif
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
QSKIP("Wayland: This fails. Figure out why."); QSKIP("Platform does not support window activation");
if (QGuiApplication::platformName().startsWith(QLatin1String("offscreen"), Qt::CaseInsensitive)) if (QGuiApplication::platformName().startsWith(QLatin1String("offscreen"), Qt::CaseInsensitive))
QSKIP("Offscreen: This fails."); QSKIP("Offscreen: This fails.");