diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-27 21:36:32 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-27 21:36:32 +0200 |
commit | 1c8451bdbbd6ca909dfc5b96a24be909810522fc (patch) | |
tree | 9cc69a4794e23f7224d75fc2323fc70e294a9454 /tests/auto/network | |
parent | 7ebec0fa848de299d4cdee06ccc611ee46494fbf (diff) | |
parent | 0635b1a69dd666f5eed4b096895bd80b1a9420ff (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/tools/qdoc/tree.cpp
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: Iaa78f601a63191fa643aabf853520f913f2f0fdc
Diffstat (limited to 'tests/auto/network')
-rw-r--r-- | tests/auto/network/kernel/qhostinfo/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/network/kernel/qhostinfo/qhostinfo.pro | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/network/kernel/qhostinfo/BLACKLIST b/tests/auto/network/kernel/qhostinfo/BLACKLIST new file mode 100644 index 0000000000..ea4b64d7c2 --- /dev/null +++ b/tests/auto/network/kernel/qhostinfo/BLACKLIST @@ -0,0 +1,3 @@ +# QTBUG-23837 +[abortHostLookupInDifferentThread] +opensuse-13.1 64bit diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro index a95a6bc2d6..4fca7950dd 100644 --- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro @@ -14,5 +14,3 @@ wince*: { # needed for getaddrinfo with official MinGW mingw:DEFINES += _WIN32_WINNT=0x0501 - -linux-*:CONFIG+=insignificant_test # QTBUG-23837 - test is unstable |