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

fix excessive execution of code meant for examples only

Browse Source 
qt_example_installs.prf is loaded by every sub-project inside the qt
tree, as qt_build_config adds it.

Change-Id: Ice7e81b280b6964ed5cc1b9f1501bf74df737d7e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2017-06-28 16:08:36 +02:00 committed by Simon Hausmann
parent 1480066592
commit 1da25fe85a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mkspecs/features/qt_example_installs.prf
View File

@ -9,11 +9,6 @@
# We mean it.
#
contains(TEMPLATE, .*app): \
qtSetQmlPath()
contains(TEMPLATE, "vc.*"): return()
defineTest(addInstallFiles) {
for(sf, 2) {
sf = $$relative_path($$sf, $$_PRO_FILE_PWD_)
@ -34,6 +29,12 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples)
isEmpty(probase)|contains(probase, ^\\..*)|isEmpty(_QMAKE_CACHE_): \
return()
contains(TEMPLATE, "vc.*"): \
return()
contains(TEMPLATE, .*app): \
qtSetQmlPath()
for(ex, EXAMPLE_FILES): \
sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_))
for(res, RESOURCES) {