diff options
| author | Adriano Rezende <adriano.1.rezende@nokia.com> | 2012-06-28 16:00:28 +0200 |
|---|---|---|
| committer | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2012-06-29 14:03:51 +0200 |
| commit | 3f93278a9ba299d5ca0a5c57f55f0f76ea29b666 (patch) | |
| tree | 15c3acb6e7d885df524be8314f7970a2590820b0 | |
| parent | 4181eaaf0126809816658d6ac0889246c274ee79 (diff) | |
| download | qtquickcontrols-3f93278a9ba299d5ca0a5c57f55f0f76ea29b666.tar.gz | |
Fix uninitialized variables in StyleItem
Change-Id: Iac540a4f4672fc627d3f088547a75a3d69e46b0d
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
| -rw-r--r-- | src/qstyleitem.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qstyleitem.cpp b/src/qstyleitem.cpp index 7ae3eae6..15d5f41c 100644 --- a/src/qstyleitem.cpp +++ b/src/qstyleitem.cpp @@ -67,18 +67,20 @@ QStyleItem::QStyleItem(QQuickPaintedItem *parent) : QQuickPaintedItem(parent), m_dummywidget(new QWidget), m_styleoption(0), - m_type(Undefined), + m_itemType(Undefined), m_sunken(false), m_raised(false), m_active(true), m_selected(false), m_focus(false), + m_hover(false), m_on(false), m_horizontal(true), m_sharedWidget(false), m_minimum(0), m_maximum(100), m_value(0), + m_step(0), m_paintMargins(0), m_implicitWidth(0), m_implicitHeight(0), @@ -877,7 +879,10 @@ void QStyleItem::setElementType(const QString &str) m_itemType = MacHelpButton; } else if (str == "scrollareacorner") { m_itemType = ScrollAreaCorner; + } else { + m_itemType = Undefined; } + if (!m_dummywidget) m_dummywidget = new QWidget(); if (m_dummywidget) { |