From 1b4766e26c6bd522ec49237075669ac025c47b20 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 7 Jun 2019 15:47:25 +0200 Subject: [PATCH] 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 --- qtcreator.pri | 1 + src/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qtcreator.pri b/qtcreator.pri index 9ed1bf1c8f0..9a61746ddbe 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -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 \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cf807a680e2..419c29cce7f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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