diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-12 14:41:55 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2019-08-07 20:09:10 +0000 |
| commit | 213f7d1b1f89a55cc10fb8355cac87927d038f00 (patch) | |
| tree | 266cfef24258e993bf4460b9e65233db8221cd0f /mkspecs | |
| parent | 1563c38a4b46ad427907b544508e888efbac9772 (diff) | |
Require opt-out for using QLinkedList
Now that all QLinkedList uses are removed from Qt, make sure
QT_NO_LINKED_LIST is set by default for Qt modules, so new
modules don't need to explicitly specify it in their
.qmake.conf.
Modules can still opt out of the QLinkedList ban by adding
DEFINES -= QT_NO_LINKED_LIST
to their .qmake.conf.
Change-Id: I34b7ab1c009795649bb7b4f1e7493556eafadd5a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_build_config.prf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index 8a7c9c28d3..745b09a885 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -108,6 +108,10 @@ macos: CONFIG += testcase_no_bundle # Override MinGW's definition in _mingw.h mingw: DEFINES += WINVER=0x0601 _WIN32_WINNT=0x0601 +# By default, the following features should not be used in Qt's own +# implementation, so declare them invisible to Qt modules. +DEFINES += QT_NO_LINKED_LIST # QLinkedList + defineTest(qtBuildPart) { bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS) isEmpty(bp): bp = $$QT_BUILD_PARTS |