summaryrefslogtreecommitdiffstats
path: root/src/tools/bootstrap/bootstrap.pro
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-03-26 13:01:36 +0100
committerLars Knoll <lars.knoll@qt.io>2020-04-13 09:40:09 +0200
commit33752a9bd334a53e891f141afd2357eefb1a9a36 (patch)
treeadf44eafe1d4201b49088d3d8592c0b83877101a /src/tools/bootstrap/bootstrap.pro
parentce1d4d362881b54ff774b49f54ef686f9aa97c73 (diff)
Include QRegularExpression in the bootstrap library
This allows us to use regular expressions in bootstrapped tools such as moc and tracegen. Change-Id: I4310dd15bf26651aac6ab30c884e025ca06b3099 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pro')
-rw-r--r--src/tools/bootstrap/bootstrap.pro7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 10d5fd4f95..eb267fc7bb 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -14,6 +14,9 @@ MODULE_DEFINES = \
QT_NO_CAST_TO_ASCII
MODULE_CONFIG = gc_binaries
+DEFINES += PCRE2_DISABLE_JIT
+include(../../3rdparty/pcre2/pcre2.pri)
+
DEFINES += \
$$MODULE_DEFINES \
QT_NO_FOREACH \
@@ -21,7 +24,8 @@ DEFINES += \
INCLUDEPATH += \
$$PWD/.. \
- $$PWD/../../3rdparty/tinycbor/src
+ $$PWD/../../3rdparty/tinycbor/src \
+ $$PWD/../../3rdparty/pcre2/src
SOURCES += \
../../corelib/codecs/qlatincodec.cpp \
@@ -87,6 +91,7 @@ SOURCES += \
../../corelib/text/qlocale.cpp \
../../corelib/text/qlocale_tools.cpp \
../../corelib/text/qregexp.cpp \
+ ../../corelib/text/qregularexpression.cpp \
../../corelib/text/qstring.cpp \
../../corelib/text/qstringbuilder.cpp \
../../corelib/text/qstring_compat.cpp \