From 3898c022a647b1c742042e586963e193da546c1e Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 16 Jun 2020 11:15:30 +0200
Subject: [PATCH] Remove some dead code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I4e3906d5e6313014b207aa7bc63a0ff5e21b0261
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/corelib/kernel/qvariant.cpp | 16 --------------
 src/corelib/kernel/qvariant.h   | 38 +++------------------------------
 2 files changed, 3 insertions(+), 51 deletions(-)

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 97c1e584ac..5b397f5198 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -1828,14 +1828,6 @@ QVariant::QVariant(QDataStream &s)
     QT_NO_CAST_FROM_ASCII when you compile your applications.
 */
 
-#ifndef QT_NO_CAST_FROM_ASCII
-QVariant::QVariant(const char *val)
-{
-    QString s = QString::fromUtf8(val);
-    create(String, &s);
-}
-#endif
-
 /*!
   \fn QVariant::QVariant(const QStringList &val)
 
@@ -4305,11 +4297,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p)
 /*!
     \internal
 */
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-QSequentialIterable::QSequentialIterable(QtMetaTypePrivate::QSequentialIterableImpl impl)
-#else
 QSequentialIterable::QSequentialIterable(const QtMetaTypePrivate::QSequentialIterableImpl &impl)
-#endif
   : m_impl(impl)
 {
 }
@@ -4624,11 +4612,7 @@ QSequentialIterable::const_iterator QSequentialIterable::const_iterator::operato
 /*!
     \internal
 */
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-QAssociativeIterable::QAssociativeIterable(QtMetaTypePrivate::QAssociativeIterableImpl impl)
-#else
 QAssociativeIterable::QAssociativeIterable(const QtMetaTypePrivate::QAssociativeIterableImpl &impl)
-#endif
   : m_impl(impl)
 {
 }
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h
index 2f21ef418f..a80321b7d4 100644
--- a/src/corelib/kernel/qvariant.h
+++ b/src/corelib/kernel/qvariant.h
@@ -224,7 +224,9 @@ class Q_CORE_EXPORT QVariant
     QVariant(double d);
     QVariant(float f);
 #ifndef QT_NO_CAST_FROM_ASCII
-    QT_ASCII_CAST_WARN QVariant(const char *str);
+    QT_ASCII_CAST_WARN QVariant(const char *str)
+        : QVariant(QString::fromUtf8(str))
+    {}
 #endif
 
     QVariant(const QByteArray &bytearray);
@@ -512,22 +514,6 @@ public:
     inline const DataPtr &data_ptr() const { return d; }
 };
 
-#if QT_DEPRECATED_SINCE(5, 14)
-template <typename T>
-QT_DEPRECATED_X("Use QVariant::fromValue() instead.")
-inline QVariant qVariantFromValue(const T &t)
-{
-    return QVariant::fromValue(t);
-}
-
-template <typename T>
-QT_DEPRECATED_X("Use QVariant::setValue() instead.")
-inline void qVariantSetValue(QVariant &v, const T &t)
-{
-    v.setValue(t);
-}
-#endif
-
 template<>
 inline QVariant QVariant::fromValue(const QVariant &value)
 {
@@ -645,11 +631,7 @@ public:
 
     friend struct const_iterator;
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    explicit QSequentialIterable(QtMetaTypePrivate::QSequentialIterableImpl impl);
-#else
     explicit QSequentialIterable(const QtMetaTypePrivate::QSequentialIterableImpl &impl);
-#endif
 
     const_iterator begin() const;
     const_iterator end() const;
@@ -703,11 +685,7 @@ public:
 
     friend struct const_iterator;
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    explicit QAssociativeIterable(QtMetaTypePrivate::QAssociativeIterableImpl impl);
-#else
     explicit QAssociativeIterable(const QtMetaTypePrivate::QAssociativeIterableImpl &impl);
-#endif
 
     const_iterator begin() const;
     const_iterator end() const;
@@ -872,16 +850,6 @@ template<> inline QVariant qvariant_cast<QVariant>(const QVariant &v)
     return v;
 }
 
-#if QT_DEPRECATED_SINCE(5, 0)
-template<typename T>
-inline QT_DEPRECATED T qVariantValue(const QVariant &variant)
-{ return qvariant_cast<T>(variant); }
-
-template<typename T>
-inline QT_DEPRECATED bool qVariantCanConvert(const QVariant &variant)
-{ return variant.template canConvert<T>(); }
-#endif
-
 #endif
 
 #ifndef QT_NO_DEBUG_STREAM