3 files changed, 115 insertions, 42 deletions
diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt
new file mode 100644
index 0000000000..b73f0bff9e
--- /dev/null
+++ b/src/3rdparty/pcre2/CMakeLists.txt
@@ -0,0 +1,72 @@
+# Generated from pcre2.pro.
+
+#####################################################################
+## BundledPcre2 Generic Library:
+#####################################################################
+
+qt_add_3rdparty_library(BundledPcre2
+    STATIC
+    SOURCES
+        src/config.h
+        src/pcre2.h
+        src/pcre2_auto_possess.c
+        src/pcre2_chartables.c
+        src/pcre2_compile.c
+        src/pcre2_config.c
+        src/pcre2_context.c
+        src/pcre2_dfa_match.c
+        src/pcre2_error.c
+        src/pcre2_extuni.c
+        src/pcre2_find_bracket.c
+        src/pcre2_internal.h
+        src/pcre2_intmodedep.h
+        src/pcre2_jit_compile.c
+        src/pcre2_maketables.c
+        src/pcre2_match.c
+        src/pcre2_match_data.c
+        src/pcre2_newline.c
+        src/pcre2_ord2utf.c
+        src/pcre2_pattern_info.c
+        src/pcre2_script_run.c
+        src/pcre2_serialize.c
+        src/pcre2_string_utils.c
+        src/pcre2_study.c
+        src/pcre2_substitute.c
+        src/pcre2_substring.c
+        src/pcre2_tables.c
+        src/pcre2_ucd.c
+        src/pcre2_ucp.h
+        src/pcre2_valid_utf.c
+        src/pcre2_xclass.c
+    DEFINES
+        HAVE_CONFIG_H
+    PUBLIC_DEFINES
+        PCRE2_CODE_UNIT_WIDTH=16
+    PUBLIC_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
+)
+qt_disable_warnings(BundledPcre2)
+qt_set_symbol_visibility_hidden(BundledPcre2)
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT OR WINRT
+    DEFINES
+        PCRE2_DISABLE_JIT
+)
+
+qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+    DEFINES
+        PCRE2_DISABLE_JIT
+)
+
+qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+    DEFINES
+        PCRE2_DISABLE_JIT
+)
+
+qt_extend_target(BundledPcre2 CONDITION WIN32
+    PUBLIC_DEFINES
+        PCRE2_STATIC
+)
diff --git a/src/3rdparty/pcre2/pcre2.pri b/src/3rdparty/pcre2/pcre2.pri
new file mode 100644
index 0000000000..fa901f783f
--- /dev/null
+++ b/src/3rdparty/pcre2/pcre2.pri
@@ -0,0 +1,41 @@
+MODULE_INCLUDEPATH += $$PWD/src
+
+MODULE_DEFINES += PCRE2_CODE_UNIT_WIDTH=16
+win32: MODULE_DEFINES += PCRE2_STATIC
+
+DEFINES += HAVE_CONFIG_H
+
+SOURCES += \
+    $$PWD/src/pcre2_auto_possess.c \
+    $$PWD/src/pcre2_chartables.c \
+    $$PWD/src/pcre2_compile.c \
+    $$PWD/src/pcre2_config.c \
+    $$PWD/src/pcre2_context.c \
+    $$PWD/src/pcre2_dfa_match.c \
+    $$PWD/src/pcre2_error.c \
+    $$PWD/src/pcre2_extuni.c \
+    $$PWD/src/pcre2_find_bracket.c \
+    $$PWD/src/pcre2_jit_compile.c \
+    $$PWD/src/pcre2_maketables.c \
+    $$PWD/src/pcre2_match.c \
+    $$PWD/src/pcre2_match_data.c \
+    $$PWD/src/pcre2_newline.c \
+    $$PWD/src/pcre2_ord2utf.c \
+    $$PWD/src/pcre2_pattern_info.c \
+    $$PWD/src/pcre2_script_run.c \
+    $$PWD/src/pcre2_serialize.c \
+    $$PWD/src/pcre2_string_utils.c \
+    $$PWD/src/pcre2_study.c \
+    $$PWD/src/pcre2_substitute.c \
+    $$PWD/src/pcre2_substring.c \
+    $$PWD/src/pcre2_tables.c \
+    $$PWD/src/pcre2_ucd.c \
+    $$PWD/src/pcre2_valid_utf.c \
+    $$PWD/src/pcre2_xclass.c
+
+HEADERS += \
+    $$PWD/src/config.h \
+    $$PWD/src/pcre2.h \
+    $$PWD/src/pcre2_internal.h \
+    $$PWD/src/pcre2_intmodedep.h \
+    $$PWD/src/pcre2_ucp.h
diff --git a/src/3rdparty/pcre2/pcre2.pro b/src/3rdparty/pcre2/pcre2.pro
index 56790f34c5..a3915fa2fa 100644
--- a/src/3rdparty/pcre2/pcre2.pro
+++ b/src/3rdparty/pcre2/pcre2.pro
@@ -5,51 +5,11 @@ CONFIG += \
     hide_symbols \
     exceptions_off rtti_off warn_off
 
-
-MODULE_DEFINES += PCRE2_CODE_UNIT_WIDTH=16
-win32: MODULE_DEFINES += PCRE2_STATIC
-MODULE_INCLUDEPATH += $$PWD/src
-
-load(qt_helper_lib)
-
-DEFINES += HAVE_CONFIG_H
+include(pcre2.pri)
 
 # platform/compiler specific definitions
 uikit|qnx|winrt: DEFINES += PCRE2_DISABLE_JIT
 win32:contains(QT_ARCH, "arm"): DEFINES += PCRE2_DISABLE_JIT
 win32:contains(QT_ARCH, "arm64"): DEFINES += PCRE2_DISABLE_JIT
 
-SOURCES += \
-    $$PWD/src/pcre2_auto_possess.c \
-    $$PWD/src/pcre2_chartables.c \
-    $$PWD/src/pcre2_compile.c \
-    $$PWD/src/pcre2_config.c \
-    $$PWD/src/pcre2_context.c \
-    $$PWD/src/pcre2_dfa_match.c \
-    $$PWD/src/pcre2_error.c \
-    $$PWD/src/pcre2_extuni.c \
-    $$PWD/src/pcre2_find_bracket.c \
-    $$PWD/src/pcre2_jit_compile.c \
-    $$PWD/src/pcre2_maketables.c \
-    $$PWD/src/pcre2_match.c \
-    $$PWD/src/pcre2_match_data.c \
-    $$PWD/src/pcre2_newline.c \
-    $$PWD/src/pcre2_ord2utf.c \
-    $$PWD/src/pcre2_pattern_info.c \
-    $$PWD/src/pcre2_script_run.c \
-    $$PWD/src/pcre2_serialize.c \
-    $$PWD/src/pcre2_string_utils.c \
-    $$PWD/src/pcre2_study.c \
-    $$PWD/src/pcre2_substitute.c \
-    $$PWD/src/pcre2_substring.c \
-    $$PWD/src/pcre2_tables.c \
-    $$PWD/src/pcre2_ucd.c \
-    $$PWD/src/pcre2_valid_utf.c \
-    $$PWD/src/pcre2_xclass.c
-
-HEADERS += \
-    $$PWD/src/config.h \
-    $$PWD/src/pcre2.h \
-    $$PWD/src/pcre2_internal.h \
-    $$PWD/src/pcre2_intmodedep.h \
-    $$PWD/src/pcre2_ucp.h
+load(qt_helper_lib)