diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-17 08:50:42 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-17 08:59:14 +0100 |
| commit | c4885b21d6d18364d931cb103bd5a7306748d9b8 (patch) | |
| tree | 5ca6eb8e67d22580d598e7bd3a9ab8984e88bcec /src/plugins/sqldrivers/oci/oci.pro | |
| parent | 2caebf42a70cceb21b46b08e341c3cbf928b1fc8 (diff) | |
| parent | f6c9f0312888317c0cd6a85cd3f238bb4e0295c5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Also blacklist tst_QNetworkReply::ioHttpRedirectErrors(too-many-redirects)
on RHEL 6.6 in CI.
Conflicts:
tests/auto/network/access/qnetworkreply/BLACKLIST
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
Task-number: QTBUG-64569
Change-Id: I7514fc0660c18fd3a3e1d0d0af3f15d879e3c6f4
Diffstat (limited to 'src/plugins/sqldrivers/oci/oci.pro')
0 files changed, 0 insertions, 0 deletions