Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev

1 files changed, 7 insertions, 1 deletions

diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index 1b02c9e8ab..260ba12a97 100644
--- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
@@ -38,6 +38,9 @@
 #include <QBoxLayout>
 #include <QSysInfo>
 
+#include <qpa/qplatformintegration.h>
+#include <private/qguiapplication_p.h>
+
 QT_FORWARD_DECLARE_CLASS(QWidget)
 
 class FocusLineEdit : public QLineEdit
@@ -92,13 +95,16 @@ private slots:
     void checkReason_ActiveWindow();
 
 private:
-    QWidget* testFocusWidget;
+    QWidget* testFocusWidget = nullptr;
     FocusLineEdit* childFocusWidgetOne;
     FocusLineEdit* childFocusWidgetTwo;
 };
 
 void tst_QFocusEvent::initTestCase()
 {
+    if (!QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::WindowActivation))
+        QSKIP("QWindow::requestActivate() is not supported on this platform.");
+
     testFocusWidget = new QWidget( 0 );
     childFocusWidgetOne = new FocusLineEdit( testFocusWidget );
     childFocusWidgetOne->setGeometry( 10, 10, 180, 20 );