diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-24 12:57:28 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-26 20:05:41 +0100 |
| commit | 032c536644644e535584fff57ac7e115956e3e44 (patch) | |
| tree | 7f029c45b54d6ae42a545247d8906768e9160dd0 /src/widgets/widgets/qmenu.cpp | |
| parent | 6269438af95bbd988ead08829fa3bc9dc25891e8 (diff) | |
qmake: Sync back changes from qttools
Copy back changes to qmake internals that were done in qttools.
This makes it easier to keep the qmakelib copies in sync.
The code guarded by PROEVALUATOR_CUMULATIVE is not used by qmake itself,
but only by lupdate and Qt Creator. It seems to be sensible to have the
same behavior with regards to feature file evaluation in both
projects. It was originally introduced in qttools for QTBUG-62478.
The change regarding QT_BOOTSTRAPPED is safe, because the 'process'
feature is available and off in the boostrapped case.
Change-Id: I030ca8b093c017040a9ff9f4bb09a7cca4aa8964
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenu.cpp')
0 files changed, 0 insertions, 0 deletions