diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-09-23 18:46:04 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-12 15:16:37 +0000 |
| commit | d8cfa6a144e7c592c7b9d77f01bbcd3f57617b33 (patch) | |
| tree | 9d6c9cc9632f035204c4e18f356e41be104db3ac | |
| parent | 20c7ab44c6821e3ecc10008e005b52b465ac78e4 (diff) | |
disable install targets for non-prefix builds
one reason to do that is some users' persistence in destroying their
non-prefix builds by trying an installation.
another reason is the fact that qt.pro's relative_qt_rpath is triggered
by the presence of an install rule for the target, which is of course
not helpful when the install dir is bogus.
Task-number: QTBUG-48406
Change-Id: I75f3940be79fcb5b86e34b975b789692423c92cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/qt_build_config.prf | 6 | ||||
| -rw-r--r-- | mkspecs/features/qt_clear_installs.prf | 12 |
2 files changed, 18 insertions, 0 deletions
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index eaf23cf63a..518fd93f04 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -52,6 +52,12 @@ QMAKE_DIR_REPLACE_SANE = PRECOMPILED_DIR OBJECTS_DIR MOC_DIR RCC_DIR UI_DIR unset(modpath) } +# Don't actually try to install anything in non-prefix builds. +# This is much easier and safer than making every single INSTALLS +# assignment conditional. +!prefix_build: \ + CONFIG += qt_clear_installs + cross_compile: \ CONFIG += force_bootstrap diff --git a/mkspecs/features/qt_clear_installs.prf b/mkspecs/features/qt_clear_installs.prf new file mode 100644 index 0000000000..66d12f9d6d --- /dev/null +++ b/mkspecs/features/qt_clear_installs.prf @@ -0,0 +1,12 @@ +# +# W A R N I N G +# ------------- +# +# This file is not part of the Qt API. It exists purely as an +# implementation detail. It may change from version to version +# without notice, or even be removed. +# +# We mean it. +# + +INSTALLS = |