From c894566af7d410fccc16aab853bbf0cc50c45ae0 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 21 Jan 2021 15:17:11 +0100
Subject: Export QML and Quick value types

They need to be accessible from C++.

Change-Id: I60f2213bdbe6b8b64856e13f1e0cc798f8a51086
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
---
 src/qml/qml/qqmlvaluetype_p.h       | 16 ++++++++--------
 src/quick/util/qquickvaluetypes_p.h | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index d2c49c9387..26bc14ee67 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -125,7 +125,7 @@ public:
     static const QMetaObject *metaObjectForMetaType(QMetaType type);
 };
 
-struct QQmlPointFValueType
+struct Q_QML_PRIVATE_EXPORT QQmlPointFValueType
 {
     QPointF v;
     Q_PROPERTY(qreal x READ x WRITE setX FINAL)
@@ -144,7 +144,7 @@ public:
     void setY(qreal);
 };
 
-struct QQmlPointValueType
+struct Q_QML_PRIVATE_EXPORT QQmlPointValueType
 {
     QPoint v;
     Q_PROPERTY(int x READ x WRITE setX FINAL)
@@ -162,7 +162,7 @@ public:
     void setY(int);
 };
 
-struct QQmlSizeFValueType
+struct Q_QML_PRIVATE_EXPORT QQmlSizeFValueType
 {
     QSizeF v;
     Q_PROPERTY(qreal width READ width WRITE setWidth FINAL)
@@ -181,7 +181,7 @@ public:
     void setHeight(qreal);
 };
 
-struct QQmlSizeValueType
+struct Q_QML_PRIVATE_EXPORT QQmlSizeValueType
 {
     QSize v;
     Q_PROPERTY(int width READ width WRITE setWidth FINAL)
@@ -199,7 +199,7 @@ public:
     void setHeight(int);
 };
 
-struct QQmlRectFValueType
+struct Q_QML_PRIVATE_EXPORT QQmlRectFValueType
 {
     QRectF v;
     Q_PROPERTY(qreal x READ x WRITE setX FINAL)
@@ -234,7 +234,7 @@ public:
     qreal bottom() const;
 };
 
-struct QQmlRectValueType
+struct Q_QML_PRIVATE_EXPORT QQmlRectValueType
 {
     QRect v;
     Q_PROPERTY(int x READ x WRITE setX FINAL)
@@ -306,7 +306,7 @@ enum Type {
 Q_ENUM_NS(Type)
 };
 
-struct QQmlEasingValueType
+struct Q_QML_PRIVATE_EXPORT QQmlEasingValueType
 {
     QEasingCurve v;
     Q_GADGET
@@ -334,7 +334,7 @@ public:
 };
 #endif
 
-struct QQmlPropertyValueType
+struct Q_QML_PRIVATE_EXPORT QQmlPropertyValueType
 {
     QQmlProperty v;
     Q_PROPERTY(QObject *object READ object CONSTANT FINAL)
diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h
index f9b66586e0..559ade00ea 100644
--- a/src/quick/util/qquickvaluetypes_p.h
+++ b/src/quick/util/qquickvaluetypes_p.h
@@ -52,7 +52,7 @@
 //
 
 #include <qqml.h>
-#include <qtquickglobal.h>
+#include <private/qtquickglobal_p.h>
 #include <private/qqmlvaluetype_p.h>
 
 #include <QtGui/QColor>
@@ -66,7 +66,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickColorValueType
+class Q_QUICK_PRIVATE_EXPORT QQuickColorValueType
 {
     QColor v;
     Q_PROPERTY(qreal r READ r WRITE setR FINAL)
@@ -119,7 +119,7 @@ public:
     void setHslLightness(qreal);
 };
 
-class QQuickVector2DValueType
+class Q_QUICK_PRIVATE_EXPORT QQuickVector2DValueType
 {
     QVector2D v;
     Q_PROPERTY(qreal x READ x WRITE setX FINAL)
@@ -153,7 +153,7 @@ public:
     Q_INVOKABLE bool fuzzyEquals(const QVector2D &vec) const;
 };
 
-class QQuickVector3DValueType
+class Q_QUICK_PRIVATE_EXPORT QQuickVector3DValueType
 {
     QVector3D v;
     Q_PROPERTY(qreal x READ x WRITE setX FINAL)
@@ -192,7 +192,7 @@ public:
     Q_INVOKABLE bool fuzzyEquals(const QVector3D &vec) const;
 };
 
-class QQuickVector4DValueType
+class Q_QUICK_PRIVATE_EXPORT QQuickVector4DValueType
 {
     QVector4D v;
     Q_PROPERTY(qreal x READ x WRITE setX FINAL)
@@ -233,7 +233,7 @@ public:
     Q_INVOKABLE bool fuzzyEquals(const QVector4D &vec) const;
 };
 
-class QQuickQuaternionValueType
+class Q_QUICK_PRIVATE_EXPORT QQuickQuaternionValueType
 {
     QQuaternion v;
     Q_PROPERTY(qreal scalar READ scalar WRITE setScalar)
@@ -261,7 +261,7 @@ public:
     void setZ(qreal);
 };
 
-class QQuickMatrix4x4ValueType
+class Q_QUICK_PRIVATE_EXPORT QQuickMatrix4x4ValueType
 {
     QMatrix4x4 v;
     Q_PROPERTY(qreal m11 READ m11 WRITE setM11 FINAL)
@@ -381,7 +381,7 @@ enum HintingPreference {
 Q_ENUM_NS(HintingPreference)
 };
 
-class QQuickFontValueType
+class Q_QUICK_PRIVATE_EXPORT QQuickFontValueType
 {
     QFont v;
     Q_GADGET
@@ -497,7 +497,7 @@ enum class TransferFunction {
 Q_ENUM_NS(TransferFunction)
 }
 
-class QQuickColorSpaceValueType
+class Q_QUICK_PRIVATE_EXPORT QQuickColorSpaceValueType
 {
     QColorSpace v;
     Q_GADGET
-- 
cgit v1.2.3