diff options
| author | Liang Qi <[email protected]> | 2015-12-18 19:17:30 +0100 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2015-12-18 19:17:30 +0100 |
| commit | 9f38956fc9a58a2fdfd83c91d65502964047eda3 (patch) | |
| tree | 3156fa78c621e3588b230d8334944d4c9e857d45 /src/quick/items/qquickitemview_p_p.h | |
| parent | 57cd6337a87f4a8a77ea7136c60a32d2825426df (diff) | |
| parent | 839d2d3e2368bc8e107d22203b0611c852f54319 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
Change-Id: I9588a3e2c7d590e031dd4c66905a79f0d74d3ac8
Diffstat (limited to 'src/quick/items/qquickitemview_p_p.h')
| -rw-r--r-- | src/quick/items/qquickitemview_p_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h index 3b6407a9f5..2b3da20b34 100644 --- a/src/quick/items/qquickitemview_p_p.h +++ b/src/quick/items/qquickitemview_p_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE -class FxViewItem +class Q_AUTOTEST_EXPORT FxViewItem { public: FxViewItem(QQuickItem *, QQuickItemView *, bool own, QQuickItemViewAttached *attached); @@ -123,7 +123,7 @@ public: }; -class QQuickItemViewPrivate : public QQuickFlickablePrivate, public QQuickItemViewTransitionChangeListener, public QAnimationJobChangeListener +class Q_AUTOTEST_EXPORT QQuickItemViewPrivate : public QQuickFlickablePrivate, public QQuickItemViewTransitionChangeListener, public QAnimationJobChangeListener { Q_DECLARE_PUBLIC(QQuickItemView) public: |