From 0f431712fbcb3775d85891a97ccb080d0da581e0 Mon Sep 17 00:00:00 2001
From: Mikhail Svetkin <mikhail.svetkin@qt.io>
Date: Fri, 4 Jan 2019 16:26:19 +0100
Subject: [PATCH] qtlite: Add a new option -no-pcre

pcre only used by QRegularExpression.

Change-Id: I704bdb46ed8956f875e1f5fcc0fa2e06122fd87e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 config_help.txt            |  2 +-
 src/corelib/configure.json | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/config_help.txt b/config_help.txt
index 18f66c7931..77a333c89a 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -241,7 +241,7 @@ Core options:
   -inotify ............. Enable inotify support
   -iconv ............... Enable iconv(3) support [posix/sun/gnu/no] (Unix only)
   -icu ................. Enable ICU support [auto]
-  -pcre ................ Select used libpcre2 [system/qt]
+  -pcre ................ Select used libpcre2 [system/qt/no]
   -pps ................. Enable PPS support [auto] (QNX only)
   -zlib ................ Select used zlib [system/qt]
 
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 948aa0829b..81768507f6 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -11,7 +11,7 @@
             "icu": "boolean",
             "inotify": "boolean",
             "journald": "boolean",
-            "pcre": { "type": "enum", "values": [ "qt", "system" ] },
+            "pcre": { "type": "enum", "values": [ "no", "qt", "system" ] },
             "posix-ipc": { "type": "boolean", "name": "ipc_posix" },
             "pps": { "type": "boolean", "name": "qqnx_pps" },
             "slog2": "boolean",
@@ -662,15 +662,18 @@
             "condition": "features.textcodec",
             "output": [ "publicFeature", "feature" ]
         },
+        "pcre2": {
+            "label": "PCRE2",
+            "disable": "input.pcre == 'no' || input.pcre == 'system'",
+            "enable": "input.pcre == 'qt'",
+            "output": [ "privateConfig" ]
+        },
         "system-pcre2": {
-            "label": "Using system PCRE2",
-            "disable": "input.pcre == 'qt'",
+            "label": "  Using system PCRE2",
+            "disable": "input.pcre == 'no' || input.pcre == 'qt'",
             "enable": "input.pcre == 'system'",
             "condition": "libs.pcre2",
-            "output": [
-                "privateFeature",
-                { "type": "privateConfig", "negative": true, "name": "pcre2" }
-            ]
+            "output": [ "privateFeature" ]
         },
         "poll_ppoll": {
             "label": "Native ppoll()",
@@ -749,6 +752,7 @@
             "label": "QRegularExpression",
             "purpose": "Provides an API to Perl-compatible regular expressions.",
             "section": "Kernel",
+            "condition": "features.system-pcre2 || features.pcre2",
             "output": [ "publicFeature", "feature" ]
         },
         "sharedmemory": {
@@ -1048,6 +1052,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in
                     "args": "qqnx_pps",
                     "condition": "config.qnx"
                 },
+                "pcre2",
                 "system-pcre2"
             ]
         }