From 90210c8d28a90295ebbf37ef45b69924ed7f42d0 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 7 May 2020 09:30:16 +0200 Subject: Remove dead code from src/widgets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Code that's removed via QT_VERSION(6, 0, 0) check is already no longer compiled. Change-Id: I70865f330a6260ac2e9cf2770d599a5b6f7bb7d4 Reviewed-by: Jan Arve Sæther --- src/widgets/styles/qstyle.cpp | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'src/widgets/styles/qstyle.cpp') diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index e659ef5fcc..a4fe0365f9 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -2393,25 +2393,6 @@ int QStyle::combinedLayoutSpacing(QSizePolicy::ControlTypes controls1, return result; } -// ### Qt 6: Remove in favor of template QDebug operator<<(QDebug, const QFlags &). -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) -QT_BEGIN_INCLUDE_NAMESPACE -# include -QT_END_INCLUDE_NAMESPACE - -# if !defined(QT_NO_DEBUG_STREAM) -QDebug operator<<(QDebug debug, QStyle::State state) -{ -# if !defined(QT_NO_DEBUG) - return operator<< (debug, state); -# else - Q_UNUSED(state); - return debug; -# endif -} -# endif // !QT_NO_DEBUG_STREAM -#endif // QT_VERSION < QT_VERSION_CHECK(6,0,0) - /*! \since 4.6 -- cgit v1.2.3