diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:10:43 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:10:43 +0100 |
commit | e66a1125f2b796fe48aef6c88caf501ee3224c0f (patch) | |
tree | d28115677f56722248bd564e063df96f0f166685 /src/src.pro | |
parent | 79773ecfcc27b350a3e5ea1149ef51f7cc657b61 (diff) | |
parent | ae657b918ff22da2553dc577c877b03f49cc2bdf (diff) |
Merge 5.4 into 5.4.1
Change-Id: I772c9710d8b01efd385a54e5f642ae2b62702a0e
Diffstat (limited to 'src/src.pro')
-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 } |