aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/qquickcontrol_p_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/qquickcontrol_p_p.h')
-rw-r--r--src/controls/qquickcontrol_p_p.h5
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