From 218179ce2febc54d0fbcee388c810b592a4820cd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 19 Feb 2013 17:41:52 +0100 Subject: [PATCH] don't suppress building examples in non-prefix builds these have no (useful) install target, so it makes no sense to reduce the "build" to installing sources. suppressing the actual build can be achieved with -nomake examples instead. conversely, as the build dir is the install dir, people actually need to be able to (selectively) build examples in there. Task-number: QTBUG-29756 Change-Id: I98f34235442b552e51c0d5f5cec96a3eab4f1e7f Reviewed-by: Andy Shaw Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_example_installs.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf index ccb19fcbd4..04d7a17ab9 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf @@ -93,8 +93,8 @@ probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") } - # Do not actually build the examples in production builds - !equals(TEMPLATE, subdirs):!contains(QT_CONFIG, private_tests) { + # Do not actually build the examples in production builds with -prefix + !equals(TEMPLATE, subdirs):prefix_build:!contains(QT_CONFIG, private_tests) { TEMPLATE = aux CONFIG -= have_target qt staticlib dll SOURCES =