aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp3
-rw-r--r--tests/auto/qquickpopup/tst_qquickpopup.cpp8
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
index b2c0c272..b907f5c3 100644
--- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
+++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp
@@ -35,6 +35,7 @@
****************************************************************************/
#include <qtest.h>
+#include <QtCore/qoperatingsystemversion.h>
#include <QtTest/QSignalSpy>
#include <QtQml/qqmlengine.h>
#include <QtQml/qqmlcomponent.h>
@@ -763,6 +764,8 @@ void tst_QQuickApplicationWindow::focusAfterPopupClosed()
void tst_QQuickApplicationWindow::clearFocusOnDestruction()
{
+ if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7)
+ QSKIP("Test requires a version of Windows newer than 7: QTBUG-84443");
if (!canImportModule("import QtGraphicalEffects 1.15; DropShadow {}"))
QSKIP("Test requires QtGraphicalEffects");
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp
index 620a6ec4..162a48ba 100644
--- a/tests/auto/qquickpopup/tst_qquickpopup.cpp
+++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp
@@ -40,6 +40,7 @@
#include "../shared/visualtestutil.h"
#include "../shared/qtest_quickcontrols.h"
+#include <QtCore/qoperatingsystemversion.h>
#include <QtGui/qpa/qwindowsysteminterface.h>
#include <QtQuick/qquickview.h>
#include <QtQuick/private/qquickpalette_p.h>
@@ -1266,6 +1267,8 @@ void tst_QQuickPopup::countChanged()
// QTBUG-73243
void tst_QQuickPopup::toolTipCrashOnClose()
{
+ if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7)
+ QSKIP("Test requires a version of Windows newer than 7: QTBUG-84443");
if (!canImportModule("import QtGraphicalEffects 1.15; DropShadow {}"))
QSKIP("Test requires QtGraphicalEffects");
@@ -1284,6 +1287,11 @@ void tst_QQuickPopup::toolTipCrashOnClose()
void tst_QQuickPopup::setOverlayParentToNull()
{
+ if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7)
+ QSKIP("Test requires a version of Windows newer than 7: QTBUG-84443");
+ if (!canImportModule("import QtGraphicalEffects 1.15; DropShadow {}"))
+ QSKIP("Test requires QtGraphicalEffects");
+
QQuickApplicationHelper helper(this, "toolTipCrashOnClose.qml");
QQuickWindow *window = helper.window;