diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-06 12:20:44 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-06 12:20:44 +0200 |
| commit | a4d714e23d3472a86e39458e7b21d7a71c3d4203 (patch) | |
| tree | 689ca1874cda715b6a7a40c35e1a429c919b9201 /share | |
| parent | 872f87f5e96de8042f2f9b0354ff9f3abbfdf7af (diff) | |
| parent | c77c392cb981505b4cae48a272403c0b36b3bce9 (diff) | |
| download | qt-creator-a4d714e23d3472a86e39458e7b21d7a71c3d4203.tar.gz | |
Merge branch '2.8'
Conflicts:
qtcreator.pri
qtcreator.qbs
tests/system/shared/project.py
tests/system/suite_general/tst_create_proj_wizard/test.py
Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
Diffstat (limited to 'share')
3 files changed, 8 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp index ba61b13bb9..a3f6f6b784 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/graphicsobjectnodeinstance.cpp @@ -30,6 +30,7 @@ #include "graphicsobjectnodeinstance.h" #include <QGraphicsObject> +#include <QDeclarativeItem> #include "private/qgraphicsitem_p.h" #include <private/qdeclarativemetatype_p.h> @@ -302,6 +303,11 @@ void GraphicsObjectNodeInstance::paintRecursively(QGraphicsItem *graphicsItem, Q painter->save(); painter->setTransform(graphicsItem->itemTransform(graphicsItem->parentItem()), true); painter->setOpacity(graphicsItem->opacity() * painter->opacity()); + + QDeclarativeItem *declarativeItem = qobject_cast<QDeclarativeItem *>(graphicsItem); + if (declarativeItem && declarativeItem->clip()) + painter->setClipRect(declarativeItem->boundingRect()); + QStyleOptionGraphicsItem option; initOption(graphicsItem, &option, painter->transform()); graphicsItem->paint(painter, &option); diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp index 561fd77eb3..7da7543d57 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp @@ -453,6 +453,7 @@ void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVar if (hasValidResetBinding(name)) { QDeclarativePropertyPrivate::setBinding(property, 0, QDeclarativePropertyPrivate::BypassInterceptor | QDeclarativePropertyPrivate::DontRemoveBinding); + resetBinding(name)->setEnabled(false); } bool isWritten = property.write(convertSpecialCharacter(fixedValue)); diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp index 2e69baf866..062782031a 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qt4nodeinstanceserver.cpp @@ -113,7 +113,7 @@ bool Qt4NodeInstanceServer::nonInstanceChildIsDirty(QGraphicsObject *graphicsObj continue; QGraphicsItemPrivate *childPrivate = QGraphicsItemPrivate::get(child); - if (childPrivate->dirty || nonInstanceChildIsDirty(childGraphicsObject)) + if (childPrivate->dirty || d->dirtySceneTransform || nonInstanceChildIsDirty(childGraphicsObject)) return true; } } |