diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-30 22:59:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-07-02 11:23:45 +0200 |
| commit | e3ed2281c0c891cf3b15c95f9f7cdae42e9f233a (patch) | |
| tree | aae8da6ce616eae02b69fb1fcdcb4383c8fe6811 /tests/auto/gui | |
| parent | 3be141d5bc199080b524d8f6f5ce514e8f74d23a (diff) | |
| parent | e75e4b39b78ba05ea2cd45dc96acf99fc89c5915 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/cocoa/qnsview_dragging.mm
src/plugins/platforms/ios/qiosinputcontext.mm
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/tools/androiddeployqt/main.cpp
Was moved from qttools into qtbase in 5.11.
So re-apply 32398e4d here.
tests/auto/corelib/global/qlogging/test/test.pro
tests/auto/corelib/global/qlogging/tst_qlogging.cpp
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
tests/auto/corelib/thread/qthreadstorage/test/test.pro
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
tests/auto/widgets/kernel/qapplication/test/test.pro
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/kernel/kernel.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qclipboard/test/test.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qkeyevent/BLACKLIST | 6 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/BLACKLIST | 23 | ||||
| -rw-r--r-- | tests/auto/gui/painting/qpainter/BLACKLIST | 3 |
5 files changed, 34 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro index 46786262c0..fbd3b1b371 100644 --- a/tests/auto/gui/kernel/kernel.pro +++ b/tests/auto/gui/kernel/kernel.pro @@ -37,4 +37,4 @@ win32:!winrt:qtHaveModule(network): SUBDIRS += noqteventloop !qtConfig(opengl): SUBDIRS -= qopenglwindow -uikit: SUBDIRS -= qclipboard +android|uikit: SUBDIRS -= qclipboard diff --git a/tests/auto/gui/kernel/qclipboard/test/test.pro b/tests/auto/gui/kernel/qclipboard/test/test.pro index 59b77b11ba..84e80d62e6 100644 --- a/tests/auto/gui/kernel/qclipboard/test/test.pro +++ b/tests/auto/gui/kernel/qclipboard/test/test.pro @@ -13,6 +13,6 @@ win32 { } } -!winrt: TEST_HELPER_INSTALLS = \ +!android:!winrt: TEST_HELPER_INSTALLS = \ ../copier/copier \ ../paster/paster diff --git a/tests/auto/gui/kernel/qkeyevent/BLACKLIST b/tests/auto/gui/kernel/qkeyevent/BLACKLIST new file mode 100644 index 0000000000..e55a200f4d --- /dev/null +++ b/tests/auto/gui/kernel/qkeyevent/BLACKLIST @@ -0,0 +1,6 @@ +# QTBUG-68974 +[basicEventDelivery] +android +# QTBUG-68974 +[modifiers] +android diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index bd2f6b5d60..d1f14de794 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -8,14 +8,22 @@ osx-10.12 ci ubuntu-16.04 # QTBUG-66851 opensuse +# QTBUG-69160 +android [setVisible] +# QTBUG-69154 +android [modalWindowEnterEventOnHide_QTBUG35109] ubuntu-16.04 osx ci +# QTBUG-69162 +android [modalDialogClosingOneOfTwoModal] osx [modalWindowModallity] osx +# QTBUG-69163 +android [visibility] osx-10.11 ci osx-10.12 ci @@ -25,3 +33,18 @@ rhel-7.4 [isActive] # QTBUG-67768 ubuntu +# QTBUG-69157 +android + +[exposeEventOnShrink_QTBUG54040] +# QTBUG-69155 +android +[initialSize] +# QTBUG-69159 +android +[modalWindowPosition] +# QTBUG-69161 +android +[childWindowPositioning:show] +# QTBUG-69156 +android diff --git a/tests/auto/gui/painting/qpainter/BLACKLIST b/tests/auto/gui/painting/qpainter/BLACKLIST new file mode 100644 index 0000000000..b828cbc75e --- /dev/null +++ b/tests/auto/gui/painting/qpainter/BLACKLIST @@ -0,0 +1,3 @@ +[textOnTransparentImage] +# QTBUG-69166 +android |