feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '2.3'

Browse Source 
Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
This commit is contained in:
Oswald Buddenhagen
2011-07-25 13:57:13 +02:00
parent 76a5b1953c 899cc03003
commit ae8ac2eb2f
196 changed files with 3087 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/quicktoolbar.cpp
View File

@@ -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)