diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-22 18:13:46 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-22 18:19:38 +0200 |
| commit | c10bab71dc37ecffe67c6d9060f0dc37c2fcc7ea (patch) | |
| tree | b6a19fe4bb07810c0df09bd40afe07842d262001 /src/plugins | |
| parent | 7257358e44b373ebdd147162f7b5596d27420e7b (diff) | |
Tooling: Use QRegularExpression rather than QRegExp
Task-number: QTBUG-72588
Change-Id: Ib79107ea01de2dee49dc783f1d88807d1852c3ba
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp index bac4e01df1..1be58111ee 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp @@ -48,6 +48,7 @@ #include <private/qversionedpacket_p.h> #include <QtGui/qwindow.h> +#include <QtCore/qregularexpression.h> //INSPECTOR SERVICE PROTOCOL // <HEADER><COMMAND><DATA> @@ -273,8 +274,8 @@ QString GlobalInspector::titleForItem(QQuickItem *item) const QString className = QLatin1String(item->metaObject()->className()); QString objectStringId = idStringForObject(item); - className.remove(QRegExp(QLatin1String("_QMLTYPE_\\d+"))); - className.remove(QRegExp(QLatin1String("_QML_\\d+"))); + className.remove(QRegularExpression(QLatin1String("_QMLTYPE_\\d+"))); + className.remove(QRegularExpression(QLatin1String("_QML_\\d+"))); if (className.startsWith(QLatin1String("QQuick"))) className = className.mid(6); diff --git a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp index 8293e88038..834068240c 100644 --- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp +++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp @@ -357,10 +357,7 @@ void QQmlDebugServerImpl::parseArguments() if (ok) { const QString nextArgument = argsNext->toString(); - // Don't use QStringLiteral here. QRegExp has a global cache and will save an implicitly - // shared copy of the passed string. That copy isn't properly detached when the library - // is unloaded if the original string lives in the library's .rodata - if (nextArgument.contains(QRegExp(QLatin1String("^\\s*\\d+\\s*$")))) { + if (nextArgument.contains(QRegularExpression(QLatin1String("^\\s*\\d+\\s*$")))) { portTo = nextArgument.toInt(&ok); ++argsIt; } |