diff options
-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 = |