From 1b65098a202f67d80d5db9e2ea1d07033c01f570 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 3 Apr 2020 20:57:06 +0200 Subject: Move the QRegExp porting docs into the QRegExp class documentation It used to live in QRegularExpression, but as QRegExp gets removed from Qt Core, the better place for it is to live in the QRegExp docs. Also marked QRegExp as deprecated in the docs. Change-Id: Id5b0e3040e4d46f5d806022b58fbd5b5efd58911 Reviewed-by: Alex Blasche --- src/corelib/doc/snippets/code/src_corelib_tools_qregexp.cpp | 9 +++++++++ .../doc/snippets/code/src_corelib_tools_qregularexpression.cpp | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src/corelib/doc/snippets') diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qregexp.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qregexp.cpp index 433b01b21a..8339ea413e 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qregexp.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qregexp.cpp @@ -232,3 +232,12 @@ s2 = QRegExp::escape("f(x)"); // s2 == "f\\(x\\)" QRegExp rx("(" + QRegExp::escape(name) + "|" + QRegExp::escape(alias) + ")"); //! [20] + +{ +//! [21] +QString p("a .*|pattern"); + +// re matches exactly the pattern string p +QRegularExpression re(QRegularExpression::anchoredPattern(p)); +//! [21] +} diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp index 99cd4ea7a2..b451ed5253 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp @@ -284,15 +284,6 @@ if (!invalidRe.isValid()) { //! [23] } -{ -//! [24] -QString p("a .*|pattern"); - -// re matches exactly the pattern string p -QRegularExpression re(QRegularExpression::anchoredPattern(p)); -//! [24] -} - { //! [26] QString escaped = QRegularExpression::escape("a(x) = f(x) + g(x)"); -- cgit v1.2.3