1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate Windows QPA backend to use QRegularExpression

Browse Source 
This patch updates the Windows QPA backend code to use QRegularExpression
in place of the deprecated QRegExp.

Change-Id: Ib45c374578bed5b9f2771df1ca04cc09cab6e7c9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Samuel Gaist 2017-02-12 22:09:04 +01:00 committed by Joerg Bornemann
parent b549a3550c
commit d5cecfe8fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
View File

@ -53,7 +53,7 @@
#include <QtGui/QColor> #include <QtGui/QColor>
#include <QtCore/QDebug> #include <QtCore/QDebug>
#include <QtCore/QRegExp> #include <QtCore/QRegularExpression>
#include <QtCore/QTimer> #include <QtCore/QTimer>
#include <QtCore/QDir> #include <QtCore/QDir>
#include <QtCore/QScopedArrayPointer> #include <QtCore/QScopedArrayPointer>
@ -1017,7 +1017,7 @@ static QList<FilterSpec> filterSpecs(const QStringList &filters,
result.reserve(filters.size()); result.reserve(filters.size());
*totalStringLength = 0; *totalStringLength = 0;
const QRegExp filterSeparatorRE(QStringLiteral("[;\\s]+")); const QRegularExpression filterSeparatorRE(QStringLiteral("[;\\s]+"));
const QString separator = QStringLiteral(";"); const QString separator = QStringLiteral(";");
Q_ASSERT(filterSeparatorRE.isValid()); Q_ASSERT(filterSeparatorRE.isValid());
// Split filter specification as 'Texts (*.txt[;] *.doc)', '*.txt[;] *.doc' // Split filter specification as 'Texts (*.txt[;] *.doc)', '*.txt[;] *.doc'