diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-05 14:40:27 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-06 11:40:42 +0000 |
| commit | f8a6b3b9ab967c65708e9b72a2557f564d22a8ea (patch) | |
| tree | b8ab6901fc90b1e385c830a674f26793bdf15670 | |
| parent | bd380e7ff3717895b47b7a7996ebb57e0cefe2b8 (diff) | |
Export some more classes.
QQuickSprite is used in QtQuickParticles. Export unconditionally.
QQuickScaleGrid is used in auto-tests. AUTOTEST_EXPORT it.
Unbreaks UBSan build, which requires access to the classes'
type_info.
Change-Id: I65b538fe0a4255d1b5c4e2e1212001d356382cb4
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| -rw-r--r-- | src/quick/items/qquickscalegrid_p_p.h | 2 | ||||
| -rw-r--r-- | src/quick/items/qquicksprite.cpp | 5 | ||||
| -rw-r--r-- | src/quick/items/qquicksprite_p.h | 4 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/quick/items/qquickscalegrid_p_p.h b/src/quick/items/qquickscalegrid_p_p.h index 1d067f1a94..de8a5b66fb 100644 --- a/src/quick/items/qquickscalegrid_p_p.h +++ b/src/quick/items/qquickscalegrid_p_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE -class QQuickScaleGrid : public QObject +class Q_AUTOTEST_EXPORT QQuickScaleGrid : public QObject { Q_OBJECT diff --git a/src/quick/items/qquicksprite.cpp b/src/quick/items/qquicksprite.cpp index e69e12d967..0538707a5d 100644 --- a/src/quick/items/qquicksprite.cpp +++ b/src/quick/items/qquicksprite.cpp @@ -218,6 +218,11 @@ QQuickSprite::QQuickSprite(QObject *parent) { } +/*! \internal */ +QQuickSprite::~QQuickSprite() +{ +} + int QQuickSprite::variedDuration() const //Deals with precedence when multiple durations are set { if (m_frameSync) diff --git a/src/quick/items/qquicksprite_p.h b/src/quick/items/qquicksprite_p.h index 43c5e44be3..555ba0f8d9 100644 --- a/src/quick/items/qquicksprite_p.h +++ b/src/quick/items/qquicksprite_p.h @@ -55,7 +55,8 @@ QT_BEGIN_NAMESPACE -class QQuickSprite : public QQuickStochasticState +// exported, since it's used in QtQuickParticles +class Q_QUICK_EXPORT QQuickSprite : public QQuickStochasticState { Q_OBJECT Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) @@ -78,6 +79,7 @@ class QQuickSprite : public QQuickStochasticState public: explicit QQuickSprite(QObject *parent = 0); + ~QQuickSprite(); QUrl source() const { |