diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:44:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-05-07 11:58:30 +0200 |
| commit | c2b553784dfbe0ece90f79709639e27e74359a7d (patch) | |
| tree | 04b0c74c7417a5f1b628d0b18a07f9dd8be1df60 /qmake | |
| parent | 0b373c2e36a68aedf3731fcb3cd84fd010c2d67c (diff) | |
| parent | 8ea0a82a6a771dd76df2d51c6ef3ed966a5b9b45 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qvariant.h
src/corelib/tools/qlist.h
Done-With: Milian Wolff <milian.wolff@kdab.com>
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: I6803f7239aa137a51a7467fab7cc7a01302a848d
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index ffd68adb7b..3119a440d4 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -4567,7 +4567,10 @@ \c QMAKEFEATURES environment variable) \li \c $$QMAKEFEATURES/myfeatures.prf (for each directory listed in the \c QMAKEFEATURES property variable) - \li \c myfeatures.prf (in the project's root directory) + \li \c myfeatures.prf (in the project's root directory). The project root + is determined by the top-level \c{.pro} file. However, if you place the + \c{.qmake.cache} file in a sub-directory or the directory of a + sub-project, then the project root becomes the sub-directory itself. \li \c $QMAKEPATH/mkspecs/features/unix/myfeatures.prf and \c $QMAKEPATH/mkspecs/features/myfeatures.prf (for each directory listed in the \c QMAKEPATH environment variable) |