From 1da25fe85a52ea864ab322f027000dd60369b832 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 28 Jun 2017 16:08:36 +0200 Subject: fix excessive execution of code meant for examples only 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 --- mkspecs/features/qt_example_installs.prf | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf index 9489d6c4f4..21f4e8b271 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf @@ -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) { -- cgit v1.2.3