Merge "Merge remote-tracking branch 'origin/dev' into wip/scenegraphng"wip/scenegraphng

3 files changed, 11 insertions, 10 deletions

diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
index b424ef9f6c..61fea96e2f 100644
--- a/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
+++ b/src/plugins/qmltooling/qmldbg_debugger/qv4debugjob.cpp
@@ -264,7 +264,7 @@ GatherSourcesJob::GatherSourcesJob(QV4::ExecutionEngine *engine)
 
 void GatherSourcesJob::run()
 {
-    for (QV4::CompiledData::CompilationUnit *unit : engine->compilationUnits) {
+    for (QV4::ExecutableCompilationUnit *unit : engine->compilationUnits) {
         QString fileName = unit->fileName();
         if (!fileName.isEmpty())
             sources.append(fileName);
diff --git a/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp b/src/plugins/qmltooling/qmldbg_inspector/globalinspector.cpp
index bac4e01df1..012730902b 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,10 @@ 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+")));
+#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 8293e88038..2d5282b48c 100644
--- a/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
+++ b/src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp
@@ -355,14 +355,12 @@ void QQmlDebugServerImpl::parseArguments()
             if (argsNext == argsItEnd)
                 break;
             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*$")))) {
-                    portTo = nextArgument.toInt(&ok);
+                portTo = argsNext->toString().toInt(&ok);
+                if (ok) {
                     ++argsIt;
+                } else {
+                    portTo = portFrom;
+                    ok = true;
                 }
             }
         } else if (strArgument.startsWith(QLatin1String("host:"))) {