aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/qtlabscontrolsplugin.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-21 15:01:57 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-21 16:16:58 +0000
commitc34e39cd1fd078510467536a9562e365cdae4d8f (patch)
tree3672215907cb8a1e976246a7e7bd7b6fbcb0b1e3 /src/imports/controls/qtlabscontrolsplugin.cpp
parentde88cd1d54be687f4c482dd9dfeb020bc03be8d6 (diff)
Material: set default transitions for Popup
Change-Id: I3844718c4a6fa0410f6d8670390878e4521976c0 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/qtlabscontrolsplugin.cpp')
-rw-r--r--src/imports/controls/qtlabscontrolsplugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp
index 6c0bacfb..c822d9be 100644
--- a/src/imports/controls/qtlabscontrolsplugin.cpp
+++ b/src/imports/controls/qtlabscontrolsplugin.cpp
@@ -71,7 +71,6 @@ void QtLabsControlsPlugin::registerTypes(const char *uri)
qmlRegisterType<QQuickButtonGroupAttached>();
qmlRegisterType<QQuickContainer>(uri, 1, 0, "Container");
qmlRegisterType<QQuickControl>(uri, 1, 0, "Control");
- qmlRegisterType<QQuickPopup>(uri, 1, 0, "Popup");
QQuickStyleSelector selector;
selector.setBaseUrl(baseUrl());
@@ -91,6 +90,7 @@ void QtLabsControlsPlugin::registerTypes(const char *uri)
qmlRegisterType(selector.select(QStringLiteral("/MenuItem.qml")), uri, 1, 0, "MenuItem");
qmlRegisterType(selector.select(QStringLiteral("/Pane.qml")), uri, 1, 0, "Pane");
qmlRegisterType(selector.select(QStringLiteral("/PageIndicator.qml")), uri, 1, 0, "PageIndicator");
+ qmlRegisterType(selector.select(QStringLiteral("/Popup.qml")), uri, 1, 0, "Popup");
qmlRegisterType(selector.select(QStringLiteral("/ProgressBar.qml")), uri, 1, 0, "ProgressBar");
qmlRegisterType(selector.select(QStringLiteral("/RadioButton.qml")), uri, 1, 0, "RadioButton");
qmlRegisterType(selector.select(QStringLiteral("/RangeSlider.qml")), uri, 1, 0, "RangeSlider");