Merge branch 'master' into refactor

[profile/ivi/qtdeclarative.git] / src / qtquick1 / graphicsitems / qdeclarativeitem.cpp

diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.cpp b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
index a4654e4..20b4c11 100644 (file)
--- 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 <QEvent>
 #include <QGraphicsSceneMouseEvent>
 #include <QtCore/qnumeric.h>

-#include <QtScript/qscriptengine.h>
+#include <QtDeclarative/qjsengine.h>

 
 #include <private/qv8engine_p.h>
 #include <QtWidgets/qgraphicstransform.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
 
   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.
   prevent clipping the rest of your scene.
 
   Non-rectangular clipping regions are not supported for performance reasons.