diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-15 15:30:56 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-17 13:54:09 +0000 |
| commit | 7c73d40b8215e8947b123dd006e7c62e93d396fa (patch) | |
| tree | 3ecb996c74f3d57f4d50472188c7a82d41f61dce /src/imports/controls/universal | |
| parent | f337d1a2d836edaf8576a561d3ad901c6c152c2f (diff) | |
Add public API for setting and getting the style from C++
TODO: setup QtLabsControls C++ module docs
Task-number: QTBUG-50787
Change-Id: I382bad34df88d13fb9a74b3d2f9203280dfb4a66
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp index 51a71ea1..b3bb421e 100644 --- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp @@ -43,7 +43,7 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtLabsControls/private/qquickcolorimageprovider_p.h> -#include <QtLabsControls/private/qquickstyleselector_p.h> +#include <QtLabsControls/qquickstyle.h> static inline void initResources() { @@ -91,8 +91,7 @@ void QtLabsUniversalStylePlugin::registerTypes(const char *uri) void QtLabsUniversalStylePlugin::initializeEngine(QQmlEngine *engine, const char *uri) { - QQuickStyleSelector selector; - if (selector.style() == QLatin1String("universal")) { + if (QQuickStyle::name().compare(QLatin1String("universal"), Qt::CaseInsensitive) == 0) { QPlatformTheme *old = QGuiApplicationPrivate::platform_theme; if (old) { QQuickProxyTheme *theme = new QQuickUniversalTheme(old); |