Build examples and tests only if their requirements are met
If the respective modules aren't available we cannot build the tests and examples. We drop the qtConfig(opengl) requirement for the opengl examples as a, we would need to make the QtGui configuration available for that to work, and b, we should not add too much detail to the tests and examples build configurations. Checking each test and example for every feature it uses would be too much. Task-number: QTBUG-57255 Change-Id: Ifb043c81ec9e5c487765297bd65704812cd281fc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
parent
c587036dc6
commit
329385a5d5
@ -3,19 +3,18 @@ CONFIG += no_docs_target
|
||||
|
||||
SUBDIRS = \
|
||||
corelib \
|
||||
dbus \
|
||||
embedded \
|
||||
gui \
|
||||
network \
|
||||
qpa \
|
||||
qtconcurrent \
|
||||
qtestlib \
|
||||
sql \
|
||||
touch \
|
||||
widgets \
|
||||
xml
|
||||
touch
|
||||
|
||||
qtHaveModule(gui):qtConfig(opengl): SUBDIRS += opengl
|
||||
qtHaveModule(dbus): SUBDIRS += dbus
|
||||
qtHaveModule(network): SUBDIRS += network
|
||||
qtHaveModule(testlib): SUBDIRS += qtestlib
|
||||
qtHaveModule(concurrent): SUBDIRS += qtconcurrent
|
||||
qtHaveModule(sql): SUBDIRS += sql
|
||||
qtHaveModule(widgets): SUBDIRS += widgets
|
||||
qtHaveModule(xml): SUBDIRS += xml
|
||||
qtHaveModule(gui): SUBDIRS += gui opengl
|
||||
|
||||
aggregate.files = aggregate/examples.pro
|
||||
aggregate.path = $$[QT_INSTALL_EXAMPLES]
|
||||
|
@ -8,7 +8,7 @@ SUBDIRS = books \
|
||||
relationaltablemodel \
|
||||
sqlwidgetmapper
|
||||
|
||||
!wince: SUBDIRS += masterdetail
|
||||
!wince:qtHaveModule(xml): SUBDIRS += masterdetail
|
||||
|
||||
!wince: SUBDIRS += \
|
||||
querymodel \
|
||||
|
@ -20,3 +20,4 @@ SUBDIRS = addressbook \
|
||||
stardelegate \
|
||||
storageview
|
||||
contains(DEFINES, QT_NO_DRAGANDDROP): SUBDIRS -= puzzle
|
||||
!qtHaveModule(xml): SUBDIRS -= simpledommodel
|
||||
|
@ -31,6 +31,8 @@ else:!qtConfig(process): SUBDIRS -= tools
|
||||
!qtHaveModule(concurrent): SUBDIRS -= concurrent
|
||||
!qtHaveModule(network): SUBDIRS -= network
|
||||
!qtHaveModule(dbus): SUBDIRS -= dbus
|
||||
!qtHaveModule(xml): SUBDIRS -= xml
|
||||
!qtHaveModule(sql): SUBDIRS -= sql
|
||||
|
||||
# Disable the QtDBus tests if we can't connect to the session bus
|
||||
!cross_compile:qtHaveModule(dbus) {
|
||||
|
@ -49,6 +49,11 @@ SUBDIRS=\
|
||||
qprocess \
|
||||
qtextstream
|
||||
|
||||
!qtHaveModule(concurrent): SUBDIRS -= \
|
||||
qdebug \
|
||||
qlockfile \
|
||||
qurl
|
||||
|
||||
!qtConfig(private_tests): SUBDIRS -= \
|
||||
qabstractfileengine \
|
||||
qfileinfo \
|
||||
|
@ -8,6 +8,10 @@ qtHaveModule(gui): SUBDIRS += \
|
||||
qidentityproxymodel \
|
||||
qitemselectionmodel \
|
||||
|
||||
qtHaveModule(widgets): SUBDIRS += \
|
||||
qitemmodel \
|
||||
qsortfilterproxymodel \
|
||||
qtHaveModule(widgets) {
|
||||
SUBDIRS += \
|
||||
qsortfilterproxymodel
|
||||
|
||||
qtHaveModule(sql): SUBDIRS += \
|
||||
qitemmodel
|
||||
}
|
||||
|
@ -1,3 +1,5 @@
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = qmimedatabase-xml
|
||||
unix:!mac:!qnx: SUBDIRS += qmimedatabase-cache
|
||||
qtHaveModule(concurrent) {
|
||||
SUBDIRS = qmimedatabase-xml
|
||||
unix:!darwin:!qnx: SUBDIRS += qmimedatabase-cache
|
||||
}
|
||||
|
@ -6,7 +6,6 @@ SUBDIRS=\
|
||||
qresultstore \
|
||||
qfuture \
|
||||
qfuturesynchronizer \
|
||||
qfuturewatcher \
|
||||
qmutex \
|
||||
qmutexlocker \
|
||||
qreadlocker \
|
||||
@ -18,3 +17,8 @@ SUBDIRS=\
|
||||
qthreadstorage \
|
||||
qwaitcondition \
|
||||
qwritelocker
|
||||
|
||||
qtHaveModule(concurrent) {
|
||||
SUBDIRS += \
|
||||
qfuturewatcher
|
||||
}
|
||||
|
@ -1,3 +1,3 @@
|
||||
TEMPLATE=subdirs
|
||||
qtHaveModule(network): SUBDIRS= \
|
||||
qtHaveModule(network):qtHaveModule(xml): SUBDIRS= \
|
||||
qxmlstream
|
||||
|
@ -34,3 +34,6 @@ SUBDIRS+=\
|
||||
qdbusabstractinterface \
|
||||
qdbusinterface \
|
||||
qdbusmarshall
|
||||
|
||||
!qtHaveModule(xml): SUBDIRS -= \
|
||||
qdbusxmlparser
|
||||
|
@ -35,3 +35,7 @@ win32:SUBDIRS -= qtextpiecetable
|
||||
qtextpiecetable \
|
||||
qzip \
|
||||
qtextodfwriter
|
||||
|
||||
!qtHaveModule(xml): SUBDIRS -= \
|
||||
qcssparser \
|
||||
qtextdocument
|
||||
|
@ -1,5 +1,7 @@
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += no_docs_target
|
||||
requires(qtHaveModule(testlib))
|
||||
|
||||
SUBDIRS = auto
|
||||
|
||||
# benchmarks in debug mode is rarely sensible
|
||||
|
Loading…
Reference in New Issue
Block a user