3 files changed, 5 insertions, 0 deletions
diff --git a/src/qml/.prev_CMakeLists.txt b/src/qml/.prev_CMakeLists.txt
index 32595a1759..077373f9ac 100644
--- a/src/qml/.prev_CMakeLists.txt
+++ b/src/qml/.prev_CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 add_qt_module(Qml
+    PLUGIN_TYPES qmltooling
     SOURCES
         ../3rdparty/llvm/include/llvm-c/DataTypes.h
         ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h
@@ -593,3 +594,4 @@ qt_create_tracepoints(Qml qtqml.tracepoints)
 add_qt_docs(
     doc/qtqml.qdocconf
 )
+
diff --git a/src/qml/CMakeLists.txt b/src/qml/CMakeLists.txt
index b91862edd4..6a750161f4 100644
--- a/src/qml/CMakeLists.txt
+++ b/src/qml/CMakeLists.txt
@@ -5,6 +5,7 @@
 #####################################################################
 
 add_qt_module(Qml
+    PLUGIN_TYPES qmltooling
     SOURCES
         ../3rdparty/llvm/include/llvm-c/DataTypes.h
         ../3rdparty/llvm/include/llvm/ADT/PointerIntPair.h
@@ -600,3 +601,4 @@ qt_create_tracepoints(Qml qtqml.tracepoints)
 add_qt_docs(
     doc/qtqml.qdocconf
 )
+
diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp
index 4ed1dbd5aa..9e77061882 100644
--- a/src/qml/jsruntime/qv4regexp.cpp
+++ b/src/qml/jsruntime/qv4regexp.cpp
@@ -74,6 +74,7 @@ DEFINE_MANAGED_VTABLE(RegExp);
 uint RegExp::match(const QString &string, int start, uint *matchOffsets)
 {
     static const uint offsetJITFail = std::numeric_limits<unsigned>::max() - 1;
+    Q_UNUSED(offsetJITFail);
 
     if (!isValid())
         return JSC::Yarr::offsetNoMatch;