diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 01:01:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 01:01:20 +0200 |
| commit | 4e40c54a3caabb6bced27e18e040ee88b739a3c8 (patch) | |
| tree | bf33b7207326f516a119e72ca1c5e02e248206e0 /tests/auto/gui/kernel | |
| parent | fbda189e081e6c7abf82334c0ac71b16ec2c37dd (diff) | |
| parent | 9e59024bf80124dbf301e8b3dca3dc4548fee428 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I77ba01f09b3dbcaf13cb265a70d9da661c32a61f
Diffstat (limited to 'tests/auto/gui/kernel')
| -rw-r--r-- | tests/auto/gui/kernel/qopenglwindow/BLACKLIST | 6 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qopenglwindow/BLACKLIST b/tests/auto/gui/kernel/qopenglwindow/BLACKLIST new file mode 100644 index 0000000000..3ce78abee8 --- /dev/null +++ b/tests/auto/gui/kernel/qopenglwindow/BLACKLIST @@ -0,0 +1,6 @@ +[basic] +winrt +[resize] +winrt +[painter] +winrt diff --git a/tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro b/tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro index d09af5084b..759b608c93 100644 --- a/tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro +++ b/tests/auto/gui/kernel/qopenglwindow/qopenglwindow.pro @@ -4,5 +4,3 @@ TARGET = tst_qopenglwindow QT += core-private gui-private testlib SOURCES += tst_qopenglwindow.cpp - -win32:CONFIG+=insignificant_test # QTBUG-46452, QTBUG-49630 |