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

diff --cc src/declarative/declarative.pro
index c959e4c,2d9248e..7f4255f
--- 1/src/declarative/declarative.pro
--- 2/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@@ -6,7 -6,7 +6,8 @@@ QPRO_PWD   = $$PW
  CONFIG += module
  MODULE_PRI += ../../modules/qt_declarative.pri
  
- QT         = core-private gui-private script-private network script opengl opengl-private widgets-private
 -QT         = core-private gui-private network opengl-private
++QT         = core-private gui-private network opengl opengl-private widgets-private
++
  contains(QT_CONFIG, svg): QT += svg
  DEFINES   += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING
  win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000

diff --cc src/declarative/items/context2d/qsgcontext2d.cpp
Simple merge

diff --cc src/declarative/items/qsgitem.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeengine.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativemetatype.cpp
Simple merge

diff --cc src/imports/gestures/gestures.pro
index 76b31de,d94b402..3b735ef
--- 1/src/imports/gestures/gestures.pro
--- 2/src/imports/gestures/gestures.pro
+++ b/src/imports/gestures/gestures.pro
@@@ -2,7 -2,7 +2,7 @@@ TARGET  = qmlgesturesplugi
  TARGETPATH = Qt/labs/gestures
  include(../qimportbase.pri)
  
- QT += core-private gui-private declarative-private script-private qtquick1 qtquick1-private widgets-private
 -QT += core-private gui-private declarative-private qtquick1 qtquick1-private
++QT += core-private gui-private declarative-private qtquick1 qtquick1-private widgets-private
  
  SOURCES += qdeclarativegesturearea.cpp plugin.cpp
  HEADERS += qdeclarativegesturearea_p.h

diff --cc src/imports/inputcontext/inputcontext.pro
index af0d840,cbad82c..c8641d2
--- 1/src/imports/inputcontext/inputcontext.pro
--- 2/src/imports/inputcontext/inputcontext.pro
+++ b/src/imports/inputcontext/inputcontext.pro
@@@ -2,7 -2,7 +2,7 @@@ TARGET  = qmlinputcontextplugi
  TARGETPATH = Qt/labs/inputcontext
  include(../qimportbase.pri)
  
- QT += declarative script widgets
 -QT += declarative
++QT += declarative widgets
  
  SOURCES += \
          declarativeinputcontext.cpp \

diff --cc src/imports/inputcontext/plugin.cpp
Simple merge

diff --cc src/qtquick1/graphicsitems/qdeclarativeitem.cpp
index a4654e4,494ed46..20b4c11
--- 1/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
--- 2/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
+++ b/src/qtquick1/graphicsitems/qdeclarativeitem.cpp
@@@ -59,11 -59,10 +59,11 @@@
  #include <QEvent>
  #include <QGraphicsSceneMouseEvent>
  #include <QtCore/qnumeric.h>
- #include <QtScript/qscriptengine.h>
+ #include <QtDeclarative/qjsengine.h>
 -#include <QtGui/qgraphicstransform.h>
  
  #include <private/qv8engine_p.h>
 +#include <QtWidgets/qgraphicstransform.h>
 +#include <private/qlistmodelinterface_p.h>
  
  #include <float.h>
  
@@@ -2897,7 -2896,7 +2897,7 @@@ QDeclarativeListProperty<QDeclarative1T
  
    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.

diff --cc src/qtquick1/qtquick1.pro
index e7db606,7fc670f..2e3113e
--- 1/src/qtquick1/qtquick1.pro
--- 2/src/qtquick1/qtquick1.pro
+++ b/src/qtquick1/qtquick1.pro
@@@ -7,8 -7,8 +7,7 @@@ CONFIG += modul
  CONFIG += dll warn_on
  MODULE_PRI += ../../modules/qt_qtquick1.pri
  
- QT += testlib-private declarative script testlib declarative-private core-private gui-private script-private network widgets-private
- DEFINES += QT_NO_URL_CAST_FROM_STRING
 -QT += testlib-private declarative testlib declarative-private core-private gui-private network
 -DEFINES += QT_NO_URL_CAST_FROM_STRING
++QT += testlib-private declarative testlib declarative-private core-private gui-private network widgets-private
  
  load(qt_module_config)
  

diff --cc src/qtquick1/util/qdeclarativeview.cpp
Simple merge