diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 11:40:41 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-06 12:57:21 +0200 |
| commit | ecb537e8233c8847d14f36ec3bf698711d6d151a (patch) | |
| tree | f9cb367d6e66067970102ed1864f7280f3750ccc /configure.json | |
| parent | 9b449045fbd5fd3b58bcaff6cf0c5878cd6e64eb (diff) | |
| parent | ad55613c2648edb67353c3882d1956b54fc323b4 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: I9fe9946ba47f9ef509a861963c83e275a25fffd0
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 19a32a17c..a176b845b 100644 --- a/configure.json +++ b/configure.json @@ -97,6 +97,11 @@ "label": "embedded", "type": "embedded" }, + "re2": { + "label": "re2", + "test": "re2", + "type": "compile" + }, "glibc": { "label": "glibc > 2.16", "type": "detectGlibc" @@ -210,6 +215,12 @@ "condition": "libs.icu", "output": [ "privateFeature" ] }, + "system-re2": { + "label": "re2", + "autoDetect": "config.unix", + "condition": "tests.re2", + "output": [ "privateFeature" ] + }, "system-ninja": { "label": "Using system ninja", "condition": "tests.ninja", @@ -276,6 +287,7 @@ "section": "System libraries", "condition": "config.unix", "entries": [ + "system-re2", "system-icu", "system-webp", "system-opus", |