summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-30 17:42:45 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-03 15:56:28 +0100
commitd902b3a4813804c045ec0d0929e6ec3a0d1c63c1 (patch)
treeb081bb478dd13a81e24056a90e93f5164ddc386a
parent25aa803af7446bb3ac6db28209bf7b2138f08715 (diff)
don't auto-install example sources by default for all modules
turns out that some modules need a lot of work, so make it opt-in for the time being. Change-Id: I16365e3d96adab98a1bc748907dbd67488dfad5f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
-rw-r--r--.qmake.conf1
-rw-r--r--mkspecs/features/qt_build_config.prf1
2 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e45fb..5de255cb69 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,2 @@
load(qt_build_config)
+CONFIG += qt_example_installs
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
index e9d5367ee1..29dd354a31 100644
--- a/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@ -29,7 +29,6 @@ CONFIG += \
create_prl link_prl \
testcase_targets \
prepare_docs qt_docs_targets \
- qt_example_installs \
no_private_qt_headers_warning QTDIR_build \
# Qt modules get compiled without exceptions enabled by default.
# However, testcases should be still built with exceptions.