diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-16 12:37:48 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-16 12:06:06 +0000 |
| commit | d1963997f31f450e46912125d67b243128822cfa (patch) | |
| tree | 2a41dc682c9389087092613cbf4ec55fa974fcbb /src/controls/qquickstyleselector.cpp | |
| parent | 9c9835b18c00fac67827c7527166cd9916dd1680 (diff) | |
Rename QQuickStyle to QQuickStyleAttached
Make room for a public QQuickStyle class for configuring the style.
Task-number: QTBUG-50787
Change-Id: I2a43436dd1815e3acd7e896a5847e41db42af5c4
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickstyleselector.cpp')
| -rw-r--r-- | src/controls/qquickstyleselector.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/qquickstyleselector.cpp b/src/controls/qquickstyleselector.cpp index 0f0fb3b0..500afdd6 100644 --- a/src/controls/qquickstyleselector.cpp +++ b/src/controls/qquickstyleselector.cpp @@ -45,7 +45,7 @@ #include <QtCore/QSettings> #include <QtGui/private/qguiapplication_p.h> -#include <QtLabsControls/private/qquickstyle_p.h> +#include <QtLabsControls/private/qquickstyleattached_p.h> QT_BEGIN_NAMESPACE @@ -63,7 +63,7 @@ QQuickStyleSelector::QQuickStyleSelector() : d_ptr(new QQuickStyleSelectorPrivat if (d->style.isEmpty()) d->style = QString::fromLatin1(qgetenv("QT_LABS_CONTROLS_STYLE")).toLower(); if (d->style.isEmpty()) { - QSharedPointer<QSettings> settings = QQuickStyle::settings(QStringLiteral("Controls")); + QSharedPointer<QSettings> settings = QQuickStyleAttached::settings(QStringLiteral("Controls")); if (settings) d->style = settings->value(QStringLiteral("Style")).toString().toLower(); } |