Enforce QT_NO_JAVA_STYLE_ITERATORS

We don't use them and Qt is likely to deprecate them.

Change-Id: Ib2fbb3f509081f5eb7aae6c41dd330cc57db59e1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-06-07 15:47:25 +02:00
parent 66c2be6715
commit 1b4766e26c
2 changed files with 4 additions and 1 deletions

View File

@@ -209,6 +209,7 @@ exists($$IDE_LIBRARY_PATH): LIBS *= -L$$IDE_LIBRARY_PATH # library path from ou
DEFINES += \
QT_CREATOR \
QT_NO_JAVA_STYLE_ITERATORS \
QT_NO_CAST_TO_ASCII \
QT_RESTRICTED_CAST_FROM_ASCII \
QT_DISABLE_DEPRECATED_BEFORE=0x050900 \

View File

@@ -1,6 +1,8 @@
# Not in the main CMakeLists.txt file because some tests fail if we have the flags set as default
list(APPEND DEFAULT_DEFINES
QT_CREATOR QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII
QT_CREATOR
QT_NO_JAVA_STYLE_ITERATORS
QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII
QT_DISABLE_DEPRECATED_BEFORE=0x050900
QT_USE_FAST_OPERATOR_PLUS
QT_USE_FAST_CONCATENATION