diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-21 13:08:11 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-01-21 13:40:35 +0000 |
| commit | 2ab54620888f35ba4820b68d6e3f2b4596ff8044 (patch) | |
| tree | 1535ea0a8832d6b6253a6a3642d1b5bde0e69c39 /src/templates/qquickpopup_p.h | |
| parent | e8837674931b7f59c154083614eb182b121767f0 (diff) | |
Add QQuickPopup::isComponentComplete()
Needed for the next commit.
Change-Id: Icb34d6f772dd1ab662b050580aa776fdc78afa49
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/templates/qquickpopup_p.h')
| -rw-r--r-- | src/templates/qquickpopup_p.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h index 630b7a4a..5f789ec5 100644 --- a/src/templates/qquickpopup_p.h +++ b/src/templates/qquickpopup_p.h @@ -51,6 +51,7 @@ #include <QtCore/qobject.h> #include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> #include <QtQml/qqml.h> +#include <QtQml/qqmlparserstatus.h> QT_BEGIN_NAMESPACE @@ -58,9 +59,10 @@ class QQuickItem; class QQuickPopupPrivate; class QQuickTransition; -class Q_LABSTEMPLATES_EXPORT QQuickPopup : public QObject +class Q_LABSTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStatus { Q_OBJECT + Q_INTERFACES(QQmlParserStatus) Q_PROPERTY(QQuickItem *contentItem READ contentItem WRITE setContentItem NOTIFY contentItemChanged FINAL) Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged) Q_PROPERTY(bool modal READ isModal WRITE setModal NOTIFY modalChanged) @@ -110,6 +112,10 @@ Q_SIGNALS: protected: QQuickPopup(QQuickPopupPrivate &dd, QObject *parent); + void classBegin() Q_DECL_OVERRIDE; + void componentComplete() Q_DECL_OVERRIDE; + bool isComponentComplete() const; + private: Q_DISABLE_COPY(QQuickPopup) Q_DECLARE_PRIVATE(QQuickPopup) |