Merge branch '2.3'

[qt-creator-jp/qt-creator-jp.git] / src / plugins / qmljseditor / quicktoolbar.cpp

diff --git a/src/plugins/qmljseditor/quicktoolbar.cpp b/src/plugins/qmljseditor/quicktoolbar.cpp
index 6ca0e51..4d86052 100644 (file)
--- a/src/plugins/qmljseditor/quicktoolbar.cpp
+++ b/src/plugins/qmljseditor/quicktoolbar.cpp
@@ -309,7 +309,7 @@ void QuickToolBar::setProperty(const QString &propertyName, const QVariant &valu
         UiObjectDefinition *objectDefinition = cast<UiObjectDefinition*>(m_node);
         UiObjectBinding *objectBinding = cast<UiObjectBinding*>(m_node);
 
-        UiObjectInitializer *initializer;
+        UiObjectInitializer *initializer = 0;
         if (objectDefinition)
             initializer = objectDefinition->initializer;
         else if (objectBinding)
@@ -370,7 +370,7 @@ void QuickToolBar::removeProperty(const QString &propertyName)
         UiObjectDefinition *objectDefinition = cast<UiObjectDefinition*>(m_node);
         UiObjectBinding *objectBinding = cast<UiObjectBinding*>(m_node);
 
-        UiObjectInitializer *initializer;
+        UiObjectInitializer *initializer = 0;
         if (objectDefinition)
             initializer = objectDefinition->initializer;
         else if (objectBinding)