diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 23:14:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 23:14:22 +0200 |
| commit | 6bc1ce9c164d0230508eafbe6c18144c8b1a6a74 (patch) | |
| tree | e1e0fe8e15eb3b7ebfd90da9aeef0780f75c9700 /tests/auto/other | |
| parent | ccca3ffdc26f585f28ce0a8539f96f02adce30dc (diff) | |
| parent | 3890988bb69c2a50d4ebdbcd8c4c7058ac364125 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
src/corelib/kernel/qcfsocketnotifier.cpp
src/tools/qdoc/qdocindexfiles.cpp
Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a
Diffstat (limited to 'tests/auto/other')
| -rw-r--r-- | tests/auto/other/networkselftest/BLACKLIST | 4 | ||||
| -rw-r--r-- | tests/auto/other/networkselftest/networkselftest.pro | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/other/networkselftest/BLACKLIST b/tests/auto/other/networkselftest/BLACKLIST new file mode 100644 index 0000000000..4a958b43a5 --- /dev/null +++ b/tests/auto/other/networkselftest/BLACKLIST @@ -0,0 +1,4 @@ +# QTBUG-27571 +[ftpProxyServer] +windows 32bit +windows 64bit diff --git a/tests/auto/other/networkselftest/networkselftest.pro b/tests/auto/other/networkselftest/networkselftest.pro index 22208e02fb..60b45e6b5e 100644 --- a/tests/auto/other/networkselftest/networkselftest.pro +++ b/tests/auto/other/networkselftest/networkselftest.pro @@ -4,5 +4,4 @@ TARGET = tst_networkselftest SOURCES += tst_networkselftest.cpp QT = core core-private network testlib -win32:CONFIG += insignificant_test # QTBUG-27571 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |