diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2016-06-24 11:09:36 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2016-06-28 11:05:04 +0000 |
commit | fda948b9932d801759cd7b585ef02de8db94c7f2 (patch) | |
tree | a608923911826805813b57007f70dc839b9db712 /src | |
parent | da650dd913939042973804a7cd8c02b1fb18b66c (diff) |
Privately export QObjects included by QQuickPathView and QQuickListView
The Tumbler in Qt Quick Controls 2 needs this.
The first part of this was already done with 3da510a2, but it turns out
that all Q_OBJECTS in headers included from other modules must also be
exported.
Change-Id: Ic9ec19cfd944b85213471fc0983afb0d121a3638
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/items/qquicklistview_p.h | 4 | ||||
-rw-r--r-- | src/quick/util/qquickpath_p.h | 23 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/quick/items/qquicklistview_p.h b/src/quick/items/qquicklistview_p.h index 7e86a47433..5a5e8a55fe 100644 --- a/src/quick/items/qquicklistview_p.h +++ b/src/quick/items/qquicklistview_p.h @@ -53,11 +53,13 @@ #include "qquickitemview_p.h" +#include <private/qtquickglobal_p.h> + QT_BEGIN_NAMESPACE class QQuickListView; class QQuickListViewPrivate; -class Q_AUTOTEST_EXPORT QQuickViewSection : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickViewSection : public QObject { Q_OBJECT Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) diff --git a/src/quick/util/qquickpath_p.h b/src/quick/util/qquickpath_p.h index e2c99de44e..fa6cbc668a 100644 --- a/src/quick/util/qquickpath_p.h +++ b/src/quick/util/qquickpath_p.h @@ -55,6 +55,7 @@ #include <private/qqmlnullablevalue_p.h> #include <private/qbezier_p.h> +#include <private/qtquickglobal_p.h> #include <QtCore/QObject> #include <QtGui/QPainterPath> @@ -69,7 +70,7 @@ struct QQuickPathData QList<QQuickCurve*> curves; }; -class Q_AUTOTEST_EXPORT QQuickPathElement : public QObject +class Q_QUICK_PRIVATE_EXPORT QQuickPathElement : public QObject { Q_OBJECT public: @@ -78,7 +79,7 @@ Q_SIGNALS: void changed(); }; -class Q_AUTOTEST_EXPORT QQuickPathAttribute : public QQuickPathElement +class Q_QUICK_PRIVATE_EXPORT QQuickPathAttribute : public QQuickPathElement { Q_OBJECT @@ -103,7 +104,7 @@ private: qreal _value; }; -class Q_AUTOTEST_EXPORT QQuickCurve : public QQuickPathElement +class Q_QUICK_PRIVATE_EXPORT QQuickCurve : public QQuickPathElement { Q_OBJECT @@ -145,7 +146,7 @@ private: QQmlNullableValue<qreal> _relativeY; }; -class Q_AUTOTEST_EXPORT QQuickPathLine : public QQuickCurve +class Q_QUICK_PRIVATE_EXPORT QQuickPathLine : public QQuickCurve { Q_OBJECT public: @@ -154,7 +155,7 @@ public: void addToPath(QPainterPath &path, const QQuickPathData &); }; -class Q_AUTOTEST_EXPORT QQuickPathQuad : public QQuickCurve +class Q_QUICK_PRIVATE_EXPORT QQuickPathQuad : public QQuickCurve { Q_OBJECT @@ -194,7 +195,7 @@ private: QQmlNullableValue<qreal> _relativeControlY; }; -class Q_AUTOTEST_EXPORT QQuickPathCubic : public QQuickCurve +class Q_QUICK_PRIVATE_EXPORT QQuickPathCubic : public QQuickCurve { Q_OBJECT @@ -260,7 +261,7 @@ private: QQmlNullableValue<qreal> _relativeControl2Y; }; -class Q_AUTOTEST_EXPORT QQuickPathCatmullRomCurve : public QQuickCurve +class Q_QUICK_PRIVATE_EXPORT QQuickPathCatmullRomCurve : public QQuickCurve { Q_OBJECT public: @@ -269,7 +270,7 @@ public: void addToPath(QPainterPath &path, const QQuickPathData &); }; -class Q_AUTOTEST_EXPORT QQuickPathArc : public QQuickCurve +class Q_QUICK_PRIVATE_EXPORT QQuickPathArc : public QQuickCurve { Q_OBJECT Q_PROPERTY(qreal radiusX READ radiusX WRITE setRadiusX NOTIFY radiusXChanged) @@ -311,7 +312,7 @@ private: ArcDirection _direction; }; -class Q_AUTOTEST_EXPORT QQuickPathSvg : public QQuickCurve +class Q_QUICK_PRIVATE_EXPORT QQuickPathSvg : public QQuickCurve { Q_OBJECT Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged) @@ -330,7 +331,7 @@ private: QString _path; }; -class Q_AUTOTEST_EXPORT QQuickPathPercent : public QQuickPathElement +class Q_QUICK_PRIVATE_EXPORT QQuickPathPercent : public QQuickPathElement { Q_OBJECT Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged) @@ -359,7 +360,7 @@ struct QQuickCachedBezier }; class QQuickPathPrivate; -class Q_AUTOTEST_EXPORT QQuickPath : public QObject, public QQmlParserStatus +class Q_QUICK_PRIVATE_EXPORT QQuickPath : public QObject, public QQmlParserStatus { Q_OBJECT |