AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push feature conditionals down to subdirectories

Browse Source 
the top-level project is not installed, and the meta-project which is
used instead does not know anything about conditionals.

Task-number: QTBUG-28414
Change-Id: Id5785ab5f92373ece74699e3c28220fc7f9689ac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2012-12-21 14:14:40 +01:00 committed by The Qt Project
parent b644ed510a
commit 6c9e2219ac
12 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/dbus/dbus.pro
View File

@ -1,3 +1,5 @@
requires(qtHaveModule(dbus))
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = listnames \ SUBDIRS = listnames \
pingpong \ pingpong \

2
examples/embedded/embedded.pro
View File

@ -1,3 +1,5 @@
requires(if(wince|embedded|x11):qtHaveModule(gui))
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = styleexample raycasting flickable digiflip SUBDIRS = styleexample raycasting flickable digiflip

27
examples/examples.pro
View File

@ -2,27 +2,22 @@ TEMPLATE = subdirs
CONFIG += no_docs_target CONFIG += no_docs_target
SUBDIRS = \ SUBDIRS = \
dbus \
embedded \
gestures \
gui \ gui \
network \
threads \
xml \
qpa
qtHaveModule(widgets) {
SUBDIRS += widgets \
ipc \ ipc \
network \
opengl \
qpa \
qtconcurrent \
qtestlib \
sql \ sql \
threads \
tools \ tools \
touch \ touch \
gestures widgets \
} xml
wince*|embedded|x11:qtHaveModule(gui): SUBDIRS += embedded
contains(QT_BUILD_PARTS, tools):qtHaveModule(gui):qtHaveModule(widgets): SUBDIRS += qtestlib
qtHaveModule(opengl):qtHaveModule(widgets): SUBDIRS += opengl
qtHaveModule(dbus): SUBDIRS += dbus
qtHaveModule(concurrent): SUBDIRS += qtconcurrent
aggregate.files = aggregate/examples.pro aggregate.files = aggregate/examples.pro
aggregate.path = $$[QT_INSTALL_EXAMPLES] aggregate.path = $$[QT_INSTALL_EXAMPLES]

2
examples/gestures/gestures.pro
View File

@ -1,3 +1,5 @@
requires(qtHaveModule(widgets))
TEMPLATE = \ TEMPLATE = \
subdirs subdirs
SUBDIRS = \ SUBDIRS = \

2
examples/ipc/ipc.pro
View File

@ -1,3 +1,5 @@
requires(qtHaveModule(widgets))
TEMPLATE = subdirs TEMPLATE = subdirs
# no QSharedMemory # no QSharedMemory
!vxworks:!qnx:SUBDIRS = sharedmemory !vxworks:!qnx:SUBDIRS = sharedmemory

2
examples/opengl/opengl.pro
View File

@ -1,3 +1,5 @@
requires(qtHaveModule(opengl))
TEMPLATE = subdirs TEMPLATE = subdirs
contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){

2
examples/qtconcurrent/qtconcurrent.pro
View File

@ -1,3 +1,5 @@
requires(qtHaveModule(concurrent))
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = imagescaling \ SUBDIRS = imagescaling \
map \ map \

2
examples/qtestlib/qtestlib.pro
View File

@ -1,2 +1,4 @@
requires(contains(QT_BUILD_PARTS,tools):qtHaveModule(widgets))
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5 SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5

3
examples/sql/sql.pro
View File

@ -1,3 +1,5 @@
requires(qtHaveModule(widgets))
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = books \ SUBDIRS = books \
@ -19,4 +21,3 @@ SUBDIRS = books \
} }
EXAMPLE_FILES = connection.h EXAMPLE_FILES = connection.h

2
examples/tools/tools.pro
View File

@ -1,3 +1,5 @@
requires(qtHaveModule(widgets))
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered CONFIG += ordered
SUBDIRS = contiguouscache \ SUBDIRS = contiguouscache \

2
examples/touch/touch.pro
View File

@ -1,2 +1,4 @@
requires(qtHaveModule(widgets))
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = pinchzoom fingerpaint knobs dials SUBDIRS = pinchzoom fingerpaint knobs dials

2
examples/widgets/widgets.pro
View File

@ -1,3 +1,5 @@
requires(qtHaveModule(widgets))
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += no_docs_target CONFIG += no_docs_target