diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2018-10-11 11:24:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-18 17:11:53 +0000 |
| commit | 878a17729b4cdaf0a7989d3e5fe22b058c1715d4 (patch) | |
| tree | 5a6d5d784fe6a86642d7f85ac1bf4cfecfc7c13a /src | |
| parent | dbca08fcd7ca70392420b2181aa6b7985ddb5c08 (diff) | |
Export QQmlInstantiator and QQmlInstantiatorPrivate privately
This is needed to fix a bug in Qt Quick Controls 2. We need
to know if items within a Menu were created by Instantiator
so that we don't try to recreate them.
Task-number: QTBUG-71066
Change-Id: Iaedaea2be6bf4f70c2c7b6fb37871d5537328e96
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/types/qqmlinstantiator_p.h | 3 | ||||
| -rw-r--r-- | src/qml/types/qqmlinstantiator_p_p.h | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/qml/types/qqmlinstantiator_p.h b/src/qml/types/qqmlinstantiator_p.h index 5727c4d1e1..ca371adc23 100644 --- a/src/qml/types/qqmlinstantiator_p.h +++ b/src/qml/types/qqmlinstantiator_p.h @@ -53,11 +53,12 @@ #include <QtQml/qqmlcomponent.h> #include <QtQml/qqmlparserstatus.h> +#include <QtQml/private/qtqmlglobal_p.h> QT_BEGIN_NAMESPACE class QQmlInstantiatorPrivate; -class Q_AUTOTEST_EXPORT QQmlInstantiator : public QObject, public QQmlParserStatus +class Q_QML_PRIVATE_EXPORT QQmlInstantiator : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/qml/types/qqmlinstantiator_p_p.h b/src/qml/types/qqmlinstantiator_p_p.h index a5a4d1a32d..4c76d5c689 100644 --- a/src/qml/types/qqmlinstantiator_p_p.h +++ b/src/qml/types/qqmlinstantiator_p_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE -class QQmlInstantiatorPrivate : public QObjectPrivate +class Q_QML_PRIVATE_EXPORT QQmlInstantiatorPrivate : public QObjectPrivate { Q_DECLARE_PUBLIC(QQmlInstantiator) @@ -76,6 +76,9 @@ public: void _q_modelUpdated(const QQmlChangeSet &, bool); QObject *modelObject(int index, bool async); + static QQmlInstantiatorPrivate *get(QQmlInstantiator *instantiator) { return instantiator->d_func(); } + static const QQmlInstantiatorPrivate *get(const QQmlInstantiator *instantiator) { return instantiator->d_func(); } + bool componentComplete:1; bool effectiveReset:1; bool active:1; |