diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-19 13:27:53 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-06-22 14:21:25 +0000 |
| commit | 68e31e4ab9fb3fdd544bc402e7654e2ac1f5eb53 (patch) | |
| tree | e7dd3f9afd802d1a1ce53930910c317744966f61 /src/plugins/plugins.pro | |
| parent | b93d1f6b1f90f9c24ba31b8c7c1b8d01327c05b9 (diff) | |
Replace #ifdefs with qmake feature checks.
This prevents the building of dysfunctional plugins that don't define
a loader function, or won't compile at all.
Change-Id: Ib62edb8db4a8917effa05292cb702bb4022f552c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/plugins/plugins.pro')
| -rw-r--r-- | src/plugins/plugins.pro | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 587063b100..dd5345e67e 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,8 +1,15 @@ TEMPLATE = subdirs +load(qfeatures) SUBDIRS *= sqldrivers -!winrt:qtHaveModule(network): SUBDIRS += bearer -qtHaveModule(gui): SUBDIRS *= imageformats platforms platforminputcontexts platformthemes generic +!winrt:qtHaveModule(network):!contains(QT_DISABLED_FEATURES, bearermanagement): SUBDIRS += bearer +qtHaveModule(gui) { + SUBDIRS *= platforms platforminputcontexts platformthemes + !contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS *= imageformats + !contains(QT_DISABLED_FEATURES, library): SUBDIRS *= generic +} qtHaveModule(widgets): SUBDIRS *= styles -!winrt:!wince*:qtHaveModule(widgets):SUBDIRS += printsupport +!winrt:!wince*:qtHaveModule(widgets):!contains(QT_DISABLED_FEATURES, printer) { + SUBDIRS += printsupport +} |