diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-01-09 11:05:04 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-01-16 14:39:21 +0100 |
| commit | 1364ba04b2df4e91d8f648fb02e0c19dcac1ab30 (patch) | |
| tree | 197488e4956acec62419499b6f883d1ca33bb0f0 /src | |
| parent | a6ac2fdd2366f00610cd5e26c88d65f97e93e15c (diff) | |
Refactor our build skipping logic
Move the logic to mkspecs to keep the .pro files robust.
Add the basic infrastructure for config.tests, the first one
of which will consistently ensure we have libcap on linux.
Change-Id: Iee4207e747e589ba67d5353cb4c18f156e555c11
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/src.pro | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/src/src.pro b/src/src.pro index 60f873c76..ed402c582 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,30 +1,26 @@ TEMPLATE = subdirs -isPlatformSupported() { - process.depends = core - webengine.depends = core - webenginewidgets.depends = core webengine - webengine_plugin.subdir = webengine/plugin - webengine_plugin.target = sub-webengine-plugin - webengine_plugin.depends = webengine - webengine_experimental_plugin.subdir = webengine/plugin/experimental - webengine_experimental_plugin.target = sub-webengine-experimental-plugin - webengine_experimental_plugin.depends = webengine +process.depends = core +webengine.depends = core +webenginewidgets.depends = core webengine +webengine_plugin.subdir = webengine/plugin +webengine_plugin.target = sub-webengine-plugin +webengine_plugin.depends = webengine +webengine_experimental_plugin.subdir = webengine/plugin/experimental +webengine_experimental_plugin.target = sub-webengine-experimental-plugin +webengine_experimental_plugin.depends = webengine - SUBDIRS += core \ - process \ - webengine \ - webengine_plugin \ - webengine_experimental_plugin +SUBDIRS += core \ + process \ + webengine \ + webengine_plugin \ + webengine_experimental_plugin - # FIXME: We probably want a bit more control over config options to tweak what to build/ship or not. - # Another example of where this could be necessary is to make it easy to build proprietery codecs support. - !contains(WEBENGINE_CONFIG, no_ui_delegates): SUBDIRS += webengine/ui +# FIXME: We probably want a bit more control over config options to tweak what to build/ship or not. +# Another example of where this could be necessary is to make it easy to build proprietery codecs support. +!contains(WEBENGINE_CONFIG, no_ui_delegates): SUBDIRS += webengine/ui - qtHaveModule(widgets) { - SUBDIRS += webenginewidgets - } -} else { - warning("QtWebEngine is not maintained for this platform/configuration and is therefore disabled.") +qtHaveModule(widgets) { + SUBDIRS += webenginewidgets } |