diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-05-29 13:06:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-30 09:21:16 +0200 |
| commit | 26dda49ccb3572bedc785c85c41cec5db8114579 (patch) | |
| tree | 867b1bcdfa9967df2865ab04b84d8847b13b9aea /src/private/plugin.cpp | |
| parent | b0510b53256cbc3d2ea46dd936e85c0d1f463b37 (diff) | |
Rename PaddedStyle to AbstractStyle
Make Style inherit AbstractStyle, so it becomes the base class
of all styles. AbstractStyle also now has a default "data"
property so it's possible to conveniently declare helper
content inside styles.
Change-Id: Id84f3762cfae506e65021322619d7fb77b137994
Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/private/plugin.cpp')
| -rw-r--r-- | src/private/plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/private/plugin.cpp b/src/private/plugin.cpp index 17bfed07f..e33c2d375 100644 --- a/src/private/plugin.cpp +++ b/src/private/plugin.cpp @@ -45,7 +45,7 @@ #include "qquicktooltip_p.h" #include "qquickcontrolsettings_p.h" #include "qquickspinboxvalidator_p.h" -#include "qquickpaddedstyle_p.h" +#include "qquickabstractstyle_p.h" #ifndef QT_NO_WIDGETS #include "qquickstyleitem_p.h" @@ -81,7 +81,7 @@ public: void QtQuickControlsPrivatePlugin::registerTypes(const char *uri) { - qmlRegisterType<QQuickPaddedStyle>(uri, 1, 0, "PaddedStyle"); + qmlRegisterType<QQuickAbstractStyle>(uri, 1, 0, "AbstractStyle"); qmlRegisterType<QQuickPadding>(); qmlRegisterType<QQuickRangeModel>(uri, 1, 0, "RangeModel"); qmlRegisterType<QQuickWheelArea>(uri, 1, 0, "WheelArea"); |