diff options
| author | Samuel Gaist <samuel.gaist@edeltech.ch> | 2017-01-22 00:18:58 +0100 |
|---|---|---|
| committer | Samuel Gaist <samuel.gaist@edeltech.ch> | 2017-01-23 22:52:50 +0000 |
| commit | acacca859c3416e525599c4162292dd2a5e78fb7 (patch) | |
| tree | 9131dc7cf07df56bbde4649c73b857cc5c907af5 /src | |
| parent | dd52fd0024600d3beffc82d6da02b4239a62d725 (diff) | |
Doc: update QStringList doc with missing QRegularExpression reference
The documentation of QStringList is missing some mention of
QRegularExpression as well as still using QRegExp in some sample code.
This patch fixes that.
Change-Id: I4a7c9fe8e5ae7c73497192bb71d1fa66ee864bd2
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/doc/snippets/qstringlist/main.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qstringlist.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/doc/snippets/qstringlist/main.cpp b/src/corelib/doc/snippets/qstringlist/main.cpp index 7e7d55ca30..4d9c015747 100644 --- a/src/corelib/doc/snippets/qstringlist/main.cpp +++ b/src/corelib/doc/snippets/qstringlist/main.cpp @@ -97,7 +97,7 @@ Widget::Widget(QWidget *parent) //! [6] //! [7] - QStringList monospacedFonts = fonts.filter(QRegExp("Courier|Fixed")); + QStringList monospacedFonts = fonts.filter(QRegularExpression("Courier|Fixed")); //! [7] //! [8] diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index a0b65ea554..88ceae20b9 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -143,8 +143,8 @@ QT_BEGIN_NAMESPACE \snippet qstringlist/main.cpp 6 - The argument to split can be a single character, a string, or a - QRegExp. + The argument to split can be a single character, a string, a + QRegularExpression or a (deprecated) QRegExp. In addition, the \l {QStringList::operator+()}{operator+()} function allows you to concatenate two string lists into one. To |