Merge remote-tracking branch 'origin/master' into refactor

Conflicts:
	src/declarative/declarative.pro

Change-Id: I9c6d8447e1254c6acd32fa0775ff6a79d0d66acd

diff --cc src/declarative/declarative.pro
index 5db77a7,5e50fa5..d0a3f01
--- 1/src/declarative/declarative.pro
--- 2/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@@ -6,9 -6,7 +6,8 @@@ QPRO_PWD   = $$PW
  CONFIG += module
  MODULE_PRI += ../../modules/qt_declarative.pri
  
 -QT         = core-private gui-private network opengl-private v8-private
 +QT = core-private gui gui-private network widgets-private sql v8-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
  solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2

diff --cc src/declarative/particles/qsgimageparticle.cpp
Simple merge