From 3b1ead69d0466f42aee6a8df1ca71ada3e126275 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 22 Jul 2022 19:46:22 +0200 Subject: [PATCH] Drop Qt5: ClassView: Remove code below Qt 6.0.0 Change-Id: I067d37c7917eebf1d4d478be386dccf3474cd47f Reviewed-by: Reviewed-by: Christian Kandeler --- src/plugins/classview/classviewsymbolinformation.cpp | 4 ---- src/plugins/classview/classviewsymbollocation.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/plugins/classview/classviewsymbolinformation.cpp b/src/plugins/classview/classviewsymbolinformation.cpp index ec385d4a70d..fc11e0d0272 100644 --- a/src/plugins/classview/classviewsymbolinformation.cpp +++ b/src/plugins/classview/classviewsymbolinformation.cpp @@ -51,11 +51,7 @@ SymbolInformation::SymbolInformation() : SymbolInformation::SymbolInformation(const QString &valueName, const QString &valueType, int valueIconType) : m_iconType(valueIconType) -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) , m_hash(qHashMulti(0, valueIconType, valueName, valueType)) -#else - , m_hash(qHash(qMakePair(valueIconType, qMakePair(valueName, valueType)))) -#endif , m_name(valueName) , m_type(valueType) { diff --git a/src/plugins/classview/classviewsymbollocation.cpp b/src/plugins/classview/classviewsymbollocation.cpp index a371fc14ed9..ef0f6c3674e 100644 --- a/src/plugins/classview/classviewsymbollocation.cpp +++ b/src/plugins/classview/classviewsymbollocation.cpp @@ -49,11 +49,7 @@ SymbolLocation::SymbolLocation(const QString &file, int lineNumber, int columnNu : m_fileName(file) , m_line(lineNumber) , m_column(qMax(columnNumber, 0)) -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) , m_hash(qHashMulti(0, m_fileName, m_line, m_column)) -#else - , m_hash(qHash(qMakePair(m_fileName, qMakePair(m_line, m_column)))) -#endif { }