diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:04:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-22 09:25:54 +0200 |
| commit | aed5a7168354c6ae47687d20b4bd3f0adcc14f8e (patch) | |
| tree | d2060479a7c12fdba8c1955e5d363754feffabb8 /tests/auto/other | |
| parent | d3d10cf23d61f4a011f1a7e9abdee1a92717e80f (diff) | |
| parent | 628fa13ea4d6ff0e2e2ee76c9adfc78676de3c59 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/corelib/statemachine/qstatemachine.cpp
src/corelib/statemachine/qstatemachine_p.h
src/gui/painting/qdrawhelper.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/testlib/qtestblacklist.cpp
src/tools/qdoc/node.cpp
src/tools/qdoc/node.h
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: I6c78b7b162001712d5774293f501b06b4ff32684
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 |