diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-09 11:05:03 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-09 11:47:57 +0100 |
| commit | 88cf04458002d863750e9121af7dcd9bcbfaa169 (patch) | |
| tree | caccae211eef1a27fa5caae3a8403830b615bd5e /tests/auto/network/access/qnetworkreply/test | |
| parent | 19b0ce5daa31e2ffebfcf2701143742302f1deb4 (diff) | |
| parent | 579d0cb2bed193ccb1901b121a360f85d1c57a54 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/gui/kernel/qwindow.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/windows/qwindowssystemtrayicon.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
tests/auto/widgets/kernel/qaction/tst_qaction.cpp
Change-Id: Ifa515dc0ece7eb1471b00c1214149629a7e6a233
Diffstat (limited to 'tests/auto/network/access/qnetworkreply/test')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/test/test.pro | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index 0dcf5a250c..1f45ac0c49 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -13,7 +13,4 @@ RESOURCES += ../qnetworkreply.qrc TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \ ../index.html ../smb-file.txt -qtConfig(xcb): CONFIG+=insignificant_test # unstable, QTBUG-21102 -win32:CONFIG += insignificant_test # QTBUG-24226 - !winrt: TEST_HELPER_INSTALLS = ../echo/echo |