Unify "variant" and "var" properties in QML

variant and var properties differ in two important ways:
- variant properties trigger "magic" string conversions:
  variant v1: "red" // contains a QColor
  var     v2: "red" // contains a string
- variant properties behave differently for value types: they create
  copies, instead of references.

However, as variant properties were marked as obsolete and this
behavior was effetively undocumented, it should be safe to give "variant"
"var semantics".

With this change, we can also avoid doing magic conversions when storing
data in QVariant properties of QObjects/QGadgets

Change-Id: I549b1beb98e6af9639c1ee81f316bda513d5ff65
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 0 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlstringconverters_p.h b/src/qml/qml/qqmlstringconverters_p.h
index 215f0c0aaf..d64eb714fd 100644
--- a/src/qml/qml/qqmlstringconverters_p.h
+++ b/src/qml/qml/qqmlstringconverters_p.h
@@ -66,7 +66,6 @@ class QByteArray;
 
 namespace QQmlStringConverters
 {
-    Q_QML_PRIVATE_EXPORT QVariant variantFromString(const QString &);
     Q_QML_PRIVATE_EXPORT QVariant variantFromString(const QString &, int preferredType, bool *ok = nullptr);
 
     Q_QML_PRIVATE_EXPORT QVariant colorFromString(const QString &, bool *ok = nullptr);