aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qquickpopup
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-05-26 10:16:34 +0200
committerMitch Curtis <mitch.curtis@qt.io>2020-05-26 16:00:03 +0200
commit3110fd0809943560845465406b0ac3fccd9ab831 (patch)
tree950375c1a4f5a9517325592ff1ce6c8748970860 /tests/auto/qquickpopup
parentabf7bc03380163678349de93b362c63ec3047fbf (diff)
Skip tests that use graphical effects on Win 7
It's not clear why these fail, but we can live without the test on Windows 7. Fixes: QTBUG-84443 Change-Id: Ib18dfc8e12528c5086d07d6018cda93fb6e8d30c Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/auto/qquickpopup')
-rw-r--r--tests/auto/qquickpopup/tst_qquickpopup.cpp8
1 files changed, 8 insertions, 0 deletions
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;