diff options
Diffstat (limited to 'src/imports')
23 files changed, 45 insertions, 77 deletions
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml index 38533be6..8f3460fe 100644 --- a/src/imports/controls/ApplicationWindow.qml +++ b/src/imports/controls/ApplicationWindow.qml @@ -37,8 +37,9 @@ import QtQuick 2.6 import QtQuick.Window 2.2 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractApplicationWindow { +T.ApplicationWindow { id: window color: Theme.backgroundColor diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index 0a16979a..dde7699f 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractBusyIndicator { +T.BusyIndicator { id: control implicitWidth: indicator.implicitWidth + leftPadding + rightPadding diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 5b2c94b3..f6e50f99 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractButton { +T.Button { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 37f61cf9..e5915b8f 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractCheckBox { +T.CheckBox { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index be5fc29f..72ec0ad6 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractFrame { +T.Frame { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 94cc528d..63c0d2ca 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractGroupBox { +T.GroupBox { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index 05eee695..9c2477b0 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractLabel { +T.Label { id: control Accessible.name: text diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 485cb40c..4891951b 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractPageIndicator { +T.PageIndicator { id: control Accessible.role: Accessible.Indicator diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index b031b179..fbb469be 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractProgressBar { +T.ProgressBar { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 1f19b031..16bf4f89 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractRadioButton { +T.RadioButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index 6a71e7be..a0821ac0 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractScrollBar { +T.ScrollBar { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 080c00ac..fb6f9277 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractScrollIndicator { +T.ScrollIndicator { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 6fbc3f09..1074b6dd 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractSlider { +T.Slider { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml index 91df6420..093db0ee 100644 --- a/src/imports/controls/StackView.qml +++ b/src/imports/controls/StackView.qml @@ -36,8 +36,9 @@ import QtQuick 2.4 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractStackView { +T.StackView { id: root //! [popEnter] diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 9e924872..6ddf840f 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractSwitch { +T.Switch { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml index fb541388..89ab3166 100644 --- a/src/imports/controls/TabBar.qml +++ b/src/imports/controls/TabBar.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractTabBar { +T.TabBar { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index d6d893b8..c5ca6f72 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractTabButton { +T.TabButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index be51a5d2..52b7ade4 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractTextArea { +T.TextArea { id: control Accessible.name: text diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 36d7edbc..ca477107 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractTextField { +T.TextField { id: control Accessible.name: text diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml index f64bad97..8a732f02 100644 --- a/src/imports/controls/ToggleButton.qml +++ b/src/imports/controls/ToggleButton.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractToggleButton { +T.ToggleButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index b7ed3c98..2c0fb5f0 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractToolBar { +T.ToolBar { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, contentWidth + leftPadding + rightPadding) diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index dc3a919b..4eac37fd 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -36,8 +36,9 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 +import QtQuick.Templates 2.0 as T -AbstractToolButton { +T.ToolButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 2d40f064..fb701a35 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -35,33 +35,8 @@ ****************************************************************************/ #include <QtQml/qqmlextensionplugin.h> -#include "qquicktheme_p.h" - -#include <QtQuickControls/private/qquickapplicationwindow_p.h> -#include <QtQuickControls/private/qquickbusyindicator_p.h> -#include <QtQuickControls/private/qquickbutton_p.h> -#include <QtQuickControls/private/qquickcheckbox_p.h> -#include <QtQuickControls/private/qquickframe_p.h> -#include <QtQuickControls/private/qquickgroupbox_p.h> -#include <QtQuickControls/private/qquicklabel_p.h> -#include <QtQuickControls/private/qquickpageindicator_p.h> -#include <QtQuickControls/private/qquickprogressbar_p.h> -#include <QtQuickControls/private/qquickradiobutton_p.h> -#include <QtQuickControls/private/qquickscrollbar_p.h> -#include <QtQuickControls/private/qquickscrollindicator_p.h> -#include <QtQuickControls/private/qquickslider_p.h> -#include <QtQuickControls/private/qquickstackview_p.h> -#include <QtQuickControls/private/qquickswitch_p.h> -#include <QtQuickControls/private/qquicktabbar_p.h> -#include <QtQuickControls/private/qquicktabbutton_p.h> -#include <QtQuickControls/private/qquicktextarea_p.h> -#include <QtQuickControls/private/qquicktextfield_p.h> -#include <QtQuickControls/private/qquicktogglebutton_p.h> -#include <QtQuickControls/private/qquicktoolbar_p.h> -#include <QtQuickControls/private/qquicktoolbutton_p.h> - -#include <QtQuickControls/private/qquickcontrol_p.h> #include <QtQuickControls/private/qquickexclusivegroup_p.h> +#include "qquicktheme_p.h" void initResources() { @@ -82,39 +57,10 @@ public: void QtQuickControls2Plugin::registerTypes(const char *uri) { - qmlRegisterType<QQuickApplicationWindow>(uri, 2, 0, "AbstractApplicationWindow"); - qmlRegisterType<QQuickBusyIndicator>(uri, 2, 0, "AbstractBusyIndicator"); - qmlRegisterType<QQuickButton>(uri, 2, 0, "AbstractButton"); - qmlRegisterType<QQuickCheckBox>(uri, 2, 0, "AbstractCheckBox"); - qmlRegisterType<QQuickFrame>(uri, 2, 0, "AbstractFrame"); - qmlRegisterType<QQuickGroupBox>(uri, 2, 0, "AbstractGroupBox"); - qmlRegisterType<QQuickLabel>(uri, 2, 0, "AbstractLabel"); - qmlRegisterType<QQuickPageIndicator>(uri, 2, 0, "AbstractPageIndicator"); - qmlRegisterType<QQuickProgressBar>(uri, 2, 0, "AbstractProgressBar"); - qmlRegisterType<QQuickRadioButton>(uri, 2, 0, "AbstractRadioButton"); - qmlRegisterType<QQuickScrollBar>(uri, 2, 0, "AbstractScrollBar"); - qmlRegisterType<QQuickScrollIndicator>(uri, 2, 0, "AbstractScrollIndicator"); - qmlRegisterType<QQuickSlider>(uri, 2, 0, "AbstractSlider"); - qmlRegisterType<QQuickStackView>(uri, 2, 0, "AbstractStackView"); - qmlRegisterType<QQuickSwitch>(uri, 2, 0, "AbstractSwitch"); - qmlRegisterType<QQuickTabBar>(uri, 2, 0, "AbstractTabBar"); - qmlRegisterType<QQuickTabButton>(uri, 2, 0, "AbstractTabButton"); - qmlRegisterType<QQuickTextArea>(uri, 2, 0, "AbstractTextArea"); - qmlRegisterType<QQuickTextField>(uri, 2, 0, "AbstractTextField"); - qmlRegisterType<QQuickToggleButton>(uri, 2, 0, "AbstractToggleButton"); - qmlRegisterType<QQuickToolBar>(uri, 2, 0, "AbstractToolBar"); - qmlRegisterType<QQuickToolButton>(uri, 2, 0, "AbstractToolButton"); - - qmlRegisterUncreatableType<QQuickStackAttached>(uri, 2, 0, "Stack", "Stack is an attached property"); qmlRegisterUncreatableType<QQuickThemeAttached>(uri, 2, 0, "Theme", "Theme is an attached property"); - qmlRegisterType<QQuickControl>(uri, 2, 0, "Control"); qmlRegisterType<QQuickExclusiveGroup>(uri, 2, 0, "ExclusiveGroup"); qmlRegisterType<QQuickExclusiveGroupAttached>(); - - qmlRegisterRevision<QQuickText, 6>(uri, 2, 0); - qmlRegisterRevision<QQuickTextInput, 6>(uri, 2, 0); - qmlRegisterRevision<QQuickTextEdit, 6>(uri, 2, 0); } void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri) |