diff options
| author | Liang Qi <[email protected]> | 2016-04-07 10:56:42 +0200 |
|---|---|---|
| committer | Liang Qi <[email protected]> | 2016-04-08 13:03:25 +0200 |
| commit | 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 (patch) | |
| tree | 8fdc2922aa5375203fef05746691e88632a92bbe /src/quick/items/qquickview_p.h | |
| parent | 0d8de448ef746aea7215f6f654660500dc9601d2 (diff) | |
| parent | a676e4e2dae945c02521691c7018f5a5534feff9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
This change also fixes the build of two benchmarks, tst_affectors
and tst_emission.
Conflicts:
src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
src/qml/qml/ftw/qhashfield_p.h
tests/benchmarks/particles/affectors/tst_affectors.cpp
tests/benchmarks/particles/emission/tst_emission.cpp
tests/benchmarks/qml/pointers/pointers.pro
tests/benchmarks/qml/pointers/tst_pointers.cpp
tests/benchmarks/qml/qmltime/qmltime.pro
tests/benchmarks/qml/qquickwindow/qquickwindow.pro
Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
Diffstat (limited to 'src/quick/items/qquickview_p.h')
| -rw-r--r-- | src/quick/items/qquickview_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h index 6306066134..1bbff0de0e 100644 --- a/src/quick/items/qquickview_p.h +++ b/src/quick/items/qquickview_p.h @@ -76,7 +76,7 @@ class QQmlError; class QQuickItem; class QQmlComponent; -class QQuickViewPrivate : public QQuickWindowPrivate, +class Q_QUICK_PRIVATE_EXPORT QQuickViewPrivate : public QQuickWindowPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickView) |