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

QmlDesigner.NodeInstances: Rename SG to Quick

Browse Source 
Change-Id: I2180704df244a715a078385a7ecbf852f41ca68f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2012-09-25 17:05:00 +02:00
parent 1264d0ea5e
commit 2fc24f27d1
9 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri
View File

@@ -5,7 +5,7 @@ HEADERS += $$PWD/qt5informationnodeinstanceserver.h
HEADERS += $$PWD/qt5rendernodeinstanceserver.h
HEADERS += $$PWD/qt5previewnodeinstanceserver.h
HEADERS += $$PWD/qt5nodeinstanceclientproxy.h
HEADERS += $$PWD/sgitemnodeinstance.h
HEADERS += $$PWD/quickitemnodeinstance.h
HEADERS += $$PWD/behaviornodeinstance.h
HEADERS += $$PWD/dummycontextobject.h
HEADERS += $$PWD/childrenchangeeventfilter.h
@@ -27,7 +27,7 @@ SOURCES += $$PWD/qt5informationnodeinstanceserver.cpp
SOURCES += $$PWD/qt5rendernodeinstanceserver.cpp
SOURCES += $$PWD/qt5previewnodeinstanceserver.cpp
SOURCES += $$PWD/qt5nodeinstanceclientproxy.cpp
SOURCES += $$PWD/sgitemnodeinstance.cpp
SOURCES += $$PWD/quickitemnodeinstance.cpp
SOURCES += $$PWD/behaviornodeinstance.cpp
SOURCES += $$PWD/dummycontextobject.cpp
SOURCES += $$PWD/childrenchangeeventfilter.cpp

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
View File

@@ -190,7 +190,7 @@ bool ObjectNodeInstance::isPositioner() const
return false;
}
bool ObjectNodeInstance::isSGItem() const
bool ObjectNodeInstance::isQuickItem() const
{
return false;
}

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
View File

@@ -100,7 +100,7 @@ public:
virtual bool isGraphicsObject() const;
virtual bool isTransition() const;
virtual bool isPositioner() const;
virtual bool isSGItem() const;
virtual bool isQuickItem() const;
virtual bool equalGraphicsItem(QGraphicsItem *item) const;

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp
View File

@@ -58,7 +58,7 @@
#include "completecomponentcommand.h"
#include "componentcompletedcommand.h"
#include "createscenecommand.h"
#include "sgitemnodeinstance.h"
#include "quickitemnodeinstance.h"
#include "removesharedmemorycommand.h"
#include "dummycontextobject.h"

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.cpp → share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
View File

@@ -28,7 +28,7 @@
**
**************************************************************************/
#include "sgitemnodeinstance.h"
#include "quickitemnodeinstance.h"
#include "qt5nodeinstanceserver.h"

0
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/sgitemnodeinstance.h → share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
View File

7
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
View File

@@ -38,12 +38,7 @@
#include "qmlstatenodeinstance.h"
#include "anchorchangesnodeinstance.h"
#if QT_VERSION >= 0x050000
#include "sgitemnodeinstance.h"
#else
#include "qmlgraphicsitemnodeinstance.h"
#include "positionernodeinstance.h"
#endif
#include "quickitemnodeinstance.h"
#include "nodeinstanceserver.h"
#include "instancecontainer.h"