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>
This commit is contained in:
parent
aad0c8dda1
commit
74027e7f99
@ -1,7 +1,8 @@
|
|||||||
{
|
{
|
||||||
"module": "gui",
|
"module": "gui",
|
||||||
"depends": [
|
"depends": [
|
||||||
"core"
|
"core",
|
||||||
|
"network"
|
||||||
],
|
],
|
||||||
"testDir": "../../config.tests",
|
"testDir": "../../config.tests",
|
||||||
|
|
||||||
@ -996,7 +997,10 @@
|
|||||||
"vnc": {
|
"vnc": {
|
||||||
"label": "VNC",
|
"label": "VNC",
|
||||||
"section": "Platform plugins",
|
"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" ]
|
"output": [ "privateFeature" ]
|
||||||
},
|
},
|
||||||
"mirclient": {
|
"mirclient": {
|
||||||
@ -1190,6 +1194,12 @@
|
|||||||
"condition": "libs.tslib",
|
"condition": "libs.tslib",
|
||||||
"output": [ "privateFeature" ]
|
"output": [ "privateFeature" ]
|
||||||
},
|
},
|
||||||
|
"tuiotouch": {
|
||||||
|
"label": "TuioTouch",
|
||||||
|
"purpose": "Provides the TuioTouch input plugin.",
|
||||||
|
"condition": "features.network && features.udpsocket",
|
||||||
|
"output": [ "privateFeature" ]
|
||||||
|
},
|
||||||
"xcb": {
|
"xcb": {
|
||||||
"label": "XCB",
|
"label": "XCB",
|
||||||
"section": "Platform plugins",
|
"section": "Platform plugins",
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
TEMPLATE = subdirs
|
TEMPLATE = subdirs
|
||||||
QT_FOR_CONFIG += gui-private network-private
|
QT_FOR_CONFIG += gui-private
|
||||||
|
|
||||||
qtConfig(evdev) {
|
qtConfig(evdev) {
|
||||||
SUBDIRS += evdevmouse evdevtouch evdevkeyboard
|
SUBDIRS += evdevmouse evdevtouch evdevkeyboard
|
||||||
@ -11,7 +11,7 @@ qtConfig(tslib) {
|
|||||||
SUBDIRS += tslib
|
SUBDIRS += tslib
|
||||||
}
|
}
|
||||||
|
|
||||||
qtConfig(udpsocket) {
|
qtConfig(tuiotouch) {
|
||||||
SUBDIRS += tuiotouch
|
SUBDIRS += tuiotouch
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user