From c3e25c61d2992d8b41603d5595641c4f5247efe1 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 31 Jul 2024 09:37:52 +0200 Subject: [PATCH] Remove dead code in qtestcase.cpp for Qt 6 This is a clean-up after a previous commit that needed the version check for cherry-picking to 5.15. Pick-to: 6.7 6.5 6.2 Change-Id: I914ca6ec184e2d7c376de4c7de6f2f0f7e9ecb22 Reviewed-by: Volker Hilsheimer (cherry picked from commit 4dd730f99fc95ad1e4c231dda70957b6c01df1b0) Reviewed-by: Qt Cherry-pick Bot --- src/testlib/qtestcase.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 97fa996ed52..92358ab8c1c 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -3005,13 +3005,8 @@ TO_STRING_IMPL(int, %d) TO_STRING_IMPL(uint, %u) TO_STRING_IMPL(long, %ld) TO_STRING_IMPL(ulong, %lu) -#if defined(Q_OS_WIN) && !defined(Q_CC_GNU) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -TO_STRING_IMPL(qint64, %I64d) -TO_STRING_IMPL(quint64, %I64u) -#else TO_STRING_IMPL(qint64, %lld) TO_STRING_IMPL(quint64, %llu) -#endif TO_STRING_IMPL(bool, %d) TO_STRING_IMPL(signed char, %hhd) TO_STRING_IMPL(unsigned char, %hhu)