diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-25 13:43:44 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-31 11:01:00 +0000 |
| commit | 20dccb84e3518561d32237fee4ad11500c9bbe0f (patch) | |
| tree | 2368d898fefc3b03e9942f72630f4e6442a939bf /configure.json | |
| parent | eccf02a09ee5866fc971b5ff9f36aef5874bd25c (diff) | |
Fix build with 5.8 and make embedded configurable
Avoid checking features only available in 5.9 directly. This also
changes the embedded-build configuration to being a feature that can be
set at configure time.
Change-Id: I9b42dcf696734a83e5c8d6e1cc07562cbeb3f993
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/configure.json b/configure.json index 5799dafa3..fd89230b6 100644 --- a/configure.json +++ b/configure.json @@ -9,6 +9,7 @@ "commandline": { "options": { "alsa": "boolean", + "embedded": "boolean", "pepper-plugins": "boolean", "printing-and-pdf": "boolean", "proprietary-codecs": "boolean", @@ -41,10 +42,21 @@ "gn": { "label": "system gn", "type": "detectGn" + }, + "embedded": { + "label": "embedded", + "type": "embedded" } }, "features": { + "embedded": { + "label": "Embedded build", + "condition": "config.unix", + "autoDetect": "tests.embedded", + "purpose": "Enables the embedded build configuration", + "output": [ "privateFeature" ] + }, "alsa": { "label": "ALSA", "condition": "config.unix && libs.alsa", @@ -58,14 +70,14 @@ }, "pepper-plugins": { "label": "Pepper Plugins", - "autoDetect": "!features.cross_compile", + "autoDetect": "!features.embedded", "purpose": "Enables use of Pepper Flash and Widevine plugins", "output": [ "privateFeature" ] }, "printing-and-pdf": { "label": "Printing and PDF", "condition": "module.printsupport && features.printer", - "autoDetect": "!features.cross_compile", + "autoDetect": "!features.embedded", "purpose": "Enables printing and output to PDF", "output": [ "privateFeature" ] }, @@ -97,6 +109,7 @@ { "section": "Qt WebEngine", "entries": [ + "embedded", "pepper-plugins", "printing-and-pdf", "proprietary-codecs", |