diff options
| -rw-r--r-- | src/imports/controls/controls.pro | 6 | ||||
| -rw-r--r-- | src/imports/controls/qmldir | 4 | ||||
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp (renamed from src/imports/controls/qtquickcontrolsplugin.cpp) | 14 | ||||
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.qrc (renamed from src/imports/controls/qtquickcontrolsplugin.qrc) | 0 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index d9dfca4c..a08cd675 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -1,4 +1,4 @@ -TARGET = qtquickcontrolsplugin +TARGET = qtquickcontrols2plugin TARGETPATH = Qt/labs/controls IMPORT_VERSION = 1.0 @@ -13,10 +13,10 @@ OTHER_FILES += \ qmldir SOURCES += \ - $$PWD/qtquickcontrolsplugin.cpp + $$PWD/qtquickcontrols2plugin.cpp RESOURCES += \ - $$PWD/qtquickcontrolsplugin.qrc + $$PWD/qtquickcontrols2plugin.qrc include(controls.pri) !static: include(designer/designer.pri) diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir index 3250e255..23cb0475 100644 --- a/src/imports/controls/qmldir +++ b/src/imports/controls/qmldir @@ -1,5 +1,5 @@ module Qt.labs.controls -plugin qtquickcontrolsplugin -classname QtQuickControlsPlugin +plugin qtquickcontrols2plugin +classname QtQuickControls2Plugin depends Qt.labs.templates 1.0 designersupported diff --git a/src/imports/controls/qtquickcontrolsplugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 970c0ca3..cd1c6378 100644 --- a/src/imports/controls/qtquickcontrolsplugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -54,7 +54,7 @@ static inline void initResources() { - Q_INIT_RESOURCE(qtquickcontrolsplugin); + Q_INIT_RESOURCE(qtquickcontrols2plugin); #ifdef QT_STATIC Q_INIT_RESOURCE(qmake_Qt_labs_controls); #endif @@ -62,23 +62,23 @@ static inline void initResources() QT_BEGIN_NAMESPACE -class QtQuickControlsPlugin: public QQmlExtensionPlugin +class QtQuickControls2Plugin: public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") public: - QtQuickControlsPlugin(QObject *parent = nullptr); + QtQuickControls2Plugin(QObject *parent = nullptr); void registerTypes(const char *uri); void initializeEngine(QQmlEngine *engine, const char *uri); }; -QtQuickControlsPlugin::QtQuickControlsPlugin(QObject *parent) : QQmlExtensionPlugin(parent) +QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQmlExtensionPlugin(parent) { initResources(); } -void QtQuickControlsPlugin::registerTypes(const char *uri) +void QtQuickControls2Plugin::registerTypes(const char *uri) { qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton"); qmlRegisterType<QQuickButtonGroup>(uri, 1, 0, "ButtonGroup"); @@ -134,7 +134,7 @@ void QtQuickControlsPlugin::registerTypes(const char *uri) qmlRegisterType(selector.select(QStringLiteral("Tumbler.qml")), uri, 1, 0, "Tumbler"); } -void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri) +void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri) { Q_UNUSED(engine); Q_UNUSED(uri); @@ -153,4 +153,4 @@ void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri QT_END_NAMESPACE -#include "qtquickcontrolsplugin.moc" +#include "qtquickcontrols2plugin.moc" diff --git a/src/imports/controls/qtquickcontrolsplugin.qrc b/src/imports/controls/qtquickcontrols2plugin.qrc index 227bd435..227bd435 100644 --- a/src/imports/controls/qtquickcontrolsplugin.qrc +++ b/src/imports/controls/qtquickcontrols2plugin.qrc |