diff options
| -rw-r--r-- | .qmake.conf | 1 | ||||
| -rw-r--r-- | mkspecs/features/qt_build_config.prf | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0bfd71facc..5c64c10981 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,7 +2,6 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_JAVA_STYLE_ITERATORS -DEFINES += QT_NO_LINKED_LIST QT_SOURCE_TREE = $$PWD QT_BUILD_TREE = $$shadowed($$PWD) 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 |