diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-23 10:42:57 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-05-23 11:30:27 +0200 |
| commit | b6adafe256c87f611b8e6790dbf37c80aa98e353 (patch) | |
| tree | fc7e16313df273c8a9acc2d187489b2489283150 /src/plugins | |
| parent | c10bab71dc37ecffe67c6d9060f0dc37c2fcc7ea (diff) | |
Tooling: Guard use of QRegularExpression
The Qt we are using might be compiled without regular expressions. The
epxression in qqmldebugserver.cpp is actually not needed as
QString::toInt() can do this check for us. The ones in
globalinspector.cpp are only for reformatting the name in a nicer way
for the selection highlight. We can skip those in case there are no
regular expressions.
Change-Id: I71e3f0314d8a68a41c3da2568207e311c6b41d1b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp index 1be58111ee..012730902b 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp +++ b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp @@ -274,8 +274,10 @@ QString GlobalInspector::titleForItem(QQuickItem *item) const QString className = QLatin1String(item->metaObject()->className()); QString objectStringId = idStringForObject(item); +#if QT_CONFIG(regularexpression) className.remove(QRegularExpression(QLatin1String("_QMLTYPE_\\d+"))); className.remove(QRegularExpression(QLatin1String("_QML_\\d+"))); +#endif 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 834068240c..2d5282b48c 100644 --- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp +++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp @@ -355,11 +355,12 @@ void QQmlDebugServerImpl::parseArguments() if (argsNext == argsItEnd) break; if (ok) { - const QString nextArgument = argsNext->toString(); - - if (nextArgument.contains(QRegularExpression(QLatin1String("^\\s*\\d+\\s*$")))) { - portTo = nextArgument.toInt(&ok); + portTo = argsNext->toString().toInt(&ok); + if (ok) { ++argsIt; + } else { + portTo = portFrom; + ok = true; } } } else if (strArgument.startsWith(QLatin1String("host:"))) { |