summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-03 03:00:06 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-07-03 03:00:06 +0200
commit22f3b89a702671beeb99b851697897425d3bb085 (patch)
tree3dcbad34e1a48f5b788a26dd0c251e54c9902418
parent1d5ed9c24a6ef46adca2ecdbcecf1e632525a7b8 (diff)
parent2954e0112aac4d76aa8c78b3261de665621edbc6 (diff)
downloadqtwebsockets-22f3b89a702671beeb99b851697897425d3bb085.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ieb9c874a99c519c7871dda3c437e6f3a66ba440c
-rw-r--r--tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp b/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp
index 1724167..9a7c590 100644
--- a/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp
+++ b/tests/auto/websockets/handshakeresponse/tst_handshakeresponse.cpp
@@ -29,6 +29,7 @@
#include <QtTest/qtestcase.h>
#include <QtCore/QDebug>
#include <QtCore/QByteArray>
+#include <QtCore/QRegularExpression>
#include <QtCore/QtEndian>
#include "private/qwebsockethandshakerequest_p.h"
@@ -97,7 +98,7 @@ void tst_HandshakeResponse::tst_date_response()
output << response;
QStringList list = data.split("\r\n");
- int index = list.indexOf(QRegExp("Date:.*"));
+ int index = list.indexOf(QRegularExpression("Date:.*"));
QVERIFY(index > -1);
QVERIFY(QLocale::c().toDateTime(list[index], "'Date:' ddd, dd MMM yyyy hh:mm:ss 'GMT'").isValid());
}