From 1f3ff8fb7774053ad27d470a7869a9abb5b1f1e4 Mon Sep 17 00:00:00 2001 From: Halla Rempt Date: Thu, 1 Aug 2024 13:41:42 +0200 Subject: [PATCH] Remove QT_NO_FOREACH and -DQT_NO_CAST_FROM_ASCII We have way too many QString s = QString("asdadas"); to port all of that to QStringLiteral or QString::fromUtf8, and way to many Q_FOREACH instances to port all of that to something probably works in a slightly different way. Both are now default in Qt6... --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52ba1fc11e0..9795ba78aaf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -598,6 +598,12 @@ add_definitions( -DQT_USE_FAST_OPERATOR_PLUS ) +remove_definitions( + -DQT_NO_CAST_FROM_ASCII + -DQT_NO_FOREACH +) + + # MSVC is unable to disambiguate between definitions of QVector # and QPolygonF. This is a known upstream bug e.g.: # - https://phabricator.kde.org/D21314