Merge branch 'master' into qtquick2

Conflicts:
	src/imports/particles/particles.pro

diff --cc modules/qt_declarative.pri
Simple merge

diff --cc src/declarative/declarative.pro
index 8a0ae71,4c2e380..0a1f76a
--- 1/src/declarative/declarative.pro
--- 2/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@@ -2,7 -2,11 +2,11 @@@ load(qt_module
  
  TARGET     = QtDeclarative
  QPRO_PWD   = $$PWD
- QT         = core gui script network
+ 
+ CONFIG += module
+ MODULE_PRI += ../../modules/qt_declarative.pri
+ 
 -QT         = core-private gui-private script-private network
++QT         = core-private gui-private script-private network script opengl-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/imports/particles/particles.pro
index c04e640,5f39b08..6eea892
--- 1/src/imports/particles/particles.pro
--- 2/src/imports/particles/particles.pro
+++ b/src/imports/particles/particles.pro
@@@ -2,106 -2,14 +2,108 @@@ TARGET  = qmlparticlesplugi
  TARGETPATH = Qt/labs/particles
  include(../qimportbase.pri)
  
 +HEADERS += \
 +    V1/qdeclarativeparticles_p.h \
 +    spritestate.h \
 +    pluginmain.h \
 +    particleaffector.h \
 +    wanderaffector.h \
 +    #rockingaffector.h \
 +    #scalingaffector.h \
 +    driftaffector.h \
 +    particleemitter.h \
 +    particlesystem.h \
 +    trailsemitter.h \
 +    #spriteemitter.h \
 +    particle.h \
 +    coloredparticle.h \
 +    spriteparticle.h \
 +    spritegoalaffector.h \
 +    #zoneaffector.h \
 +    frictionaffector.h \
 +    gravitationalsingularityaffector.h \
 +    killaffector.h \
 +    speedlimitaffector.h \
 +    spriteengine.h \
 +    gravityaffector.h \
 +    attractoraffector.h \
 +    meanderaffector.h \
 +    #toggleaffector.h \
 +    spriteimage.h \
 +    #pairedparticle.h \
 +    followemitter.h \
 +    swarmaffector.h \
 +    turbulenceaffector.h \
 +    particleextruder.h \
 +    ellipseextruder.h \
 +    maskextruder.h \
 +    varyingvector.h \
 +    pointvector.h \
 +    angledvector.h \
 +    directedvector.h \
 +    modelparticle.h \
 +    eternalaffector.h \
 +    lineextruder.h \
 +    resetaffector.h \
 +    deformableparticle.h \
 +    pictureaffector.h
 +
+ QT += core-private gui-private declarative-private
+ 
  SOURCES += \
 -    qdeclarativeparticles.cpp \
 -    particles.cpp
 +    V1/qdeclarativeparticles.cpp \
 +    spritestate.cpp \
 +    main.cpp \
 +    particleaffector.cpp \
 +    wanderaffector.cpp \
 +    #rockingaffector.cpp \
 +    #scalingaffector.cpp \
 +    driftaffector.cpp \
 +    particleemitter.cpp \
 +    particlesystem.cpp \
 +    trailsemitter.cpp \
 +    #spriteemitter.cpp \
 +    particle.cpp \
 +    coloredparticle.cpp \
 +    spriteparticle.cpp \
 +    spritegoalaffector.cpp \
 +    #zoneaffector.cpp \
 +    frictionaffector.cpp \
 +    gravitationalsingularityaffector.cpp \
 +    killaffector.cpp \
 +    speedlimitaffector.cpp \
 +    spriteengine.cpp \
 +    gravityaffector.cpp \
 +    attractoraffector.cpp \
 +    meanderaffector.cpp \
 +    #toggleaffector.cpp \
 +    spriteimage.cpp \
 +    #pairedparticle.cpp \
 +    followemitter.cpp \
 +    swarmaffector.cpp \
 +    turbulenceaffector.cpp \
 +    particleextruder.cpp \
 +    ellipseextruder.cpp \
 +    maskextruder.cpp \
 +    varyingvector.cpp \
 +    pointvector.cpp \
 +    angledvector.cpp \
 +    directedvector.cpp \
 +    modelparticle.cpp \
 +    eternalaffector.cpp \
 +    lineextruder.cpp \
 +    resetaffector.cpp \
 +    deformableparticle.cpp \
 +    pictureaffector.cpp
  
 -HEADERS += \
 -    qdeclarativeparticles_p.h
 +QT += declarative opengl
 +
 +
 +OTHER_FILES += \
 +    qmldir
 +
 +RESOURCES += \
 +    spriteparticles.qrc
  
  DESTDIR = $$QT.declarative.imports/$$TARGETPATH
  target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH