diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-14 11:56:56 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-14 13:45:18 +0200 |
| commit | b1a216649ec064412160638dd00195cd47c567aa (patch) | |
| tree | a4134415a3849cfb857942e698514be9da18924f /mkspecs/features/qt_build_config.prf | |
| parent | 2e20ae3c1b57169497f6f3904623be4f5e617e12 (diff) | |
| parent | 1632786f00875d23c7d111cbb29dedaa35c1c8c2 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
qmake/generators/makefile.cpp
qmake/generators/unix/unixmake2.cpp
src/corelib/thread/qthread_unix.cpp
tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408
Diffstat (limited to 'mkspecs/features/qt_build_config.prf')
| -rw-r--r-- | mkspecs/features/qt_build_config.prf | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index 0c6c10dded..8a7c9c28d3 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -37,8 +37,10 @@ intel_icl { QMAKE_DIR_REPLACE_SANE = PRECOMPILED_DIR OBJECTS_DIR MOC_DIR RCC_DIR UI_DIR +load(qt_prefix_build_check) + # force_independent can be set externally. prefix_build not. -!exists($$[QT_HOST_DATA]/.qmake.cache): \ +qtIsPrefixBuild($$[QT_HOST_DATA]): \ CONFIG += prefix_build force_independent !build_pass:!isEmpty(_QMAKE_SUPER_CACHE_):force_independent { |