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/imports/controls/material/qquickmaterialstyle_p.h | |
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/imports/controls/material/qquickmaterialstyle_p.h')
-rw-r--r-- | src/imports/controls/material/qquickmaterialstyle_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index 98540cd2..2bf2915e 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -49,13 +49,13 @@ // #include <QtGui/qcolor.h> -#include <QtLabsControls/private/qquickstyle_p.h> +#include <QtLabsControls/private/qquickstyleattached_p.h> QT_BEGIN_NAMESPACE class QQuickMaterialStylePrivate; -class QQuickMaterialStyle : public QQuickStyle +class QQuickMaterialStyle : public QQuickStyleAttached { Q_OBJECT Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL) @@ -222,7 +222,7 @@ Q_SIGNALS: void paletteChanged(); protected: - void parentStyleChange(QQuickStyle *newParent, QQuickStyle *oldParent) override; + void parentStyleChange(QQuickStyleAttached *newParent, QQuickStyleAttached *oldParent) override; private: void init(); |