diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-09 15:40:45 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-29 13:14:12 +0000 |
| commit | f289313f109f474c90e72c20d01eb7c8c421f6d2 (patch) | |
| tree | cd66c137a8c90185540373c94de75d0bbfa32af0 /src/imports/controls/qtquickcontrols2plugin.cpp | |
| parent | 0e93aa60202480eadff4bd23964f90b0a0f98c77 (diff) | |
Add QQuickDefaultTheme
The Default style will be changed to use palettes, and it will be also
possible to define the default fonts and palettes for any style in the
qqc2.conf file, so the Default style needs its own proxy theme.
Change-Id: I0262f7a1f783daa62ca4afbdf3c8fe29d989ca36
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/qtquickcontrols2plugin.cpp')
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 3f84202e..8457125e 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -57,6 +57,7 @@ #include "qquickdefaultdial_p.h" #include "qquickdefaultprogressbar_p.h" #include "qquickdefaultstyle_p.h" +#include "qquickdefaulttheme_p.h" static inline void initResources() { @@ -77,6 +78,9 @@ public: QtQuickControls2Plugin(QObject *parent = nullptr); void registerTypes(const char *uri) override; void initializeEngine(QQmlEngine *engine, const char *uri) override; + + QString name() const override; + QQuickProxyTheme *createTheme() const override; }; QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlugin(parent) @@ -179,7 +183,7 @@ static QObject *colorSingleton(QQmlEngine *engine, QJSEngine *scriptEngine) void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri) { - Q_UNUSED(engine); + QQuickStylePlugin::initializeEngine(engine, uri); const 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... @@ -203,6 +207,16 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur qmlRegisterType<QQuickPaddedRectangle>(import, 2, 3, "PaddedRectangle"); } +QString QtQuickControls2Plugin::name() const +{ + return QStringLiteral("default"); +} + +QQuickProxyTheme *QtQuickControls2Plugin::createTheme() const +{ + return new QQuickDefaultTheme; +} + QT_END_NAMESPACE #include "qtquickcontrols2plugin.moc" |