diff options
Diffstat (limited to 'src/imports/templates/qtquicktemplates2plugin.cpp')
| -rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index ec61b07c..ef7a646b 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -70,6 +70,7 @@ #include <QtQuickTemplates2/private/qquickpaletteprovider_p.h> #include <QtQuickTemplates2/private/qquickpane_p.h> #include <QtQuickTemplates2/private/qquickpopup_p.h> +#include <QtQuickTemplates2/private/qquickpopupanchors_p.h> #include <QtQuickTemplates2/private/qquickprogressbar_p.h> #include <QtQuickTemplates2/private/qquickradiobutton_p.h> #include <QtQuickTemplates2/private/qquickradiodelegate_p.h> @@ -99,13 +100,6 @@ #include <QtQuickTemplates2/private/qquicktumbler_p.h> #endif -static inline void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtQuick_Templates_2); -#endif -} - #if QT_CONFIG(shortcut) // qtdeclarative/src/quick/util/qquickshortcut.cpp typedef bool (*ShortcutContextMatcher)(QObject *, Qt::ShortcutContext); @@ -146,8 +140,6 @@ private: QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent) : QQmlExtensionPlugin(parent), registered(false) { - initResources(); - #if QT_CONFIG(shortcut) originalContextMatcher = qt_quick_shortcut_context_matcher(); qt_quick_set_shortcut_context_matcher(QQuickShortcutContext::matcher); @@ -329,6 +321,26 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickScrollBar, 4>(uri, 2, 4, "ScrollBar"); qmlRegisterType<QQuickScrollIndicator, 4>(uri, 2, 4, "ScrollIndicator"); qmlRegisterType<QQuickSpinBox, 4>(uri, 2, 4, "SpinBox"); + + // QtQuick.Templates 2.5 (new types and revisions in Qt 5.12) + qmlRegisterType<QQuickAbstractButton, 5>(uri, 2, 5, "AbstractButton"); + qmlRegisterType<QQuickDialogButtonBox, 5>(uri, 2, 5, "DialogButtonBox"); + qmlRegisterType<QQuickComboBox, 5>(uri, 2, 5, "ComboBox"); + qmlRegisterType<QQuickControl, 5>(uri, 2, 5, "Control"); + qmlRegisterType<QQuickContainer, 5>(uri, 2, 5, "Container"); + qmlRegisterType<QQuickDial, 5>(uri, 2, 5, "Dial"); + qmlRegisterType<QQuickDialog, 5>(uri, 2, 5, "Dialog"); + qmlRegisterType<QQuickGroupBox, 5>(uri, 2, 5, "GroupBox"); + qmlRegisterType<QQuickLabel, 5>(uri, 2, 5, "Label"); + qmlRegisterType<QQuickPage, 5>(uri, 2, 5, "Page"); + qmlRegisterType<QQuickPopup, 5>(uri, 2, 5, "Popup"); + qmlRegisterType<QQuickPopupAnchors>(); + qmlRegisterType<QQuickRangeSlider, 5>(uri, 2, 5, "RangeSlider"); + qmlRegisterType<QQuickSlider, 5>(uri, 2, 5, "Slider"); + qmlRegisterType<QQuickSpinBox, 5>(uri, 2, 5, "SpinBox"); + qmlRegisterType<QQuickTextArea, 5>(uri, 2, 5, "TextArea"); + qmlRegisterType<QQuickTextField, 5>(uri, 2, 5, "TextField"); + qmlRegisterType<QQuickToolTip, 5>(uri, 2, 5, "ToolTip"); } QT_END_NAMESPACE |