diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-11 16:03:12 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-11 16:03:12 +0200 |
commit | f9949f501890a7f8289fcbda85d3a4085bdbb21a (patch) | |
tree | 759e57bb3ed156e46a98c3a4223951c3edc55d43 /src/qtquick1/graphicsitems | |
parent | 1ddef09c351f2899b1662ddd1de190c0d0a8b7bf (diff) | |
parent | 3e0c19d5ba0e4826c3f036c3172d8ea0e30530a6 (diff) |
Merge branch 'master' into refactor
Conflicts:
src/declarative/declarative.pro
src/imports/gestures/gestures.pro
src/imports/inputcontext/inputcontext.pro
src/qtquick1/graphicsitems/qdeclarativeitem.cpp
src/qtquick1/qtquick1.pro
Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
Diffstat (limited to 'src/qtquick1/graphicsitems')
-rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeitem.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp index a4654e4fe8..20b4c11f5b 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp +++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp @@ -59,7 +59,7 @@ #include <QEvent> #include <QGraphicsSceneMouseEvent> #include <QtCore/qnumeric.h> -#include <QtScript/qscriptengine.h> +#include <QtDeclarative/qjsengine.h> #include <private/qv8engine_p.h> #include <QtWidgets/qgraphicstransform.h> @@ -2897,7 +2897,7 @@ QDeclarativeListProperty<QDeclarative1Transition> QDeclarativeItemPrivate::trans If clipping is enabled, an item will clip its own painting, as well as the painting of its children, to its bounding rectangle. If you set - clipping during an item's paint operation, remember to re-set it to + clipping during an item's paint operation, remember to re-set it to prevent clipping the rest of your scene. Non-rectangular clipping regions are not supported for performance reasons. |