diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-20 11:14:17 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-21 18:19:55 +0000 |
| commit | 74027e7f992f8fd5b9b40fe3ca096d796d748410 (patch) | |
| tree | c19b6f216848b0da3a08566037a838f50333ec86 /src/gui | |
| parent | aad0c8dda14f014f1aa221e03f5a3f4257442854 (diff) | |
Fix build with -no-feature-network
The vnc and tuiotouch plugins depend on network support. The tuiotouch
plugin furthermore depends on a specific feature from network.
Change-Id: I3bc1f7b1dcf3437c6ed0d41cc9e282114a95a39c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/configure.json | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index 5e4c042c74..be146e8e33 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1,7 +1,8 @@ { "module": "gui", "depends": [ - "core" + "core", + "network" ], "testDir": "../../config.tests", @@ -996,7 +997,10 @@ "vnc": { "label": "VNC", "section": "Platform plugins", - "condition": "config.unix && !config.android && !config.darwin && features.regularexpression", + "condition": [ + "config.unix && !config.android && !config.darwin", + "features.regularexpression && features.network" + ], "output": [ "privateFeature" ] }, "mirclient": { @@ -1190,6 +1194,12 @@ "condition": "libs.tslib", "output": [ "privateFeature" ] }, + "tuiotouch": { + "label": "TuioTouch", + "purpose": "Provides the TuioTouch input plugin.", + "condition": "features.network && features.udpsocket", + "output": [ "privateFeature" ] + }, "xcb": { "label": "XCB", "section": "Platform plugins", |