diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-03-06 11:52:10 +0100 |
|---|---|---|
| committer | Jari-Pekka Nurmi <jpnurmi@theqtcompany.com> | 2015-03-11 01:06:44 +0200 |
| commit | a3921bcf01275425350c9c153fe92086a34d1403 (patch) | |
| tree | 1c5c4dd36e9d19a36281bde723c7bf989bc70298 /src/controls/qquickcontrol_p_p.h | |
| parent | e9398b7465c7df38876d0c6528ea5c42bbd8bf6a (diff) | |
Implement Style as an attached property
Change-Id: I006ee566647e31d1a14919d164d7dd68539aae10
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls/qquickcontrol_p_p.h')
| -rw-r--r-- | src/controls/qquickcontrol_p_p.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/controls/qquickcontrol_p_p.h b/src/controls/qquickcontrol_p_p.h index afd05385..4a3cf8af 100644 --- a/src/controls/qquickcontrol_p_p.h +++ b/src/controls/qquickcontrol_p_p.h @@ -49,7 +49,6 @@ // #include <QtQuick/private/qquickitem_p.h> -#include <QtQuickControls/private/qquickstyle_p.h> QT_BEGIN_NAMESPACE @@ -67,9 +66,6 @@ public: void setRightPadding(qreal value, bool reset = false); void setBottomPadding(qreal value, bool reset = false); - void resolveStyle(QQuickStyle *other = 0); - - bool hasStyle; bool hasTopPadding; bool hasLeftPadding; bool hasRightPadding; @@ -80,7 +76,6 @@ public: qreal rightPadding; qreal bottomPadding; QQuickItem *background; - QQuickStyle *style; }; QT_END_NAMESPACE |