diff options
| author | Jan Arve Saether <jan-arve.saether@digia.com> | 2014-02-14 14:45:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-17 09:46:12 +0100 |
| commit | 04ab2428e004f01f630eb5117255bb85f5390fb4 (patch) | |
| tree | af279fe1fc72bf46a50c3b40238cf468453293f2 /src/layouts | |
| parent | 6ef881f7c52642fa72134c3aaa56105fca679f80 (diff) | |
Don't register LayoutBase as a type.
Use qmlRegisterRevision() instead of qmlRegisterUncreatableType()
This avoids that qmlplugindump generate an entry for LayoutBase and
consequently doesn't show up in the code completion in Qt Creator.
Change-Id: I8688b5d05382c3fbc3fc526cfbf34eda05b35d77
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'src/layouts')
| -rw-r--r-- | src/layouts/plugin.cpp | 3 | ||||
| -rw-r--r-- | src/layouts/plugins.qmltypes | 3 | ||||
| -rw-r--r-- | src/layouts/qquicklinearlayout.cpp | 6 | ||||
| -rw-r--r-- | src/layouts/qquicklinearlayout_p.h | 5 |
4 files changed, 11 insertions, 6 deletions
diff --git a/src/layouts/plugin.cpp b/src/layouts/plugin.cpp index 582cef1f0..c9a2126cc 100644 --- a/src/layouts/plugin.cpp +++ b/src/layouts/plugin.cpp @@ -61,8 +61,7 @@ public: qmlRegisterType<QQuickGridLayout>(uri, 1, 0, "GridLayout"); qmlRegisterUncreatableType<QQuickLayout>(uri, 1, 0, "Layout", QLatin1String("Do not create objects of type Layout")); - qmlRegisterUncreatableType<QQuickGridLayoutBase, 1>(uri, 1, 1, "LayoutBase", - QLatin1String("Do not create objects of type LayoutBase")); + qmlRegisterRevision<QQuickGridLayoutBase, 1>(uri, 1, 1); } }; //![class decl] diff --git a/src/layouts/plugins.qmltypes b/src/layouts/plugins.qmltypes index b20aae0db..20a8f9329 100644 --- a/src/layouts/plugins.qmltypes +++ b/src/layouts/plugins.qmltypes @@ -37,9 +37,6 @@ Module { name: "QQuickGridLayoutBase" defaultProperty: "data" prototype: "QQuickLayout" - exports: ["QtQuick.Layouts/LayoutBase 1.1"] - isCreatable: false - exportMetaObjectRevisions: [1] Property { name: "layoutDirection"; revision: 1; type: "Qt::LayoutDirection" } Signal { name: "layoutDirectionChanged"; revision: 1 } } diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp index d09a07dc4..9ff68a055 100644 --- a/src/layouts/qquicklinearlayout.cpp +++ b/src/layouts/qquicklinearlayout.cpp @@ -176,6 +176,12 @@ QT_BEGIN_NAMESPACE +QQuickGridLayoutBase::QQuickGridLayoutBase() + : QQuickLayout(*new QQuickGridLayoutBasePrivate) +{ + +} + QQuickGridLayoutBase::QQuickGridLayoutBase(QQuickGridLayoutBasePrivate &dd, Qt::Orientation orientation, QQuickItem *parent /*= 0*/) diff --git a/src/layouts/qquicklinearlayout_p.h b/src/layouts/qquicklinearlayout_p.h index 2840508dd..bbd936a56 100644 --- a/src/layouts/qquicklinearlayout_p.h +++ b/src/layouts/qquicklinearlayout_p.h @@ -62,6 +62,9 @@ class QQuickGridLayoutBase : public QQuickLayout Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged REVISION 1) public: + + QQuickGridLayoutBase(); + explicit QQuickGridLayoutBase(QQuickGridLayoutBasePrivate &dd, Qt::Orientation orientation, QQuickItem *parent = 0); @@ -83,7 +86,7 @@ protected: int itemCount() const Q_DECL_OVERRIDE; void rearrange(const QSizeF &size); - virtual void insertLayoutItems() = 0; + virtual void insertLayoutItems() {} void removeLayoutItem(QQuickItem *item); void itemChange(ItemChange change, const ItemChangeData &data); void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); |