diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:46:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:51:11 +0100 |
| commit | c577f6edafef7c40a5f78092ec4fcd78bb820b2c (patch) | |
| tree | 9ca3819e5cca9b7e61f305a874b682e5a2085e83 /examples/embedded | |
| parent | 99ce1d3d97c0423c3ee63ccf58deed964db0770e (diff) | |
| parent | de225ccdf95efb57866d62bc80872c1a2ab99703 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/corelib/plugin/qlibrary_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb
Diffstat (limited to 'examples/embedded')
| -rw-r--r-- | examples/embedded/flightinfo/flightinfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/embedded/flightinfo/flightinfo.cpp b/examples/embedded/flightinfo/flightinfo.cpp index 8ad1e5c0c0..e91277db58 100644 --- a/examples/embedded/flightinfo/flightinfo.cpp +++ b/examples/embedded/flightinfo/flightinfo.cpp @@ -239,9 +239,9 @@ private: int i = data.indexOf("a href=\"?view=detail"); if (i > 0) { QString href = data.mid(i, data.indexOf('\"', i + 8) - i + 1); - QRegExp regex("dpap=([A-Za-z0-9]+)"); - regex.indexIn(href); - QString airport = regex.cap(1); + QRegularExpression regex("dpap=([A-Za-z0-9]+)"); + QRegularExpressionMatch match = regex.match(href); + QString airport = match.captured(1); QUrlQuery query(m_url); query.addQueryItem("dpap", airport); m_url.setQuery(query); |