qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix building of various examples and tools with -no-feature-process 

We should not check for platforms, but rather for features. Also, if
dbus is available it doesn't automatically mean that QProcess is.

Change-Id: I27ef5863fcb107cca1aa47abba95b734962adc33
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Ulf Hermann 2017-03-02 11:31:30 +01:00
parent c925400bde
commit a170c974a5
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dbus/dbus.pro
View File

@ -4,7 +4,7 @@ TEMPLATE = subdirs
SUBDIRS = listnames \
pingpong
!uikit: SUBDIRS += complexpingpong
qtConfig(process): SUBDIRS += complexpingpong
qtHaveModule(widgets) {
SUBDIRS += chat \

3
examples/network/network.pro
View File

@ -20,8 +20,7 @@ qtHaveModule(widgets) {
multicastsender
qtConfig(bearermanagement) {
# no QProcess
!vxworks:!qnx:!winrt:!integrity:!uikit: SUBDIRS += network-chat
qtConfig(process): SUBDIRS += network-chat
SUBDIRS += \
bearermonitor \

1
tests/auto/auto.pro
View File

@ -23,6 +23,7 @@ uikit: SUBDIRS = corelib gui
wince: SUBDIRS -= printsupport
cross_compile: SUBDIRS -= tools cmake installed_cmake
else:!qtConfig(process): SUBDIRS -= tools
!qtHaveModule(opengl): SUBDIRS -= opengl
!qtHaveModule(gui): SUBDIRS -= gui
!qtHaveModule(widgets): SUBDIRS -= widgets

5
tests/auto/dbus/dbus.pro
View File

@ -29,3 +29,8 @@ SUBDIRS+=\
!qtConfig(private_tests): SUBDIRS -= \
qdbusmarshall \
!qtConfig(process): SUBDIRS -= \
qdbusabstractadaptor \
qdbusabstractinterface \
qdbusinterface \
qdbusmarshall