install a sane top-level examples.pro file
generally, don't install anything from the top-level examples dirs automatically. the global README and the aggregator examples.pro are installed explicitly. Change-Id: I5f6b8760f37d917b800fa85979896a471778cac0 Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
e0d72efbe7
commit
b8d0bde59c
6
examples/aggregate/examples.pro
Normal file
6
examples/aggregate/examples.pro
Normal file
@ -0,0 +1,6 @@
|
||||
TEMPLATE = subdirs
|
||||
|
||||
sd = $$files(*)
|
||||
for(d, sd): \
|
||||
exists($$d/$${d}.pro): \
|
||||
SUBDIRS += $$d
|
@ -25,3 +25,9 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, no-widgets):SUBDIRS += opengl
|
||||
contains(QT_CONFIG, dbus): SUBDIRS += dbus
|
||||
contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent
|
||||
contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= linguist
|
||||
|
||||
aggregate.files = aggregate/examples.pro
|
||||
aggregate.path = $$[QT_INSTALL_EXAMPLES]
|
||||
readme.files = README
|
||||
readme.path = $$[QT_INSTALL_EXAMPLES]
|
||||
INSTALLS += aggregate readme
|
||||
|
@ -1,5 +1,5 @@
|
||||
probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
|
||||
!contains(probase, ^\\..*) {
|
||||
!isEmpty(probase):!contains(probase, ^\\..*) {
|
||||
for(ex, EXAMPLE_FILES): \
|
||||
sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_))
|
||||
for(res, RESOURCES) {
|
||||
|
Loading…
Reference in New Issue
Block a user