1 files changed, 13 insertions, 13 deletions
diff --git a/src/quick/items/qquicktext_p.h b/src/quick/items/qquicktext_p.h
index e1d786d098..ed474b29c0 100644
--- a/src/quick/items/qquicktext_p.h
+++ b/src/quick/items/qquicktext_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickTextPrivate;
 class QQuickTextLine;
-class Q_QUICK_PRIVATE_EXPORT QQuickText : public QQuickImplicitSizeItem, public QQuickTextInterface
+class Q_QUICK_EXPORT QQuickText : public QQuickImplicitSizeItem, public QQuickTextInterface
 {
     Q_OBJECT
     Q_INTERFACES(QQuickTextInterface)
@@ -109,7 +109,8 @@ public:
     Q_ENUM(WrapMode)
 
     enum RenderType { QtRendering,
-                      NativeRendering
+                      NativeRendering,
+                      CurveRendering
                     };
     Q_ENUM(RenderType)
 
@@ -300,6 +301,8 @@ protected:
 private Q_SLOTS:
     void q_updateLayout();
     void triggerPreprocess();
+    Q_REVISION(6, 7) QVariant loadResource(int type, const QUrl &source);
+    void resourceRequestFinished();
     void imageDownloadFinished();
 
 private:
@@ -310,16 +313,16 @@ private:
 Q_DECLARE_MIXED_ENUM_OPERATORS_SYMMETRIC(int, QQuickText::HAlignment, QQuickText::VAlignment)
 
 class QTextLine;
-class QQuickTextLine : public QObject
+class Q_QUICK_EXPORT QQuickTextLine : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(int number READ number)
-    Q_PROPERTY(qreal width READ width WRITE setWidth)
-    Q_PROPERTY(qreal height READ height WRITE setHeight)
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal implicitWidth READ implicitWidth REVISION(2, 15))
-    Q_PROPERTY(bool isLast READ isLast REVISION(2, 15))
+    Q_PROPERTY(int number READ number FINAL)
+    Q_PROPERTY(qreal width READ width WRITE setWidth FINAL)
+    Q_PROPERTY(qreal height READ height WRITE setHeight FINAL)
+    Q_PROPERTY(qreal x READ x WRITE setX FINAL)
+    Q_PROPERTY(qreal y READ y WRITE setY FINAL)
+    Q_PROPERTY(qreal implicitWidth READ implicitWidth REVISION(2, 15) FINAL)
+    Q_PROPERTY(bool isLast READ isLast REVISION(2, 15) FINAL)
     QML_ANONYMOUS
     QML_ADDED_IN_VERSION(2, 0)
 
@@ -354,7 +357,4 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickText)
-QML_DECLARE_TYPE(QQuickTextLine)
-
 #endif // QQUICKTEXT_P_H