From 1e4673e8b0a88e017f66299208c688a6fd09cce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Thu, 30 Jun 2022 13:23:37 +0200 Subject: [PATCH] Compiler macros: remove accidental undefs I'm not sure why they're here, but they only undo the work from earlier. Spotted in the API review Amends 20104bb237d5231640649bcc610d4e51e03ea617. Pick-to: 6.4 Change-Id: Ifc0fa66a304f819c1f59ef8e4e498ab14f859ef8 Reviewed-by: Marc Mutz Reviewed-by: Thiago Macieira --- src/corelib/global/qcompilerdetection.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index c3b06110189..5370e258808 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -64,10 +64,6 @@ # define Q_DECL_IMPORT __declspec(dllimport) # define QT_MAKE_UNCHECKED_ARRAY_ITERATOR(x) stdext::make_unchecked_array_iterator(x) // Since _MSC_VER >= 1800 # define QT_MAKE_CHECKED_ARRAY_ITERATOR(x, N) stdext::make_checked_array_iterator(x, size_t(N)) // Since _MSC_VER >= 1500 -# undef Q_CC_MSVC_ONLY -# ifdef Q_CC_CLANG_ONLY -# undef Q_CC_CLANG_ONLY -# endif #elif defined(__BORLANDC__) || defined(__TURBOC__) # define Q_CC_BOR