aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-10 13:58:18 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-10 21:03:39 +0000
commitc47aa91ed7e0e120d810dc81863758715b928d1b (patch)
treeca29d9a1b513780430aa47dbc0a69c9fdfafb108
parent3809315b2658327504f8518db0c0b49a015a71a5 (diff)
Register also "unstyled" controls to the Qt.labs.controls namespace
The documentation is full of references to Control and other "unstyled" control. This change makes it possible to use them without importing the templates. Change-Id: I4026d4c212139568ab9229f956b115c328d69b72 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
-rw-r--r--src/imports/controls/qtlabscontrolsplugin.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp
index fef5e41e..b55bd20f 100644
--- a/src/imports/controls/qtlabscontrolsplugin.cpp
+++ b/src/imports/controls/qtlabscontrolsplugin.cpp
@@ -38,7 +38,11 @@
#include <QtCore/qurl.h>
#include <QtCore/qcoreapplication.h>
+#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtLabsTemplates/private/qquickbuttongroup_p.h>
+#include <QtLabsTemplates/private/qquickcontainer_p.h>
+#include <QtLabsTemplates/private/qquickcontrol_p.h>
+#include <QtLabsTemplates/private/qquickpopup_p.h>
#include <QtLabsControls/private/qquickstyleselector_p.h>
static inline void initResources()
@@ -60,8 +64,12 @@ public:
void QtLabsControlsPlugin::registerTypes(const char *uri)
{
+ qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton");
qmlRegisterType<QQuickButtonGroup>(uri, 1, 0, "ButtonGroup");
qmlRegisterType<QQuickButtonGroupAttached>();
+ qmlRegisterType<QQuickContainer>(uri, 1, 0, "Container");
+ qmlRegisterType<QQuickControl>(uri, 1, 0, "Control");
+ qmlRegisterType<QQuickPopup>(uri, 1, 0, "Popup");
// TODO: read the style from application manifest file
QQuickStyleSelector *selector = QQuickStyleSelector::instance();