summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-02-19 17:41:52 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-20 15:22:55 +0100
commit218179ce2febc54d0fbcee388c810b592a4820cd (patch)
treeaca01087f792edb4b24e3f78f2ccb9a74305660c
parent04441152117d5be78b87034421445c1f509f71fb (diff)
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 <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--mkspecs/features/qt_example_installs.prf4
1 files 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 =