diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2018-02-15 11:22:14 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2018-02-15 11:22:23 +0100 |
commit | f6fec74d4238e304643b99880bdfd8ee32c8578e (patch) | |
tree | f3880de9e9890cb6b140ba5722d91819b800616f /src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp | |
parent | 72d5d88afe64a76f2026e4a45a4858a13917d4f0 (diff) | |
parent | d95e67c291d213cdbf41b23c535b47aa3a553ab5 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Id3333e9bb67ced4c6dbae5845512fe1927a7b858
Diffstat (limited to 'src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp')
-rw-r--r-- | src/imports/controls/universal/qtquickcontrols2universalstyleplugin.cpp | 7 |
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... |