diff options
Diffstat (limited to 'tests/auto/other')
-rw-r--r-- | tests/auto/other/headersclean/headersclean.pro | 3 | ||||
-rw-r--r-- | tests/auto/other/macnativeevents/BLACKLIST | 11 | ||||
-rw-r--r-- | tests/auto/other/macnativeevents/macnativeevents.pro | 1 | ||||
-rw-r--r-- | tests/auto/other/other.pro | 5 |
4 files changed, 11 insertions, 9 deletions
diff --git a/tests/auto/other/headersclean/headersclean.pro b/tests/auto/other/headersclean/headersclean.pro deleted file mode 100644 index 73e0c5dd56..0000000000 --- a/tests/auto/other/headersclean/headersclean.pro +++ /dev/null @@ -1,3 +0,0 @@ -QT = core concurrent network dbus xml sql testlib gui opengl widgets printsupport platformsupport-private -load(qt_headersclean) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/macnativeevents/BLACKLIST b/tests/auto/other/macnativeevents/BLACKLIST new file mode 100644 index 0000000000..2820457075 --- /dev/null +++ b/tests/auto/other/macnativeevents/BLACKLIST @@ -0,0 +1,11 @@ +# QTBUG-22775 +[testDragWindow] +osx +[testMouseEnter] +osx-10.9 +[testChildDialogInFrontOfModalParent] +osx +[testChildWindowInFrontOfStaysOnTopParentWindow] +osx +[testModifierCtrlWithDontSwapCtrlAndMeta] +osx diff --git a/tests/auto/other/macnativeevents/macnativeevents.pro b/tests/auto/other/macnativeevents/macnativeevents.pro index e958f414e0..48ad04bbff 100644 --- a/tests/auto/other/macnativeevents/macnativeevents.pro +++ b/tests/auto/other/macnativeevents/macnativeevents.pro @@ -8,5 +8,4 @@ SOURCES += expectedeventlist.cpp nativeeventlist.cpp SOURCES += tst_macnativeevents.cpp requires(mac) -CONFIG += insignificant_test # QTBUG-22775 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 6e8f1e3c9c..a5ed4c5f31 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -4,7 +4,6 @@ SUBDIRS=\ baselineexample \ compiler \ gestures \ - headersclean \ lancelot \ languagechange \ macgui \ @@ -29,7 +28,6 @@ SUBDIRS=\ !qtHaveModule(widgets): SUBDIRS -= \ baselineexample \ gestures \ - headersclean \ lancelot \ languagechange \ modeltest \ @@ -44,14 +42,11 @@ SUBDIRS=\ !qtHaveModule(network): SUBDIRS -= \ baselineexample \ - headersclean \ lancelot \ networkselftest \ qnetworkaccessmanager_and_qprogressdialog \ qobjectperformance -testcocoon: SUBDIRS -= headersclean - cross_compile: SUBDIRS -= \ atwrapper \ compiler |