aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-02-15 11:22:14 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2018-02-15 11:22:23 +0100
commitf6fec74d4238e304643b99880bdfd8ee32c8578e (patch)
treef3880de9e9890cb6b140ba5722d91819b800616f /src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
parent72d5d88afe64a76f2026e4a45a4858a13917d4f0 (diff)
parentd95e67c291d213cdbf41b23c535b47aa3a553ab5 (diff)
Merge remote-tracking branch 'origin/5.11' into dev
Diffstat (limited to 'src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp')
-rw-r--r--src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
index b9934c73..fa55e18a 100644
--- a/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
+++ b/src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp
@@ -61,7 +61,6 @@ public:
QtQuickControls2UniversalStylePlugin(QObject *parent = nullptr);
void registerTypes(const char *uri) override;
- void initializeEngine(QQmlEngine *engine, const char *uri) override;
QString name() const override;
QQuickTheme *createTheme() const override;
@@ -70,17 +69,13 @@ public:
QtQuickControls2UniversalStylePlugin::QtQuickControls2UniversalStylePlugin(QObject *parent) : QQuickStylePlugin(parent)
{
initResources();
+ QQuickUniversalStyle::initGlobals();
}
void QtQuickControls2UniversalStylePlugin::registerTypes(const char *uri)
{
qmlRegisterModule(uri, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2...
qmlRegisterUncreatableType<QQuickUniversalStyle>(uri, 2, 0, "Universal", tr("Universal is an attached property"));
-}
-
-void QtQuickControls2UniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri)
-{
- QQuickStylePlugin::initializeEngine(engine, uri);
QByteArray import = QByteArray(uri) + ".impl";
qmlRegisterModule(import, 2, QT_VERSION_MINOR - 7); // Qt 5.7->2.0, 5.8->2.1, 5.9->2.2...