From 027c24e6965b3fe1316c379c6de650bafd94dc08 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 9 Jun 2017 11:52:49 +0200 Subject: Expose PaddedRectangle in QtQuick.Controls.impl 2.0 PaddedRectangle was moved from QtQuick.Controls.Material.impl 2.0 to QtQuick.Controls.impl 2.3 in 8290b876b. It seems that the qhours app is using the PaddedRectangle for a custom SpinBox. Importing 2.3 would make Qt 5.10 a hard requirement, so registering PaddedRectangle to QtQuick.Controls.impl 2.0 allows us to fix qhours so that it still works with Qt 5.9 and earlier. It's an internal type, and technically it already was there since 2.0, so this shouldn't matter much. Change-Id: Ie959dc150356fd5624e899eac9e52ca5a183ffe5 Reviewed-by: Mitch Curtis --- src/imports/controls/qtquickcontrols2plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp') diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index a7bf096f..f9ee88d8 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -182,6 +182,7 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterType(import, 2, 0, "BusyIndicatorImpl"); qmlRegisterType(import, 2, 0, "DialImpl"); + qmlRegisterType(import, 2, 0, "PaddedRectangle"); qmlRegisterType(import, 2, 0, "ProgressBarImpl"); qmlRegisterType(import, 2, 2, "PlaceholderText"); #if QT_CONFIG(quick_listview) && QT_CONFIG(quick_pathview) @@ -196,7 +197,6 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterType(import, 2, 3, "IconImage"); qmlRegisterSingletonType(import, 2, 3, "Color", colorSingleton); qmlRegisterType(import, 2, 3, "IconLabel"); - qmlRegisterType(import, 2, 3, "PaddedRectangle"); } QString QtQuickControls2Plugin::name() const -- cgit v1.2.3