aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/quick/qtquick.qdoc52
-rw-r--r--examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp2
-rw-r--r--examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro2
-rw-r--r--examples/declarative/minehunt/main.cpp2
-rw-r--r--examples/declarative/minehunt/minehunt.pro2
-rw-r--r--examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro4
-rw-r--r--examples/declarative/modelviews/abstractitemmodel/main.cpp4
-rw-r--r--examples/declarative/modelviews/objectlistmodel/main.cpp4
-rw-r--r--examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro2
-rw-r--r--examples/declarative/modelviews/stringlistmodel/main.cpp4
-rw-r--r--examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro2
-rw-r--r--examples/declarative/openglunderqml/main.cpp2
-rw-r--r--examples/declarative/openglunderqml/openglunderqml.pro2
-rw-r--r--examples/declarative/openglunderqml/squircle.cpp4
-rw-r--r--examples/declarative/openglunderqml/squircle.h2
-rw-r--r--examples/declarative/painteditem/smile/main.cpp4
-rw-r--r--examples/declarative/painteditem/smile/smile.pro2
-rw-r--r--examples/declarative/painteditem/textballoons/textballoon.h2
-rw-r--r--examples/declarative/painteditem/textballoons/textballoons.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter1-basics/main.cpp2
-rw-r--r--examples/declarative/tutorials/extending/chapter1-basics/piechart.h2
-rw-r--r--examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter2-methods/main.cpp2
-rw-r--r--examples/declarative/tutorials/extending/chapter2-methods/piechart.h2
-rw-r--r--examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter3-bindings/main.cpp2
-rw-r--r--examples/declarative/tutorials/extending/chapter3-bindings/piechart.h2
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp2
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h2
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h2
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp2
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h2
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h2
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/piechart.h2
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h2
-rw-r--r--modules/qt_quick.pri17
-rw-r--r--src/declarative/debugger/qdeclarativeenginedebugservice_p.h2
-rw-r--r--src/declarative/declarative.pro7
-rw-r--r--src/declarative/designer/designersupport.cpp408
-rw-r--r--src/declarative/designer/designersupport.h153
-rw-r--r--src/declarative/items/context2d/qquickcanvasitem.cpp714
-rw-r--r--src/declarative/items/context2d/qquickcanvasitem_p.h149
-rw-r--r--src/declarative/items/context2d/qquickcontext2d.cpp3540
-rw-r--r--src/declarative/items/context2d/qquickcontext2d_p.h211
-rw-r--r--src/declarative/items/context2d/qquickcontext2dcommandbuffer_p.h268
-rw-r--r--src/declarative/items/context2d/qquickcontext2dnode.cpp124
-rw-r--r--src/declarative/items/context2d/qquickcontext2dnode_p.h86
-rw-r--r--src/declarative/items/context2d/qquickcontext2dtexture.cpp778
-rw-r--r--src/declarative/items/context2d/qquickcontext2dtexture_p.h205
-rw-r--r--src/declarative/items/context2d/qquickcontext2dtile_p.h112
-rw-r--r--src/declarative/items/qquickanchors_p.h201
-rw-r--r--src/declarative/items/qquickanimatedimage_p.h117
-rw-r--r--src/declarative/items/qquickanimation_p.h209
-rw-r--r--src/declarative/items/qquickborderimage_p.h110
-rw-r--r--src/declarative/items/qquickcanvas.cpp2644
-rw-r--r--src/declarative/items/qquickcanvas.h164
-rw-r--r--src/declarative/items/qquickcanvas_p.h323
-rw-r--r--src/declarative/items/qquickclipnode_p.h71
-rw-r--r--src/declarative/items/qquickdrag.cpp462
-rw-r--r--src/declarative/items/qquickdrag_p.h208
-rw-r--r--src/declarative/items/qquickdroparea_p.h167
-rw-r--r--src/declarative/items/qquickevents_p_p.h144
-rw-r--r--src/declarative/items/qquickflickable_p.h277
-rw-r--r--src/declarative/items/qquickflipable_p.h104
-rw-r--r--src/declarative/items/qquickfocusscope_p.h68
-rw-r--r--src/declarative/items/qquickgridview_p.h146
-rw-r--r--src/declarative/items/qquickimage.cpp746
-rw-r--r--src/declarative/items/qquickimage_p.h122
-rw-r--r--src/declarative/items/qquickimagebase_p_p.h93
-rw-r--r--src/declarative/items/qquickitem.cpp5236
-rw-r--r--src/declarative/items/qquickitem.h421
-rw-r--r--src/declarative/items/qquickitem_p.h752
-rw-r--r--src/declarative/items/qquickitemsmodule.cpp241
-rw-r--r--src/declarative/items/qquickitemsmodule_p.h65
-rw-r--r--src/declarative/items/qquickitemview_p.h296
-rw-r--r--src/declarative/items/qquickitemview_p_p.h260
-rw-r--r--src/declarative/items/qquicklistview_p.h215
-rw-r--r--src/declarative/items/qquickloader_p.h123
-rw-r--r--src/declarative/items/qquickmousearea_p.h231
-rw-r--r--src/declarative/items/qquickmultipointtoucharea.cpp729
-rw-r--r--src/declarative/items/qquickmultipointtoucharea_p.h267
-rw-r--r--src/declarative/items/qquickninepatchnode_p.h98
-rw-r--r--src/declarative/items/qquickpainteditem.cpp528
-rw-r--r--src/declarative/items/qquickpainteditem.h130
-rw-r--r--src/declarative/items/qquickpathview.cpp1781
-rw-r--r--src/declarative/items/qquickpathview_p.h259
-rw-r--r--src/declarative/items/qquickpincharea_p.h315
-rw-r--r--src/declarative/items/qquickpositioners.cpp1532
-rw-r--r--src/declarative/items/qquickpositioners_p.h295
-rw-r--r--src/declarative/items/qquickpositioners_p_p.h164
-rw-r--r--src/declarative/items/qquickrectangle.cpp556
-rw-r--r--src/declarative/items/qquickrectangle_p.h189
-rw-r--r--src/declarative/items/qquickrepeater_p.h112
-rw-r--r--src/declarative/items/qquickscalegrid_p_p.h134
-rw-r--r--src/declarative/items/qquickshadereffect.cpp763
-rw-r--r--src/declarative/items/qquickshadereffect_p.h158
-rw-r--r--src/declarative/items/qquickshadereffectmesh.cpp216
-rw-r--r--src/declarative/items/qquickshadereffectmesh_p.h103
-rw-r--r--src/declarative/items/qquickshadereffectnode.cpp317
-rw-r--r--src/declarative/items/qquickshadereffectnode_p.h151
-rw-r--r--src/declarative/items/qquickshadereffectsource.cpp921
-rw-r--r--src/declarative/items/qquickshadereffectsource_p.h259
-rw-r--r--src/declarative/items/qquicksprite_p.h136
-rw-r--r--src/declarative/items/qquickspriteengine_p.h323
-rw-r--r--src/declarative/items/qquickspriteimage.cpp455
-rw-r--r--src/declarative/items/qquickspriteimage_p.h140
-rw-r--r--src/declarative/items/qquickstateoperations_p.h275
-rw-r--r--src/declarative/items/qquicktext.cpp1950
-rw-r--r--src/declarative/items/qquicktext_p.h252
-rw-r--r--src/declarative/items/qquicktextedit.cpp2091
-rw-r--r--src/declarative/items/qquicktextedit_p.h314
-rw-r--r--src/declarative/items/qquicktextinput.cpp2007
-rw-r--r--src/declarative/items/qquicktextinput_p.h302
-rw-r--r--src/declarative/items/qquicktextnode.cpp1344
-rw-r--r--src/declarative/items/qquicktextnode_p.h110
-rw-r--r--src/declarative/items/qquicktranslate_p.h162
-rw-r--r--src/declarative/items/qquickview.cpp539
-rw-r--r--src/declarative/items/qquickview.h120
-rw-r--r--src/declarative/items/qquickview_p.h105
-rw-r--r--src/declarative/items/qquickvisualdatamodel_p.h242
-rw-r--r--src/declarative/items/qquickvisualitemmodel_p.h175
-rw-r--r--src/declarative/items/qquickwindowmodule.cpp55
-rw-r--r--src/declarative/particles/qquickage_p.h102
-rw-r--r--src/declarative/particles/qquickangledirection_p.h133
-rw-r--r--src/declarative/particles/qquickcumulativedirection_p.h69
-rw-r--r--src/declarative/particles/qquickcustomaffector_p.h164
-rw-r--r--src/declarative/particles/qquickcustomparticle.cpp596
-rw-r--r--src/declarative/particles/qquickcustomparticle_p.h121
-rw-r--r--src/declarative/particles/qquickdirection_p.h71
-rw-r--r--src/declarative/particles/qquickellipseextruder_p.h86
-rw-r--r--src/declarative/particles/qquickfriction_p.h104
-rw-r--r--src/declarative/particles/qquickgravity_p.h118
-rw-r--r--src/declarative/particles/qquickgroupgoal_p.h102
-rw-r--r--src/declarative/particles/qquickimageparticle.cpp1803
-rw-r--r--src/declarative/particles/qquickimageparticle_p.h429
-rw-r--r--src/declarative/particles/qquickitemparticle.cpp269
-rw-r--r--src/declarative/particles/qquickitemparticle_p.h138
-rw-r--r--src/declarative/particles/qquickmaskextruder_p.h97
-rw-r--r--src/declarative/particles/qquickparticleaffector_p.h201
-rw-r--r--src/declarative/particles/qquickparticleemitter_p.h351
-rw-r--r--src/declarative/particles/qquickparticleextruder_p.h73
-rw-r--r--src/declarative/particles/qquickparticlepainter_p.h132
-rw-r--r--src/declarative/particles/qquickparticlesmodule_p.h63
-rw-r--r--src/declarative/particles/qquickparticlesystem.cpp1106
-rw-r--r--src/declarative/particles/qquickparticlesystem_p.h380
-rw-r--r--src/declarative/particles/qquickpointattractor_p.h169
-rw-r--r--src/declarative/particles/qquickpointdirection_p.h135
-rw-r--r--src/declarative/particles/qquickrectangleextruder_p.h88
-rw-r--r--src/declarative/particles/qquickspritegoal_p.h125
-rw-r--r--src/declarative/particles/qquicktargetdirection_p.h191
-rw-r--r--src/declarative/particles/qquicktrailemitter_p.h171
-rw-r--r--src/declarative/particles/qquickturbulence_p.h119
-rw-r--r--src/declarative/particles/qquickv8particledata_p.h69
-rw-r--r--src/declarative/particles/qquickwander_p.h161
-rw-r--r--src/declarative/qml/qdeclarativecomponent_p.h2
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp6
-rw-r--r--src/declarative/qml/qdeclarativeexpression_p.h2
-rw-r--r--src/declarative/qml/qdeclarativemetatype.cpp1
-rw-r--r--src/declarative/qtquick2.cpp193
-rw-r--r--src/declarative/qtquick2_p.h63
-rw-r--r--src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h123
-rw-r--r--src/declarative/scenegraph/coreapi/qsggeometry.h295
-rw-r--r--src/declarative/scenegraph/coreapi/qsgmaterial.h144
-rw-r--r--src/declarative/scenegraph/coreapi/qsgnode.cpp1264
-rw-r--r--src/declarative/scenegraph/coreapi/qsgnode.h348
-rw-r--r--src/declarative/scenegraph/coreapi/qsgnodeupdater_p.h86
-rw-r--r--src/declarative/scenegraph/coreapi/qsgrenderer_p.h234
-rw-r--r--src/declarative/scenegraph/qsgadaptationlayer.cpp315
-rw-r--r--src/declarative/scenegraph/qsgadaptationlayer_p.h257
-rw-r--r--src/declarative/scenegraph/qsgcontext.cpp512
-rw-r--r--src/declarative/scenegraph/qsgcontext_p.h144
-rw-r--r--src/declarative/scenegraph/qsgcontextplugin.cpp104
-rw-r--r--src/declarative/scenegraph/qsgcontextplugin_p.h81
-rw-r--r--src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache.cpp324
-rw-r--r--src/declarative/scenegraph/qsgdefaultdistancefieldglyphcache_p.h165
-rw-r--r--src/declarative/scenegraph/qsgdefaultglyphnode_p.cpp306
-rw-r--r--src/declarative/scenegraph/qsgdefaultglyphnode_p.h87
-rw-r--r--src/declarative/scenegraph/qsgdefaultglyphnode_p_p.h96
-rw-r--r--src/declarative/scenegraph/qsgdefaultimagenode.cpp293
-rw-r--r--src/declarative/scenegraph/qsgdefaultimagenode_p.h90
-rw-r--r--src/declarative/scenegraph/qsgdefaultrectanglenode.cpp548
-rw-r--r--src/declarative/scenegraph/qsgdefaultrectanglenode_p.h108
-rw-r--r--src/declarative/scenegraph/qsgdistancefieldglyphnode.cpp316
-rw-r--r--src/declarative/scenegraph/qsgdistancefieldglyphnode_p.cpp725
-rw-r--r--src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h107
-rw-r--r--src/declarative/scenegraph/qsgdistancefieldglyphnode_p_p.h140
-rw-r--r--src/declarative/scenegraph/qsgflashnode_p.h69
-rw-r--r--src/declarative/scenegraph/util/qsgareaallocator_p.h73
-rw-r--r--src/declarative/scenegraph/util/qsgdistancefieldutil.cpp805
-rw-r--r--src/declarative/scenegraph/util/qsgdistancefieldutil_p.h111
-rw-r--r--src/declarative/scenegraph/util/qsgengine.cpp115
-rw-r--r--src/declarative/scenegraph/util/qsgengine.h102
-rw-r--r--src/declarative/scenegraph/util/qsgflatcolormaterial.cpp202
-rw-r--r--src/declarative/scenegraph/util/qsgflatcolormaterial.h74
-rw-r--r--src/declarative/scenegraph/util/qsgpainternode.cpp464
-rw-r--r--src/declarative/scenegraph/util/qsgpainternode_p.h160
-rw-r--r--src/declarative/scenegraph/util/qsgsimplematerial.h222
-rw-r--r--src/declarative/scenegraph/util/qsgsimplerectnode.h77
-rw-r--r--src/declarative/scenegraph/util/qsgsimpletexturenode.cpp154
-rw-r--r--src/declarative/scenegraph/util/qsgsimpletexturenode.h82
-rw-r--r--src/declarative/scenegraph/util/qsgtexture.cpp541
-rw-r--r--src/declarative/scenegraph/util/qsgtexture.h133
-rw-r--r--src/declarative/scenegraph/util/qsgtexture_p.h118
-rw-r--r--src/declarative/scenegraph/util/qsgtexturematerial.h102
-rw-r--r--src/declarative/scenegraph/util/qsgtexturematerial_p.h73
-rw-r--r--src/declarative/scenegraph/util/qsgtextureprovider_p.h68
-rw-r--r--src/declarative/scenegraph/util/qsgvertexcolormaterial.cpp173
-rw-r--r--src/declarative/scenegraph/util/qsgvertexcolormaterial.h69
-rw-r--r--src/declarative/util/qdeclarativeanimation_p.h458
-rw-r--r--src/declarative/util/qdeclarativebehavior_p.h97
-rw-r--r--src/declarative/util/qdeclarativebind_p.h98
-rw-r--r--src/declarative/util/qdeclarativeconnections_p.h102
-rw-r--r--src/declarative/util/qdeclarativefontloader_p.h97
-rw-r--r--src/declarative/util/qdeclarativelistaccessor_p.h80
-rw-r--r--src/declarative/util/qdeclarativepackage_p.h98
-rw-r--r--src/declarative/util/qdeclarativepath_p.h452
-rw-r--r--src/declarative/util/qdeclarativepathinterpolator_p.h100
-rw-r--r--src/declarative/util/qdeclarativepixmapcache.cpp1241
-rw-r--r--src/declarative/util/qdeclarativepixmapcache_p.h143
-rw-r--r--src/declarative/util/qdeclarativepropertychanges_p.h112
-rw-r--r--src/declarative/util/qdeclarativesmoothedanimation_p.h103
-rw-r--r--src/declarative/util/qdeclarativespringanimation_p.h111
-rw-r--r--src/declarative/util/qdeclarativestate_p.h210
-rw-r--r--src/declarative/util/qdeclarativestategroup_p.h97
-rw-r--r--src/declarative/util/qdeclarativestateoperations_p.h88
-rw-r--r--src/declarative/util/qdeclarativesystempalette_p.h122
-rw-r--r--src/declarative/util/qdeclarativetimer_p.h115
-rw-r--r--src/declarative/util/qdeclarativetransition_p.h111
-rw-r--r--src/declarative/util/qdeclarativeutilmodule_p.h63
-rw-r--r--src/declarative/util/util.pri60
-rw-r--r--src/imports/etcprovider/etcprovider.pro2
-rw-r--r--src/imports/etcprovider/qetcprovider.h2
-rw-r--r--src/imports/imports.pro4
-rw-r--r--src/imports/qtquick2/plugin.cpp68
-rw-r--r--src/imports/qtquick2/qmldir1
-rw-r--r--src/imports/qtquick2/qtquick2.pro19
-rw-r--r--src/imports/testlib/main.cpp2
-rw-r--r--src/imports/testlib/testlib.pro2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/sghighlight.h2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/sgselectiontool.cpp4
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/sgviewinspector.cpp6
-rw-r--r--src/qmltest/qmltest.pro2
-rw-r--r--src/qmltest/quicktest.cpp2
-rw-r--r--src/qmltest/quicktestevent.cpp4
-rw-r--r--src/quick/designer/designer.pri (renamed from src/declarative/designer/designer.pri)0
-rw-r--r--src/quick/designer/designersupport.cpp408
-rw-r--r--src/quick/designer/designersupport.h152
-rwxr-xr-xsrc/quick/items/checksync.pl (renamed from src/declarative/items/checksync.pl)0
-rw-r--r--src/quick/items/context2d/context2d.pri (renamed from src/declarative/items/context2d/context2d.pri)0
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp714
-rw-r--r--src/quick/items/context2d/qquickcanvasitem_p.h148
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp3540
-rw-r--r--src/quick/items/context2d/qquickcontext2d_p.h210
-rw-r--r--src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp (renamed from src/declarative/items/context2d/qquickcontext2dcommandbuffer.cpp)0
-rw-r--r--src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h266
-rw-r--r--src/quick/items/context2d/qquickcontext2dnode.cpp124
-rw-r--r--src/quick/items/context2d/qquickcontext2dnode_p.h84
-rw-r--r--src/quick/items/context2d/qquickcontext2dtexture.cpp778
-rw-r--r--src/quick/items/context2d/qquickcontext2dtexture_p.h203
-rw-r--r--src/quick/items/context2d/qquickcontext2dtile.cpp (renamed from src/declarative/items/context2d/qquickcontext2dtile.cpp)0
-rw-r--r--src/quick/items/context2d/qquickcontext2dtile_p.h110
-rw-r--r--src/quick/items/items.pri (renamed from src/declarative/items/items.pri)0
-rw-r--r--src/quick/items/qquickanchors.cpp (renamed from src/declarative/items/qquickanchors.cpp)0
-rw-r--r--src/quick/items/qquickanchors_p.h199
-rw-r--r--src/quick/items/qquickanchors_p_p.h (renamed from src/declarative/items/qquickanchors_p_p.h)0
-rw-r--r--src/quick/items/qquickanimatedimage.cpp (renamed from src/declarative/items/qquickanimatedimage.cpp)0
-rw-r--r--src/quick/items/qquickanimatedimage_p.h115
-rw-r--r--src/quick/items/qquickanimatedimage_p_p.h (renamed from src/declarative/items/qquickanimatedimage_p_p.h)0
-rw-r--r--src/quick/items/qquickanimation.cpp (renamed from src/declarative/items/qquickanimation.cpp)0
-rw-r--r--src/quick/items/qquickanimation_p.h207
-rw-r--r--src/quick/items/qquickanimation_p_p.h (renamed from src/declarative/items/qquickanimation_p_p.h)0
-rw-r--r--src/quick/items/qquickborderimage.cpp (renamed from src/declarative/items/qquickborderimage.cpp)0
-rw-r--r--src/quick/items/qquickborderimage_p.h108
-rw-r--r--src/quick/items/qquickborderimage_p_p.h (renamed from src/declarative/items/qquickborderimage_p_p.h)0
-rw-r--r--src/quick/items/qquickcanvas.cpp2646
-rw-r--r--src/quick/items/qquickcanvas.h163
-rw-r--r--src/quick/items/qquickcanvas_p.h323
-rw-r--r--src/quick/items/qquickclipnode.cpp (renamed from src/declarative/items/qquickclipnode.cpp)0
-rw-r--r--src/quick/items/qquickclipnode_p.h71
-rw-r--r--src/quick/items/qquickdrag.cpp462
-rw-r--r--src/quick/items/qquickdrag_p.h206
-rw-r--r--src/quick/items/qquickdroparea.cpp (renamed from src/declarative/items/qquickdroparea.cpp)0
-rw-r--r--src/quick/items/qquickdroparea_p.h165
-rw-r--r--src/quick/items/qquickevents.cpp (renamed from src/declarative/items/qquickevents.cpp)0
-rw-r--r--src/quick/items/qquickevents_p_p.h145
-rw-r--r--src/quick/items/qquickflickable.cpp (renamed from src/declarative/items/qquickflickable.cpp)0
-rw-r--r--src/quick/items/qquickflickable_p.h275
-rw-r--r--src/quick/items/qquickflickable_p_p.h (renamed from src/declarative/items/qquickflickable_p_p.h)0
-rw-r--r--src/quick/items/qquickflipable.cpp (renamed from src/declarative/items/qquickflipable.cpp)0
-rw-r--r--src/quick/items/qquickflipable_p.h102
-rw-r--r--src/quick/items/qquickfocusscope.cpp (renamed from src/declarative/items/qquickfocusscope.cpp)0
-rw-r--r--src/quick/items/qquickfocusscope_p.h66
-rw-r--r--src/quick/items/qquickgridview.cpp (renamed from src/declarative/items/qquickgridview.cpp)0
-rw-r--r--src/quick/items/qquickgridview_p.h145
-rw-r--r--src/quick/items/qquickimage.cpp746
-rw-r--r--src/quick/items/qquickimage_p.h120
-rw-r--r--src/quick/items/qquickimage_p_p.h (renamed from src/declarative/items/qquickimage_p_p.h)0
-rw-r--r--src/quick/items/qquickimagebase.cpp (renamed from src/declarative/items/qquickimagebase.cpp)0
-rw-r--r--src/quick/items/qquickimagebase_p.h (renamed from src/declarative/items/qquickimagebase_p.h)0
-rw-r--r--src/quick/items/qquickimagebase_p_p.h93
-rw-r--r--src/quick/items/qquickimplicitsizeitem.cpp (renamed from src/declarative/items/qquickimplicitsizeitem.cpp)0
-rw-r--r--src/quick/items/qquickimplicitsizeitem_p.h (renamed from src/declarative/items/qquickimplicitsizeitem_p.h)0
-rw-r--r--src/quick/items/qquickimplicitsizeitem_p_p.h (renamed from src/declarative/items/qquickimplicitsizeitem_p_p.h)0
-rw-r--r--src/quick/items/qquickitem.cpp5238
-rw-r--r--src/quick/items/qquickitem.h420
-rw-r--r--src/quick/items/qquickitem_p.h752
-rw-r--r--src/quick/items/qquickitemchangelistener_p.h (renamed from src/declarative/items/qquickitemchangelistener_p.h)0
-rw-r--r--src/quick/items/qquickitemsmodule.cpp241
-rw-r--r--src/quick/items/qquickitemsmodule_p.h63
-rw-r--r--src/quick/items/qquickitemview.cpp (renamed from src/declarative/items/qquickitemview.cpp)0
-rw-r--r--src/quick/items/qquickitemview_p.h294
-rw-r--r--src/quick/items/qquickitemview_p_p.h258
-rw-r--r--src/quick/items/qquicklistview.cpp (renamed from src/declarative/items/qquicklistview.cpp)0
-rw-r--r--src/quick/items/qquicklistview_p.h213
-rw-r--r--src/quick/items/qquickloader.cpp (renamed from src/declarative/items/qquickloader.cpp)0
-rw-r--r--src/quick/items/qquickloader_p.h121
-rw-r--r--src/quick/items/qquickloader_p_p.h (renamed from src/declarative/items/qquickloader_p_p.h)0
-rw-r--r--src/quick/items/qquickmousearea.cpp (renamed from src/declarative/items/qquickmousearea.cpp)0
-rw-r--r--src/quick/items/qquickmousearea_p.h229
-rw-r--r--src/quick/items/qquickmousearea_p_p.h (renamed from src/declarative/items/qquickmousearea_p_p.h)0
-rw-r--r--src/quick/items/qquickmultipointtoucharea.cpp729
-rw-r--r--src/quick/items/qquickmultipointtoucharea_p.h265
-rw-r--r--src/quick/items/qquickninepatchnode.cpp (renamed from src/declarative/items/qquickninepatchnode.cpp)0
-rw-r--r--src/quick/items/qquickninepatchnode_p.h98
-rw-r--r--src/quick/items/qquickpainteditem.cpp528
-rw-r--r--src/quick/items/qquickpainteditem.h130
-rw-r--r--src/quick/items/qquickpainteditem_p.h (renamed from src/declarative/items/qquickpainteditem_p.h)0
-rw-r--r--src/quick/items/qquickpathview.cpp1781
-rw-r--r--src/quick/items/qquickpathview_p.h257
-rw-r--r--src/quick/items/qquickpathview_p_p.h (renamed from src/declarative/items/qquickpathview_p_p.h)0
-rw-r--r--src/quick/items/qquickpincharea.cpp (renamed from src/declarative/items/qquickpincharea.cpp)0
-rw-r--r--src/quick/items/qquickpincharea_p.h313
-rw-r--r--src/quick/items/qquickpincharea_p_p.h (renamed from src/declarative/items/qquickpincharea_p_p.h)0
-rw-r--r--src/quick/items/qquickpositioners.cpp1532
-rw-r--r--src/quick/items/qquickpositioners_p.h293
-rw-r--r--src/quick/items/qquickpositioners_p_p.h164
-rw-r--r--src/quick/items/qquickrectangle.cpp556
-rw-r--r--src/quick/items/qquickrectangle_p.h188
-rw-r--r--src/quick/items/qquickrectangle_p_p.h (renamed from src/declarative/items/qquickrectangle_p_p.h)0
-rw-r--r--src/quick/items/qquickrepeater.cpp (renamed from src/declarative/items/qquickrepeater.cpp)0
-rw-r--r--src/quick/items/qquickrepeater_p.h110
-rw-r--r--src/quick/items/qquickrepeater_p_p.h (renamed from src/declarative/items/qquickrepeater_p_p.h)0
-rw-r--r--src/quick/items/qquickscalegrid.cpp (renamed from src/declarative/items/qquickscalegrid.cpp)0
-rw-r--r--src/quick/items/qquickscalegrid_p_p.h132
-rw-r--r--src/quick/items/qquickshadereffect.cpp763
-rw-r--r--src/quick/items/qquickshadereffect_p.h156
-rw-r--r--src/quick/items/qquickshadereffectmesh.cpp216
-rw-r--r--src/quick/items/qquickshadereffectmesh_p.h102
-rw-r--r--src/quick/items/qquickshadereffectnode.cpp317
-rw-r--r--src/quick/items/qquickshadereffectnode_p.h149
-rw-r--r--src/quick/items/qquickshadereffectsource.cpp921
-rw-r--r--src/quick/items/qquickshadereffectsource_p.h257
-rw-r--r--src/quick/items/qquicksprite.cpp (renamed from src/declarative/items/qquicksprite.cpp)0
-rw-r--r--src/quick/items/qquicksprite_p.h133
-rw-r--r--src/quick/items/qquickspriteengine.cpp (renamed from src/declarative/items/qquickspriteengine.cpp)0
-rw-r--r--src/quick/items/qquickspriteengine_p.h321
-rw-r--r--src/quick/items/qquickspriteimage.cpp455
-rw-r--r--src/quick/items/qquickspriteimage_p.h138
-rw-r--r--src/quick/items/qquickstateoperations.cpp (renamed from src/declarative/items/qquickstateoperations.cpp)0
-rw-r--r--src/quick/items/qquickstateoperations_p.h273
-rw-r--r--src/quick/items/qquicktext.cpp1950
-rw-r--r--src/quick/items/qquicktext_p.h251
-rw-r--r--src/quick/items/qquicktext_p_p.h (renamed from src/declarative/items/qquicktext_p_p.h)0
-rw-r--r--src/quick/items/qquicktextedit.cpp2091
-rw-r--r--src/quick/items/qquicktextedit_p.h312
-rw-r--r--src/quick/items/qquicktextedit_p_p.h (renamed from src/declarative/items/qquicktextedit_p_p.h)0
-rw-r--r--src/quick/items/qquicktextinput.cpp2007
-rw-r--r--src/quick/items/qquicktextinput_p.h300
-rw-r--r--src/quick/items/qquicktextinput_p_p.h (renamed from src/declarative/items/qquicktextinput_p_p.h)0
-rw-r--r--src/quick/items/qquicktextnode.cpp1344
-rw-r--r--src/quick/items/qquicktextnode_p.h110
-rw-r--r--src/quick/items/qquicktranslate.cpp (renamed from src/declarative/items/qquicktranslate.cpp)0
-rw-r--r--src/quick/items/qquicktranslate_p.h160
-rw-r--r--src/quick/items/qquickview.cpp541
-rw-r--r--src/quick/items/qquickview.h118
-rw-r--r--src/quick/items/qquickview_p.h103
-rw-r--r--src/quick/items/qquickvisualadaptormodel.cpp (renamed from src/declarative/items/qquickvisualadaptormodel.cpp)0
-rw-r--r--src/quick/items/qquickvisualadaptormodel_p.h (renamed from src/declarative/items/qquickvisualadaptormodel_p.h)0
-rw-r--r--src/quick/items/qquickvisualdatamodel.cpp (renamed from src/declarative/items/qquickvisualdatamodel.cpp)0
-rw-r--r--src/quick/items/qquickvisualdatamodel_p.h239
-rw-r--r--src/quick/items/qquickvisualitemmodel.cpp (renamed from src/declarative/items/qquickvisualitemmodel.cpp)0
-rw-r--r--src/quick/items/qquickvisualitemmodel_p.h174
-rw-r--r--src/quick/items/qquickwindowmodule.cpp55
-rw-r--r--src/quick/items/qquickwindowmodule_p.h (renamed from src/declarative/items/qquickwindowmodule_p.h)0
-rw-r--r--src/quick/items/syncexcludes (renamed from src/declarative/items/syncexcludes)0
-rw-r--r--src/quick/particles/particleresources/noise.png (renamed from src/declarative/particles/particleresources/noise.png)bin19477 -> 19477 bytes
-rw-r--r--src/quick/particles/particles.pri (renamed from src/declarative/particles/particles.pri)0
-rw-r--r--src/quick/particles/particles.qrc (renamed from src/declarative/particles/particles.qrc)0
-rw-r--r--src/quick/particles/qquickage.cpp (renamed from src/declarative/particles/qquickage.cpp)0
-rw-r--r--src/quick/particles/qquickage_p.h99
-rw-r--r--src/quick/particles/qquickangledirection.cpp (renamed from src/declarative/particles/qquickangledirection.cpp)0
-rw-r--r--src/quick/particles/qquickangledirection_p.h131
-rw-r--r--src/quick/particles/qquickcumulativedirection.cpp (renamed from src/declarative/particles/qquickcumulativedirection.cpp)0
-rw-r--r--src/quick/particles/qquickcumulativedirection_p.h67
-rw-r--r--src/quick/particles/qquickcustomaffector.cpp (renamed from src/declarative/particles/qquickcustomaffector.cpp)0
-rw-r--r--src/quick/particles/qquickcustomaffector_p.h162
-rw-r--r--src/quick/particles/qquickcustomparticle.cpp596
-rw-r--r--src/quick/particles/qquickcustomparticle_p.h119
-rw-r--r--src/quick/particles/qquickdirection.cpp (renamed from src/declarative/particles/qquickdirection.cpp)0
-rw-r--r--src/quick/particles/qquickdirection_p.h68
-rw-r--r--src/quick/particles/qquickellipseextruder.cpp (renamed from src/declarative/particles/qquickellipseextruder.cpp)0
-rw-r--r--src/quick/particles/qquickellipseextruder_p.h83
-rw-r--r--src/quick/particles/qquickfriction.cpp (renamed from src/declarative/particles/qquickfriction.cpp)0
-rw-r--r--src/quick/particles/qquickfriction_p.h101
-rw-r--r--src/quick/particles/qquickgravity.cpp (renamed from src/declarative/particles/qquickgravity.cpp)0
-rw-r--r--src/quick/particles/qquickgravity_p.h115
-rw-r--r--src/quick/particles/qquickgroupgoal.cpp (renamed from src/declarative/particles/qquickgroupgoal.cpp)0
-rw-r--r--src/quick/particles/qquickgroupgoal_p.h100
-rw-r--r--src/quick/particles/qquickimageparticle.cpp1804
-rw-r--r--src/quick/particles/qquickimageparticle_p.h427
-rw-r--r--src/quick/particles/qquickitemparticle.cpp269
-rw-r--r--src/quick/particles/qquickitemparticle_p.h137
-rw-r--r--src/quick/particles/qquicklineextruder.cpp (renamed from src/declarative/particles/qquicklineextruder.cpp)0
-rw-r--r--src/quick/particles/qquicklineextruder_p.h (renamed from src/declarative/particles/qquicklineextruder_p.h)0
-rw-r--r--src/quick/particles/qquickmaskextruder.cpp (renamed from src/declarative/particles/qquickmaskextruder.cpp)0
-rw-r--r--src/quick/particles/qquickmaskextruder_p.h95
-rw-r--r--src/quick/particles/qquickparticleaffector.cpp (renamed from src/declarative/particles/qquickparticleaffector.cpp)0
-rw-r--r--src/quick/particles/qquickparticleaffector_p.h199
-rw-r--r--src/quick/particles/qquickparticleemitter.cpp (renamed from src/declarative/particles/qquickparticleemitter.cpp)0
-rw-r--r--src/quick/particles/qquickparticleemitter_p.h349
-rw-r--r--src/quick/particles/qquickparticleextruder.cpp (renamed from src/declarative/particles/qquickparticleextruder.cpp)0
-rw-r--r--src/quick/particles/qquickparticleextruder_p.h71
-rw-r--r--src/quick/particles/qquickparticlegroup.cpp (renamed from src/declarative/particles/qquickparticlegroup.cpp)0
-rw-r--r--src/quick/particles/qquickparticlegroup_p.h (renamed from src/declarative/particles/qquickparticlegroup_p.h)0
-rw-r--r--src/quick/particles/qquickparticlepainter.cpp (renamed from src/declarative/particles/qquickparticlepainter.cpp)0
-rw-r--r--src/quick/particles/qquickparticlepainter_p.h129
-rw-r--r--src/quick/particles/qquickparticlesmodule.cpp (renamed from src/declarative/particles/qquickparticlesmodule.cpp)0
-rw-r--r--src/quick/particles/qquickparticlesmodule_p.h61
-rw-r--r--src/quick/particles/qquickparticlesystem.cpp1106
-rw-r--r--src/quick/particles/qquickparticlesystem_p.h378
-rw-r--r--src/quick/particles/qquickpointattractor.cpp (renamed from src/declarative/particles/qquickpointattractor.cpp)0
-rw-r--r--src/quick/particles/qquickpointattractor_p.h167
-rw-r--r--src/quick/particles/qquickpointdirection.cpp (renamed from src/declarative/particles/qquickpointdirection.cpp)0
-rw-r--r--src/quick/particles/qquickpointdirection_p.h133
-rw-r--r--src/quick/particles/qquickrectangleextruder.cpp (renamed from src/declarative/particles/qquickrectangleextruder.cpp)0
-rw-r--r--src/quick/particles/qquickrectangleextruder_p.h86
-rw-r--r--src/quick/particles/qquickspritegoal.cpp (renamed from src/declarative/particles/qquickspritegoal.cpp)0
-rw-r--r--src/quick/particles/qquickspritegoal_p.h123
-rw-r--r--src/quick/particles/qquicktargetdirection.cpp (renamed from src/declarative/particles/qquicktargetdirection.cpp)0
-rw-r--r--src/quick/particles/qquicktargetdirection_p.h189
-rw-r--r--src/quick/particles/qquicktrailemitter.cpp (renamed from src/declarative/particles/qquicktrailemitter.cpp)0
-rw-r--r--src/quick/particles/qquicktrailemitter_p.h168
-rw-r--r--src/quick/particles/qquickturbulence.cpp (renamed from src/declarative/particles/qquickturbulence.cpp)0
-rw-r--r--src/quick/particles/qquickturbulence_p.h116
-rw-r--r--src/quick/particles/qquickv8particledata.cpp (renamed from src/declarative/particles/qquickv8particledata.cpp)0
-rw-r--r--src/quick/particles/qquickv8particledata_p.h67
-rw-r--r--src/quick/particles/qquickwander.cpp (renamed from src/declarative/particles/qquickwander.cpp)0
-rw-r--r--src/quick/particles/qquickwander_p.h158
-rw-r--r--src/quick/qtquick2.cpp193
-rw-r--r--src/quick/qtquick2_p.h61
-rw-r--r--src/quick/qtquickglobal.h67
-rw-r--r--src/quick/qtquickglobal_p.h60
-rw-r--r--src/quick/quick.pro47
-rw-r--r--src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp (renamed from src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp)0
-rw-r--r--src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h119
-rw-r--r--src/quick/scenegraph/coreapi/qsggeometry.cpp (renamed from src/declarative/scenegraph/coreapi/qsggeometry.cpp)0
-rw-r--r--src/quick/scenegraph/coreapi/qsggeometry.h294
-rw-r--r--src/quick/scenegraph/coreapi/qsggeometry_p.h (renamed from src/declarative/scenegraph/coreapi/qsggeometry_p.h)0
-rw-r--r--src/quick/scenegraph/coreapi/qsgmaterial.cpp (renamed from src/declarative/scenegraph/coreapi/qsgmaterial.cpp)0
-rw-r--r--src/quick/scenegraph/coreapi/qsgmaterial.h143
-rw-r--r--src/quick/scenegraph/coreapi/qsgnode.cpp1264
-rw-r--r--src/quick/scenegraph/coreapi/qsgnode.h346
-rw-r--r--src/quick/scenegraph/coreapi/qsgnodeupdater.cpp (renamed from src/declarative/scenegraph/coreapi/qsgnodeupdater.cpp)0
-rw-r--r--src/quick/scenegraph/coreapi/qsgnodeupdater_p.h86
-rw-r--r--src/quick/scenegraph/coreapi/qsgrenderer.cpp (renamed from src/declarative/scenegraph/coreapi/qsgrenderer.cpp)0
-rw-r--r--src/quick/scenegraph/coreapi/qsgrenderer_p.h232
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer.cpp315
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer_p.h255
-rw-r--r--src/quick/scenegraph/qsgcontext.cpp513
-rw-r--r--src/quick/scenegraph/qsgcontext_p.h142
-rw-r--r--src/quick/scenegraph/qsgcontextplugin.cpp104
-rw-r--r--src/quick/scenegraph/qsgcontextplugin_p.h80
-rw-r--r--src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp324
-rw-r--r--src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h165
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode.cpp (renamed from src/declarative/scenegraph/qsgdefaultglyphnode.cpp)0
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p.cpp306
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p.h85
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p_p.h96
-rw-r--r--src/quick/scenegraph/qsgdefaultimagenode.cpp293
-rw-r--r--src/quick/scenegraph/qsgdefaultimagenode_p.h88
-rw-r--r--src/quick/scenegraph/qsgdefaultrectanglenode.cpp548
-rw-r--r--src/quick/scenegraph/qsgdefaultrectanglenode_p.h106
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode.cpp316
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp725
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p.h105
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h140
-rw-r--r--src/quick/scenegraph/qsgflashnode.cpp (renamed from src/declarative/scenegraph/qsgflashnode.cpp)0
-rw-r--r--src/quick/scenegraph/qsgflashnode_p.h67
-rw-r--r--src/quick/scenegraph/qsgpathsimplifier.cpp (renamed from src/declarative/scenegraph/qsgpathsimplifier.cpp)0
-rw-r--r--src/quick/scenegraph/qsgpathsimplifier_p.h (renamed from src/declarative/scenegraph/qsgpathsimplifier_p.h)0
-rw-r--r--src/quick/scenegraph/scenegraph.pri (renamed from src/declarative/scenegraph/scenegraph.pri)0
-rw-r--r--src/quick/scenegraph/util/qsgareaallocator.cpp (renamed from src/declarative/scenegraph/util/qsgareaallocator.cpp)0
-rw-r--r--src/quick/scenegraph/util/qsgareaallocator_p.h74
-rw-r--r--src/quick/scenegraph/util/qsgdistancefieldutil.cpp805
-rw-r--r--src/quick/scenegraph/util/qsgdistancefieldutil_p.h111
-rw-r--r--src/quick/scenegraph/util/qsgengine.cpp115
-rw-r--r--src/quick/scenegraph/util/qsgengine.h100
-rw-r--r--src/quick/scenegraph/util/qsgflatcolormaterial.cpp202
-rw-r--r--src/quick/scenegraph/util/qsgflatcolormaterial.h72
-rw-r--r--src/quick/scenegraph/util/qsgpainternode.cpp464
-rw-r--r--src/quick/scenegraph/util/qsgpainternode_p.h158
-rw-r--r--src/quick/scenegraph/util/qsgsimplematerial.h220
-rw-r--r--src/quick/scenegraph/util/qsgsimplerectnode.cpp (renamed from src/declarative/scenegraph/util/qsgsimplerectnode.cpp)0
-rw-r--r--src/quick/scenegraph/util/qsgsimplerectnode.h75
-rw-r--r--src/quick/scenegraph/util/qsgsimpletexturenode.cpp154
-rw-r--r--src/quick/scenegraph/util/qsgsimpletexturenode.h80
-rw-r--r--src/quick/scenegraph/util/qsgtexture.cpp541
-rw-r--r--src/quick/scenegraph/util/qsgtexture.h132
-rw-r--r--src/quick/scenegraph/util/qsgtexture_p.h119
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial.cpp (renamed from src/declarative/scenegraph/util/qsgtexturematerial.cpp)0
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial.h99
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial_p.h71
-rw-r--r--src/quick/scenegraph/util/qsgtextureprovider.cpp (renamed from src/declarative/scenegraph/util/qsgtextureprovider.cpp)0
-rw-r--r--src/quick/scenegraph/util/qsgtextureprovider_p.h66
-rw-r--r--src/quick/scenegraph/util/qsgvertexcolormaterial.cpp173
-rw-r--r--src/quick/scenegraph/util/qsgvertexcolormaterial.h67
-rw-r--r--src/quick/util/qdeclarativeanimation.cpp (renamed from src/declarative/util/qdeclarativeanimation.cpp)0
-rw-r--r--src/quick/util/qdeclarativeanimation_p.h456
-rw-r--r--src/quick/util/qdeclarativeanimation_p_p.h (renamed from src/declarative/util/qdeclarativeanimation_p_p.h)0
-rw-r--r--src/quick/util/qdeclarativebehavior.cpp (renamed from src/declarative/util/qdeclarativebehavior.cpp)0
-rw-r--r--src/quick/util/qdeclarativebehavior_p.h95
-rw-r--r--src/quick/util/qdeclarativebind.cpp (renamed from src/declarative/util/qdeclarativebind.cpp)0
-rw-r--r--src/quick/util/qdeclarativebind_p.h96
-rw-r--r--src/quick/util/qdeclarativechangeset.cpp (renamed from src/declarative/util/qdeclarativechangeset.cpp)0
-rw-r--r--src/quick/util/qdeclarativechangeset_p.h (renamed from src/declarative/util/qdeclarativechangeset_p.h)0
-rw-r--r--src/quick/util/qdeclarativeconnections.cpp (renamed from src/declarative/util/qdeclarativeconnections.cpp)0
-rw-r--r--src/quick/util/qdeclarativeconnections_p.h100
-rw-r--r--src/quick/util/qdeclarativefontloader.cpp (renamed from src/declarative/util/qdeclarativefontloader.cpp)0
-rw-r--r--src/quick/util/qdeclarativefontloader_p.h95
-rw-r--r--src/quick/util/qdeclarativelistaccessor.cpp (renamed from src/declarative/util/qdeclarativelistaccessor.cpp)0
-rw-r--r--src/quick/util/qdeclarativelistaccessor_p.h78
-rw-r--r--src/quick/util/qdeclarativelistcompositor.cpp (renamed from src/declarative/util/qdeclarativelistcompositor.cpp)0
-rw-r--r--src/quick/util/qdeclarativelistcompositor_p.h (renamed from src/declarative/util/qdeclarativelistcompositor_p.h)0
-rw-r--r--src/quick/util/qdeclarativepackage.cpp (renamed from src/declarative/util/qdeclarativepackage.cpp)0
-rw-r--r--src/quick/util/qdeclarativepackage_p.h96
-rw-r--r--src/quick/util/qdeclarativepath.cpp (renamed from src/declarative/util/qdeclarativepath.cpp)0
-rw-r--r--src/quick/util/qdeclarativepath_p.h450
-rw-r--r--src/quick/util/qdeclarativepath_p_p.h (renamed from src/declarative/util/qdeclarativepath_p_p.h)0
-rw-r--r--src/quick/util/qdeclarativepathinterpolator.cpp (renamed from src/declarative/util/qdeclarativepathinterpolator.cpp)0
-rw-r--r--src/quick/util/qdeclarativepathinterpolator_p.h98
-rw-r--r--src/quick/util/qdeclarativepixmapcache.cpp1241
-rw-r--r--src/quick/util/qdeclarativepixmapcache_p.h142
-rw-r--r--src/quick/util/qdeclarativepropertychanges.cpp (renamed from src/declarative/util/qdeclarativepropertychanges.cpp)0
-rw-r--r--src/quick/util/qdeclarativepropertychanges_p.h110
-rw-r--r--src/quick/util/qdeclarativesmoothedanimation.cpp (renamed from src/declarative/util/qdeclarativesmoothedanimation.cpp)0
-rw-r--r--src/quick/util/qdeclarativesmoothedanimation_p.h101
-rw-r--r--src/quick/util/qdeclarativesmoothedanimation_p_p.h (renamed from src/declarative/util/qdeclarativesmoothedanimation_p_p.h)0
-rw-r--r--src/quick/util/qdeclarativespringanimation.cpp (renamed from src/declarative/util/qdeclarativespringanimation.cpp)0
-rw-r--r--src/quick/util/qdeclarativespringanimation_p.h109
-rw-r--r--src/quick/util/qdeclarativestate.cpp (renamed from src/declarative/util/qdeclarativestate.cpp)0
-rw-r--r--src/quick/util/qdeclarativestate_p.h208
-rw-r--r--src/quick/util/qdeclarativestate_p_p.h (renamed from src/declarative/util/qdeclarativestate_p_p.h)0
-rw-r--r--src/quick/util/qdeclarativestategroup.cpp (renamed from src/declarative/util/qdeclarativestategroup.cpp)0
-rw-r--r--src/quick/util/qdeclarativestategroup_p.h95
-rw-r--r--src/quick/util/qdeclarativestateoperations.cpp (renamed from src/declarative/util/qdeclarativestateoperations.cpp)0
-rw-r--r--src/quick/util/qdeclarativestateoperations_p.h85
-rw-r--r--src/quick/util/qdeclarativestyledtext.cpp (renamed from src/declarative/util/qdeclarativestyledtext.cpp)0
-rw-r--r--src/quick/util/qdeclarativestyledtext_p.h (renamed from src/declarative/util/qdeclarativestyledtext_p.h)0
-rw-r--r--src/quick/util/qdeclarativesvgparser.cpp (renamed from src/declarative/util/qdeclarativesvgparser.cpp)0
-rw-r--r--src/quick/util/qdeclarativesvgparser_p.h (renamed from src/declarative/util/qdeclarativesvgparser_p.h)0
-rw-r--r--src/quick/util/qdeclarativesystempalette.cpp (renamed from src/declarative/util/qdeclarativesystempalette.cpp)0
-rw-r--r--src/quick/util/qdeclarativesystempalette_p.h120
-rw-r--r--src/quick/util/qdeclarativetimeline.cpp (renamed from src/declarative/util/qdeclarativetimeline.cpp)0
-rw-r--r--src/quick/util/qdeclarativetimeline_p_p.h (renamed from src/declarative/util/qdeclarativetimeline_p_p.h)0
-rw-r--r--src/quick/util/qdeclarativetimer.cpp (renamed from src/declarative/util/qdeclarativetimer.cpp)0
-rw-r--r--src/quick/util/qdeclarativetimer_p.h113
-rw-r--r--src/quick/util/qdeclarativetransition.cpp (renamed from src/declarative/util/qdeclarativetransition.cpp)0
-rw-r--r--src/quick/util/qdeclarativetransition_p.h109
-rw-r--r--src/quick/util/qdeclarativetransitionmanager.cpp (renamed from src/declarative/util/qdeclarativetransitionmanager.cpp)0
-rw-r--r--src/quick/util/qdeclarativetransitionmanager_p_p.h (renamed from src/declarative/util/qdeclarativetransitionmanager_p_p.h)0
-rw-r--r--src/quick/util/qdeclarativeutilmodule.cpp (renamed from src/declarative/util/qdeclarativeutilmodule.cpp)0
-rw-r--r--src/quick/util/qdeclarativeutilmodule_p.h61
-rw-r--r--src/quick/util/util.pri59
-rw-r--r--src/src.pro2
-rw-r--r--sync.profile83
-rw-r--r--tests/auto/auto.pro1
-rw-r--r--tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp2
-rw-r--r--tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp2
-rw-r--r--tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp2
-rw-r--r--tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro2
-rw-r--r--tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp2
-rw-r--r--tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro2
-rw-r--r--tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp2
-rw-r--r--tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp2
-rw-r--r--tests/auto/declarative/declarative.pro52
-rw-r--r--tests/auto/declarative/examples/examples.pro10
-rw-r--r--tests/auto/declarative/examples/tst_examples.cpp253
-rw-r--r--tests/auto/declarative/geometry/geometry.pro9
-rw-r--r--tests/auto/declarative/geometry/tst_geometry.cpp181
-rw-r--r--tests/auto/declarative/nodes/nodes.pro9
-rw-r--r--tests/auto/declarative/nodes/tst_nodestest.cpp354
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro12
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp1106
-rw-r--r--tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro7
-rw-r--r--tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp143
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro12
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp474
-rw-r--r--tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro2
-rw-r--r--tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro2
-rw-r--r--tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp3
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro6
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro14
-rw-r--r--tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp254
-rw-r--r--tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro2
-rw-r--r--tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro6
-rw-r--r--tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro2
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro2
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp6
-rw-r--r--tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp3
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro4
-rw-r--r--tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro13
-rw-r--r--tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp164
-rw-r--r--tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro20
-rw-r--r--tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp458
-rw-r--r--tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro2
-rw-r--r--tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro13
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp211
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro13
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp131
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro2
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro12
-rw-r--r--tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp1596
-rw-r--r--tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro8
-rw-r--r--tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro8
-rw-r--r--tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp185
-rw-r--r--tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro8
-rw-r--r--tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp334
-rw-r--r--tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro6
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp961
-rw-r--r--tests/auto/declarative/qmlmin/tst_qmlmin.cpp2
-rw-r--r--tests/auto/declarative/qquickanchors/qquickanchors.pro12
-rw-r--r--tests/auto/declarative/qquickanchors/tst_qquickanchors.cpp692
-rw-r--r--tests/auto/declarative/qquickanimatedimage/qquickanimatedimage.pro13
-rw-r--r--tests/auto/declarative/qquickanimatedimage/tst_qquickanimatedimage.cpp378
-rw-r--r--tests/auto/declarative/qquickborderimage/qquickborderimage.pro14
-rw-r--r--tests/auto/declarative/qquickborderimage/tst_qquickborderimage.cpp376
-rw-r--r--tests/auto/declarative/qquickcanvas/qquickcanvas.pro8
-rw-r--r--tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp557
-rw-r--r--tests/auto/declarative/qquickdrag/qquickdrag.pro9
-rw-r--r--tests/auto/declarative/qquickdrag/tst_qquickdrag.cpp827
-rw-r--r--tests/auto/declarative/qquickdroparea/qquickdroparea.pro9
-rw-r--r--tests/auto/declarative/qquickdroparea/tst_qquickdroparea.cpp1117
-rw-r--r--tests/auto/declarative/qquickflickable/qquickflickable.pro12
-rw-r--r--tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp662
-rw-r--r--tests/auto/declarative/qquickflipable/qquickflipable.pro13
-rw-r--r--tests/auto/declarative/qquickflipable/tst_qquickflipable.cpp150
-rw-r--r--tests/auto/declarative/qquickfocusscope/qquickfocusscope.pro10
-rw-r--r--tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp668
-rw-r--r--tests/auto/declarative/qquickgridview/qquickgridview.pro13
-rw-r--r--tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp3705
-rw-r--r--tests/auto/declarative/qquickimage/qquickimage.pro13
-rw-r--r--tests/auto/declarative/qquickimage/tst_qquickimage.cpp732
-rw-r--r--tests/auto/declarative/qquickitem/qquickitem.pro12
-rw-r--r--tests/auto/declarative/qquickitem/tst_qquickitem.cpp1190
-rw-r--r--tests/auto/declarative/qquickitem2/qquickitem2.pro13
-rw-r--r--tests/auto/declarative/qquickitem2/tst_qquickitem.cpp1254
-rw-r--r--tests/auto/declarative/qquicklistview/qquicklistview.pro13
-rw-r--r--tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp4379
-rw-r--r--tests/auto/declarative/qquickloader/qquickloader.pro16
-rw-r--r--tests/auto/declarative/qquickloader/tst_qquickloader.cpp969
-rw-r--r--tests/auto/declarative/qquickmousearea/qquickmousearea.pro14
-rw-r--r--tests/auto/declarative/qquickmousearea/tst_qquickmousearea.cpp824
-rw-r--r--tests/auto/declarative/qquickmultipointtoucharea/qquickmultipointtoucharea.pro11
-rw-r--r--tests/auto/declarative/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp586
-rw-r--r--tests/auto/declarative/qquickpathview/qquickpathview.pro12
-rw-r--r--tests/auto/declarative/qquickpathview/tst_qquickpathview.cpp1629
-rw-r--r--tests/auto/declarative/qquickpincharea/qquickpincharea.pro13
-rw-r--r--tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp395
-rw-r--r--tests/auto/declarative/qquickpositioners/qquickpositioners.pro11
-rw-r--r--tests/auto/declarative/qquickpositioners/tst_qquickpositioners.cpp1473
-rw-r--r--tests/auto/declarative/qquickrepeater/qquickrepeater.pro12
-rw-r--r--tests/auto/declarative/qquickrepeater/tst_qquickrepeater.cpp765
-rw-r--r--tests/auto/declarative/qquickshadereffect/qquickshadereffect.pro8
-rw-r--r--tests/auto/declarative/qquickspriteimage/qquickspriteimage.pro12
-rw-r--r--tests/auto/declarative/qquickspriteimage/tst_qquickspriteimage.cpp81
-rw-r--r--tests/auto/declarative/qquicktext/qquicktext.pro17
-rw-r--r--tests/auto/declarative/qquicktext/tst_qquicktext.cpp1460
-rw-r--r--tests/auto/declarative/qquicktextedit/qquicktextedit.pro12
-rw-r--r--tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp3555
-rw-r--r--tests/auto/declarative/qquicktextinput/qquicktextinput.pro11
-rw-r--r--tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp3310
-rw-r--r--tests/auto/declarative/qquickview/qquickview.pro11
-rw-r--r--tests/auto/declarative/qquickview/tst_qquickview.cpp207
-rw-r--r--tests/auto/declarative/qquickvisualdatamodel/qquickvisualdatamodel.pro13
-rw-r--r--tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp1865
-rw-r--r--tests/auto/declarative/v4/tst_v4.cpp2
-rw-r--r--tests/auto/particles/qquickage/qquickage.pro2
-rw-r--r--tests/auto/particles/qquickangleddirection/qquickangleddirection.pro2
-rw-r--r--tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro2
-rw-r--r--tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro2
-rw-r--r--tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro2
-rw-r--r--tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro2
-rw-r--r--tests/auto/particles/qquickfriction/qquickfriction.pro2
-rw-r--r--tests/auto/particles/qquickgravity/qquickgravity.pro2
-rw-r--r--tests/auto/particles/qquickimageparticle/qquickimageparticle.pro2
-rw-r--r--tests/auto/particles/qquickitemparticle/qquickitemparticle.pro2
-rw-r--r--tests/auto/particles/qquicklineextruder/qquicklineextruder.pro2
-rw-r--r--tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro2
-rw-r--r--tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro2
-rw-r--r--tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro2
-rw-r--r--tests/auto/particles/qquickpointattractor/qquickpointattractor.pro2
-rw-r--r--tests/auto/particles/qquickpointdirection/qquickpointdirection.pro2
-rw-r--r--tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro2
-rw-r--r--tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro2
-rw-r--r--tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro2
-rw-r--r--tests/auto/particles/qquickturbulence/qquickturbulence.pro2
-rw-r--r--tests/auto/particles/qquickwander/qquickwander.pro2
-rw-r--r--tests/auto/particles/shared/particlestestsshared.h2
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro4
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp2
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro4
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp2
-rw-r--r--tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro4
-rw-r--r--tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp2
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro4
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp2
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro6
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro4
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro6
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro4
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp2
-rw-r--r--tests/auto/qtquick2/examples/data/dummytest.qml (renamed from tests/auto/declarative/examples/data/dummytest.qml)0
-rw-r--r--tests/auto/qtquick2/examples/data/webbrowser/webbrowser.qml (renamed from tests/auto/declarative/examples/data/webbrowser/webbrowser.qml)0
-rw-r--r--tests/auto/qtquick2/examples/examples.pro10
-rw-r--r--tests/auto/qtquick2/examples/tst_examples.cpp253
-rw-r--r--tests/auto/qtquick2/geometry/geometry.pro9
-rw-r--r--tests/auto/qtquick2/geometry/tst_geometry.cpp181
-rw-r--r--tests/auto/qtquick2/nodes/nodes.pro9
-rw-r--r--tests/auto/qtquick2/nodes/tst_nodestest.cpp354
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/Double.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/Double.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/attached.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/attached.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/badproperty1.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/badproperty2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/badtype1.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/badtype2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/badtype3.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/badtype4.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/disabledTransition.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/disabledTransition.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/dontAutoStart.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/dontStart.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/dontStart2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/dotproperty.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/doubleRegistrationBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype1.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/nonTransitionBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathAnimation.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathAnimation2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimationNoStart.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathAnimationNoStart.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolator.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathInterpolator.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolatorBack.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathInterpolatorBack.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/pathTransition.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathTransition.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/pauseBindingBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pauseBindingBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/pauseBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pauseBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/properties.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/properties2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/properties3.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/properties4.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties4.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/properties5.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties5.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition3.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition4.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition5.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition6.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition7.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/registrationBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/rotation.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/rotation.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/runningTrueBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/transitionAssignmentBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/valuesource.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/data/valuesource2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro12
-rw-r--r--tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp1106
-rw-r--r--tests/auto/qtquick2/qdeclarativeapplication/qdeclarativeapplication.pro7
-rw-r--r--tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp143
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/binding.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/binding.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/color.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/color.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/cpptrigger.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/delayedRegistration.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/delayedRegistration.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/disabled.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/dontStart.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/empty.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/empty.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/explicit.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty2.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/groupedPropertyCrash.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/loop.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/loop.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/nonSelecting2.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/parent.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/parent.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/qtbug12295.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/reassignedAnimation.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/runningTrue.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/scripttrigger.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/simple.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/simple.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/startOnCompleted.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/startOnCompleted.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/startup.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/startup.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/startup2.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/data/valueType.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/valueType.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro12
-rw-r--r--tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp474
-rw-r--r--tests/auto/qtquick2/qdeclarativefontloader/data/daniel.ttf (renamed from tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf)bin51984 -> 51984 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativefontloader/data/dummy.ttf (renamed from tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf)0
-rw-r--r--tests/auto/qtquick2/qdeclarativefontloader/data/qtbug-20268.qml (renamed from tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativefontloader/data/tarzeau_ocr_a.ttf (renamed from tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf)bin24544 -> 24544 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro14
-rw-r--r--tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp254
-rw-r--r--tests/auto/qtquick2/qdeclarativepath/data/arc.qml (renamed from tests/auto/declarative/qdeclarativepath/data/arc.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativepath/data/curve.qml (renamed from tests/auto/declarative/qdeclarativepath/data/curve.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativepath/data/svg.qml (renamed from tests/auto/declarative/qdeclarativepath/data/svg.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro13
-rw-r--r--tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp164
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/exists.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/exists.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/exists1.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/exists2.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists1.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists1.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists2.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists2.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists3.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists3.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists4.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists4.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists5.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists5.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists6.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists6.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists7.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists7.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists8.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists8.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/data/massive.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/massive.png)bin31834 -> 31834 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro20
-rw-r--r--tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp458
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro13
-rw-r--r--tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp211
-rw-r--r--tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation1.qml (renamed from tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation2.qml (renamed from tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation3.qml (renamed from tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro13
-rw-r--r--tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp131
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/ExtendedRectangle.qml (renamed from tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/Implementation/MyType.qml (renamed from tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/Implementation/images/qt-logo.png (renamed from tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png)bin5149 -> 5149 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/QTBUG-14830.qml (renamed from tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/anchorChanges1.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/anchorChanges2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/anchorChanges3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/anchorChanges4.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/anchorChanges5.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/anchorChangesCrash.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/attachedPropertyChanges.qml (renamed from tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml (renamed from tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/avoidFastForward.qml (renamed from tests/auto/declarative/qdeclarativestates/data/avoidFastForward.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicBinding.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicBinding.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicBinding2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicBinding3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicBinding4.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicChanges.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicChanges.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicChanges2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicChanges3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicChanges4.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/basicExtension.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicExtension.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/deleting.qml (renamed from tests/auto/declarative/qdeclarativestates/data/deleting.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/deletingState.qml (renamed from tests/auto/declarative/qdeclarativestates/data/deletingState.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/editProperties.qml (renamed from tests/auto/declarative/qdeclarativestates/data/editProperties.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/explicit.qml (renamed from tests/auto/declarative/qdeclarativestates/data/explicit.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/extendsBug.qml (renamed from tests/auto/declarative/qdeclarativestates/data/extendsBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/fakeExtension.qml (renamed from tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/illegalObj.qml (renamed from tests/auto/declarative/qdeclarativestates/data/illegalObj.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/illegalTempState.qml (renamed from tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/image.png (renamed from tests/auto/declarative/qdeclarativestates/data/image.png)bin173 -> 173 bytes
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/legalTempState.qml (renamed from tests/auto/declarative/qdeclarativestates/data/legalTempState.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/nonExistantProp.qml (renamed from tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/parentChange1.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange1.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/parentChange2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/parentChange3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/parentChange4.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange4.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/parentChange5.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange5.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/parentChange6.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange6.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/propertyErrors.qml (renamed from tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/reset.qml (renamed from tests/auto/declarative/qdeclarativestates/data/reset.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/restoreEntryValues.qml (renamed from tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/returnToBase.qml (renamed from tests/auto/declarative/qdeclarativestates/data/returnToBase.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/revertListBug.qml (renamed from tests/auto/declarative/qdeclarativestates/data/revertListBug.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/script.qml (renamed from tests/auto/declarative/qdeclarativestates/data/script.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/signalOverride.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverride.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/signalOverride2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash3.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/unnamedWhen.qml (renamed from tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/urlResolution.qml (renamed from tests/auto/declarative/qdeclarativestates/data/urlResolution.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/data/whenOrdering.qml (renamed from tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro12
-rw-r--r--tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp1596
-rw-r--r--tests/auto/qtquick2/qdeclarativestyledtext/qdeclarativestyledtext.pro8
-rw-r--r--tests/auto/qtquick2/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp (renamed from tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp)0
-rw-r--r--tests/auto/qtquick2/qdeclarativesystempalette/qdeclarativesystempalette.pro8
-rw-r--r--tests/auto/qtquick2/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp185
-rw-r--r--tests/auto/qtquick2/qdeclarativetimer/qdeclarativetimer.pro8
-rw-r--r--tests/auto/qtquick2/qdeclarativetimer/tst_qdeclarativetimer.cpp334
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/empty.xml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/empty.xml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/get.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/get.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.xml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/model2.xml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/propertychanges.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.xml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleCrash.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/roleCrash.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleErrors.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleKeys.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/testtypes.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/data/unique.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro (renamed from tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro)0
-rw-r--r--tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp961
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/anchors.qml (renamed from tests/auto/declarative/qquickanchors/data/anchors.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/centerin.qml (renamed from tests/auto/declarative/qquickanchors/data/centerin.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/centerinRotation.qml (renamed from tests/auto/declarative/qquickanchors/data/centerinRotation.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/crash1.qml (renamed from tests/auto/declarative/qquickanchors/data/crash1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/fill.qml (renamed from tests/auto/declarative/qquickanchors/data/fill.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/hvCenter.qml (renamed from tests/auto/declarative/qquickanchors/data/hvCenter.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/loop1.qml (renamed from tests/auto/declarative/qquickanchors/data/loop1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/loop2.qml (renamed from tests/auto/declarative/qquickanchors/data/loop2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/data/margins.qml (renamed from tests/auto/declarative/qquickanchors/data/margins.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanchors/qquickanchors.pro12
-rw-r--r--tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp692
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/colors.gif (renamed from tests/auto/declarative/qquickanimatedimage/data/colors.gif)bin505 -> 505 bytes
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/colors.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/colors.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/hearts.gif (renamed from tests/auto/declarative/qquickanimatedimage/data/hearts.gif)bin6524 -> 6524 bytes
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/hearts.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/hearts.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/qmldir (renamed from tests/auto/declarative/qquickanimatedimage/data/qmldir)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/qtbug-16520.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/qtbug-16520.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/stickman.gif (renamed from tests/auto/declarative/qquickanimatedimage/data/stickman.gif)bin164923 -> 164923 bytes
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/stickman.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickman.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/stickmanerror1.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickmanerror1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/stickmanpause.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickmanpause.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/stickmanscaled.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickmanscaled.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/data/stickmanstopped.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickmanstopped.qml)0
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro13
-rw-r--r--tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp378
-rw-r--r--tests/auto/qtquick2/qquickborderimage/data/colors-mirror.png (renamed from tests/auto/declarative/qquickborderimage/data/colors-mirror.png)bin5554 -> 5554 bytes
-rw-r--r--tests/auto/qtquick2/qquickborderimage/data/colors-round-quotes.sci (renamed from tests/auto/declarative/qquickborderimage/data/colors-round-quotes.sci)0
-rw-r--r--tests/auto/qtquick2/qquickborderimage/data/colors-round-remote.sci (renamed from tests/auto/declarative/qquickborderimage/data/colors-round-remote.sci)0
-rw-r--r--tests/auto/qtquick2/qquickborderimage/data/colors-round.sci (renamed from tests/auto/declarative/qquickborderimage/data/colors-round.sci)0
-rw-r--r--tests/auto/qtquick2/qquickborderimage/data/colors.png (renamed from tests/auto/declarative/qquickborderimage/data/colors.png)bin1655 -> 1655 bytes
-rw-r--r--tests/auto/qtquick2/qquickborderimage/data/heart200.png (renamed from tests/auto/declarative/qquickborderimage/data/heart200.png)bin7943 -> 7943 bytes
-rw-r--r--tests/auto/qtquick2/qquickborderimage/data/invalid.sci (renamed from tests/auto/declarative/qquickborderimage/data/invalid.sci)0
-rw-r--r--tests/auto/qtquick2/qquickborderimage/data/mirror.qml (renamed from tests/auto/declarative/qquickborderimage/data/mirror.qml)0
-rw-r--r--tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro14
-rw-r--r--tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp376
-rw-r--r--tests/auto/qtquick2/qquickcanvas/data/window.qml (renamed from tests/auto/declarative/qquickcanvas/data/window.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro8
-rw-r--r--tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp557
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.gif (renamed from tests/auto/declarative/qquickcanvasitem/data/anim-gr.gif)bin241 -> 241 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.png (renamed from tests/auto/declarative/qquickcanvasitem/data/anim-gr.png)bin460 -> 460 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/anim-poster-gr.png (renamed from tests/auto/declarative/qquickcanvasitem/data/anim-poster-gr.png)bin422 -> 422 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/background.png (renamed from tests/auto/declarative/qquickcanvasitem/data/background.png)bin86 -> 86 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/broken.png (renamed from tests/auto/declarative/qquickcanvasitem/data/broken.png)bin87 -> 87 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/ggrr-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/ggrr-256x256.png)bin120 -> 120 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/green-16x16.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green-16x16.png)bin92 -> 92 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/green-1x1.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green-1x1.png)bin82 -> 82 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/green-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green-256x256.png)bin103 -> 103 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/green-2x2.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green-2x2.png)bin118 -> 118 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/green.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green.png)bin87 -> 87 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/grgr-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/grgr-256x256.png)bin130 -> 130 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/red-16x16.png (renamed from tests/auto/declarative/qquickcanvasitem/data/red-16x16.png)bin130 -> 130 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/red.png (renamed from tests/auto/declarative/qquickcanvasitem/data/red.png)bin87 -> 87 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/redtransparent.png (renamed from tests/auto/declarative/qquickcanvasitem/data/redtransparent.png)bin109 -> 109 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/rgrg-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/rgrg-256x256.png)bin131 -> 131 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/rrgg-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/rrgg-256x256.png)bin120 -> 120 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/testhelper.js (renamed from tests/auto/declarative/qquickcanvasitem/data/testhelper.js)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/transparent.png (renamed from tests/auto/declarative/qquickcanvasitem/data/transparent.png)bin100 -> 100 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/transparent50.png (renamed from tests/auto/declarative/qquickcanvasitem/data/transparent50.png)bin155 -> 155 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_arc.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_arc.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_arcto.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_arcto.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_canvas.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_canvas.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_composite.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_composite.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_drawimage.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_fillStyle.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_fillStyle.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_fillrect.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_gradient.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_gradient.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_line.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_line.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_path.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_path.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_pattern.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_pattern.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_pixel.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_pixel.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_shadow.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_shadow.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_state.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_state.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_strokeStyle.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_strokeStyle.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_text.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_text.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/tst_transform.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_transform.qml)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/yellow.png (renamed from tests/auto/declarative/qquickcanvasitem/data/yellow.png)bin95 -> 95 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/data/yellow75.png (renamed from tests/auto/declarative/qquickcanvasitem/data/yellow75.png)bin150 -> 150 bytes
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/qquickcanvasitem.pro (renamed from tests/auto/declarative/qquickcanvasitem/qquickcanvasitem.pro)0
-rw-r--r--tests/auto/qtquick2/qquickcanvasitem/tst_qquickcanvasitem.cpp (renamed from tests/auto/declarative/qquickcanvasitem/tst_qquickcanvasitem.cpp)0
-rw-r--r--tests/auto/qtquick2/qquickdrag/qquickdrag.pro9
-rw-r--r--tests/auto/qtquick2/qquickdrag/tst_qquickdrag.cpp827
-rw-r--r--tests/auto/qtquick2/qquickdroparea/qquickdroparea.pro9
-rw-r--r--tests/auto/qtquick2/qquickdroparea/tst_qquickdroparea.cpp1117
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/disabled.qml (renamed from tests/auto/declarative/qquickflickable/data/disabled.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/flickable01.qml (renamed from tests/auto/declarative/qquickflickable/data/flickable01.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/flickable02.qml (renamed from tests/auto/declarative/qquickflickable/data/flickable02.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/flickable03.qml (renamed from tests/auto/declarative/qquickflickable/data/flickable03.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/flickable04.qml (renamed from tests/auto/declarative/qquickflickable/data/flickable04.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/flickableqgraphicswidget.qml (renamed from tests/auto/declarative/qquickflickable/data/flickableqgraphicswidget.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/margins.qml (renamed from tests/auto/declarative/qquickflickable/data/margins.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/nestedPressDelay.qml (renamed from tests/auto/declarative/qquickflickable/data/nestedPressDelay.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/resize.qml (renamed from tests/auto/declarative/qquickflickable/data/resize.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/data/wheel.qml (renamed from tests/auto/declarative/qquickflickable/data/wheel.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflickable/qquickflickable.pro12
-rw-r--r--tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp662
-rw-r--r--tests/auto/qtquick2/qquickflipable/data/crash.qml (renamed from tests/auto/declarative/qquickflipable/data/crash.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml (renamed from tests/auto/declarative/qquickflipable/data/flipable-abort.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflipable/data/test-flipable.qml (renamed from tests/auto/declarative/qquickflipable/data/test-flipable.qml)0
-rw-r--r--tests/auto/qtquick2/qquickflipable/qquickflipable.pro13
-rw-r--r--tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp150
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/canvasFocus.qml (renamed from tests/auto/declarative/qquickfocusscope/data/canvasFocus.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/chain.qml (renamed from tests/auto/declarative/qquickfocusscope/data/chain.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/forceActiveFocus.qml (renamed from tests/auto/declarative/qquickfocusscope/data/forceActiveFocus.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/forcefocus.qml (renamed from tests/auto/declarative/qquickfocusscope/data/forcefocus.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/qtBug13380.qml (renamed from tests/auto/declarative/qquickfocusscope/data/qtBug13380.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/signalEmission.qml (renamed from tests/auto/declarative/qquickfocusscope/data/signalEmission.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/test.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/test2.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/test3.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test3.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/test4.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test4.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/data/test5.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test5.qml)0
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro10
-rw-r--r--tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp668
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/ComponentView.qml (renamed from tests/auto/declarative/qquickgridview/data/ComponentView.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/asyncloader.qml (renamed from tests/auto/declarative/qquickgridview/data/asyncloader.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/attachedSignals.qml (renamed from tests/auto/declarative/qquickgridview/data/attachedSignals.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/creationContext.qml (renamed from tests/auto/declarative/qquickgridview/data/creationContext.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/displaygrid.qml (renamed from tests/auto/declarative/qquickgridview/data/displaygrid.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/footer.qml (renamed from tests/auto/declarative/qquickgridview/data/footer.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/gridview-enforcerange.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview-enforcerange.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/gridview-initCurrent.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview-initCurrent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/gridview-noCurrent.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview-noCurrent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/gridview1.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/gridview2.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/gridview3.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview3.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/gridview4.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview4.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/header.qml (renamed from tests/auto/declarative/qquickgridview/data/header.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/manual-highlight.qml (renamed from tests/auto/declarative/qquickgridview/data/manual-highlight.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/margins.qml (renamed from tests/auto/declarative/qquickgridview/data/margins.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/mirroring.qml (renamed from tests/auto/declarative/qquickgridview/data/mirroring.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/propertychangestest.qml (renamed from tests/auto/declarative/qquickgridview/data/propertychangestest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/resizeview.qml (renamed from tests/auto/declarative/qquickgridview/data/resizeview.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/setindex.qml (renamed from tests/auto/declarative/qquickgridview/data/setindex.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/snapToRow.qml (renamed from tests/auto/declarative/qquickgridview/data/snapToRow.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/data/unaligned.qml (renamed from tests/auto/declarative/qquickgridview/data/unaligned.qml)0
-rw-r--r--tests/auto/qtquick2/qquickgridview/qquickgridview.pro13
-rw-r--r--tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp3705
-rw-r--r--tests/auto/qtquick2/qquickimage/data/aspectratio.qml (renamed from tests/auto/declarative/qquickimage/data/aspectratio.qml)0
-rw-r--r--tests/auto/qtquick2/qquickimage/data/big.jpeg (renamed from tests/auto/declarative/qquickimage/data/big.jpeg)bin1700081 -> 1700081 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/big256.png (renamed from tests/auto/declarative/qquickimage/data/big256.png)bin3566 -> 3566 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/colors.png (renamed from tests/auto/declarative/qquickimage/data/colors.png)bin1655 -> 1655 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/colors1.png (renamed from tests/auto/declarative/qquickimage/data/colors1.png)bin1655 -> 1655 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/green.png (renamed from tests/auto/declarative/qquickimage/data/green.png)bin314 -> 314 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/heart-win32.png (renamed from tests/auto/declarative/qquickimage/data/heart-win32.png)bin12621 -> 12621 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/heart.png (renamed from tests/auto/declarative/qquickimage/data/heart.png)bin12577 -> 12577 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/heart.svg (renamed from tests/auto/declarative/qquickimage/data/heart.svg)0
-rw-r--r--tests/auto/qtquick2/qquickimage/data/heart200-win32.png (renamed from tests/auto/declarative/qquickimage/data/heart200-win32.png)bin8062 -> 8062 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/heart200.png (renamed from tests/auto/declarative/qquickimage/data/heart200.png)bin8063 -> 8063 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/htiling.qml (renamed from tests/auto/declarative/qquickimage/data/htiling.qml)0
-rw-r--r--tests/auto/qtquick2/qquickimage/data/mirror.qml (renamed from tests/auto/declarative/qquickimage/data/mirror.qml)0
-rw-r--r--tests/auto/qtquick2/qquickimage/data/nullpixmap.qml (renamed from tests/auto/declarative/qquickimage/data/nullpixmap.qml)0
-rw-r--r--tests/auto/qtquick2/qquickimage/data/pattern.png (renamed from tests/auto/declarative/qquickimage/data/pattern.png)bin1371 -> 1371 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/qtbug_16389.qml (renamed from tests/auto/declarative/qquickimage/data/qtbug_16389.qml)0
-rw-r--r--tests/auto/qtquick2/qquickimage/data/qtbug_22125.qml (renamed from tests/auto/declarative/qquickimage/data/qtbug_22125.qml)0
-rw-r--r--tests/auto/qtquick2/qquickimage/data/rect.png (renamed from tests/auto/declarative/qquickimage/data/rect.png)bin171 -> 171 bytes
-rw-r--r--tests/auto/qtquick2/qquickimage/data/vtiling.qml (renamed from tests/auto/declarative/qquickimage/data/vtiling.qml)0
-rw-r--r--tests/auto/qtquick2/qquickimage/qquickimage.pro13
-rw-r--r--tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp732
-rw-r--r--tests/auto/qtquick2/qquickitem/data/order.1.qml (renamed from tests/auto/declarative/qquickitem/data/order.1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem/data/order.2.qml (renamed from tests/auto/declarative/qquickitem/data/order.2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem/qquickitem.pro12
-rw-r--r--tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp1190
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/childrenProperty.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenProperty.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/childrenRect.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenRect.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/childrenRectBug.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenRectBug.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/childrenRectBug2.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenRectBug2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/childrenRectBug3.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenRectBug3.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/implicitsize.qml (renamed from tests/auto/declarative/qquickitem2/data/implicitsize.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/keynavigationtest.qml (renamed from tests/auto/declarative/qquickitem2/data/keynavigationtest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/keynavigationtest_implicit.qml (renamed from tests/auto/declarative/qquickitem2/data/keynavigationtest_implicit.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/keyspriority.qml (renamed from tests/auto/declarative/qquickitem2/data/keyspriority.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/keystest.qml (renamed from tests/auto/declarative/qquickitem2/data/keystest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/layoutmirroring.qml (renamed from tests/auto/declarative/qquickitem2/data/layoutmirroring.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/mapCoordinates.qml (renamed from tests/auto/declarative/qquickitem2/data/mapCoordinates.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/propertychanges.qml (renamed from tests/auto/declarative/qquickitem2/data/propertychanges.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/qtbug_16871.qml (renamed from tests/auto/declarative/qquickitem2/data/qtbug_16871.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/resourcesProperty.qml (renamed from tests/auto/declarative/qquickitem2/data/resourcesProperty.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/data/transformCrash.qml (renamed from tests/auto/declarative/qquickitem2/data/transformCrash.qml)0
-rw-r--r--tests/auto/qtquick2/qquickitem2/qquickitem2.pro13
-rw-r--r--tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp1254
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/ComponentView.qml (renamed from tests/auto/declarative/qquicklistview/data/ComponentView.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/asyncloader.qml (renamed from tests/auto/declarative/qquicklistview/data/asyncloader.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/attachedSignals.qml (renamed from tests/auto/declarative/qquicklistview/data/attachedSignals.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/creationContext.qml (renamed from tests/auto/declarative/qquicklistview/data/creationContext.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/displaylist.qml (renamed from tests/auto/declarative/qquicklistview/data/displaylist.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/fillModelOnComponentCompleted.qml (renamed from tests/auto/declarative/qquicklistview/data/fillModelOnComponentCompleted.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/footer.qml (renamed from tests/auto/declarative/qquicklistview/data/footer.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/header.qml (renamed from tests/auto/declarative/qquicklistview/data/header.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/headerfooter.qml (renamed from tests/auto/declarative/qquicklistview/data/headerfooter.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/itemlist.qml (renamed from tests/auto/declarative/qquicklistview/data/itemlist.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/listview-enforcerange-nohighlight.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-enforcerange-nohighlight.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/listview-enforcerange.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-enforcerange.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/listview-initCurrent.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-initCurrent.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/listview-noCurrent.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-noCurrent.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/listview-sections.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-sections.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/listview-sections_delegate.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-sections_delegate.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/listviewtest.qml (renamed from tests/auto/declarative/qquicklistview/data/listviewtest.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/manual-highlight.qml (renamed from tests/auto/declarative/qquicklistview/data/manual-highlight.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/margins.qml (renamed from tests/auto/declarative/qquicklistview/data/margins.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/propertychangestest.qml (renamed from tests/auto/declarative/qquicklistview/data/propertychangestest.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/qtbug-21742.qml (renamed from tests/auto/declarative/qquicklistview/data/qtbug-21742.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/qtbug14821.qml (renamed from tests/auto/declarative/qquicklistview/data/qtbug14821.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/qtbug16037.qml (renamed from tests/auto/declarative/qquicklistview/data/qtbug16037.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/resizeview.qml (renamed from tests/auto/declarative/qquicklistview/data/resizeview.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/rightToLeft.qml (renamed from tests/auto/declarative/qquicklistview/data/rightToLeft.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/sizelessthan1.qml (renamed from tests/auto/declarative/qquicklistview/data/sizelessthan1.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/snapToItem.qml (renamed from tests/auto/declarative/qquicklistview/data/snapToItem.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/data/strictlyenforcerange.qml (renamed from tests/auto/declarative/qquicklistview/data/strictlyenforcerange.qml)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/incrementalmodel.cpp (renamed from tests/auto/declarative/qquicklistview/incrementalmodel.cpp)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/incrementalmodel.h (renamed from tests/auto/declarative/qquicklistview/incrementalmodel.h)0
-rw-r--r--tests/auto/qtquick2/qquicklistview/qquicklistview.pro13
-rw-r--r--tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp4379
-rw-r--r--tests/auto/qtquick2/qquickloader/data/ActiveComponent.qml (renamed from tests/auto/declarative/qquickloader/data/ActiveComponent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/AnchoredLoader.qml (renamed from tests/auto/declarative/qquickloader/data/AnchoredLoader.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/BigComponent.qml (renamed from tests/auto/declarative/qquickloader/data/BigComponent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/BlueRect.qml (renamed from tests/auto/declarative/qquickloader/data/BlueRect.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/CreationContextLoader.qml (renamed from tests/auto/declarative/qquickloader/data/CreationContextLoader.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/GraphicsWidget250x250.qml (renamed from tests/auto/declarative/qquickloader/data/GraphicsWidget250x250.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/GreenRect.qml (renamed from tests/auto/declarative/qquickloader/data/GreenRect.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/InitialPropertyValuesComponent.qml (renamed from tests/auto/declarative/qquickloader/data/InitialPropertyValuesComponent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/InvalidSourceComponent.qml (renamed from tests/auto/declarative/qquickloader/data/InvalidSourceComponent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/NoResize.qml (renamed from tests/auto/declarative/qquickloader/data/NoResize.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/NoResizeGraphicsWidget.qml (renamed from tests/auto/declarative/qquickloader/data/NoResizeGraphicsWidget.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/QTBUG_16928.qml (renamed from tests/auto/declarative/qquickloader/data/QTBUG_16928.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/QTBUG_17114.qml (renamed from tests/auto/declarative/qquickloader/data/QTBUG_17114.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/Rect120x60.qml (renamed from tests/auto/declarative/qquickloader/data/Rect120x60.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/SetSourceComponent.qml (renamed from tests/auto/declarative/qquickloader/data/SetSourceComponent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/SizeGraphicsWidgetToLoader.qml (renamed from tests/auto/declarative/qquickloader/data/SizeGraphicsWidgetToLoader.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/SizeLoaderToGraphicsWidget.qml (renamed from tests/auto/declarative/qquickloader/data/SizeLoaderToGraphicsWidget.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/SizeToItem.qml (renamed from tests/auto/declarative/qquickloader/data/SizeToItem.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/SizeToLoader.qml (renamed from tests/auto/declarative/qquickloader/data/SizeToLoader.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/VmeError.qml (renamed from tests/auto/declarative/qquickloader/data/VmeError.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/active.1.qml (renamed from tests/auto/declarative/qquickloader/data/active.1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/active.2.qml (renamed from tests/auto/declarative/qquickloader/data/active.2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/active.3.qml (renamed from tests/auto/declarative/qquickloader/data/active.3.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/active.4.qml (renamed from tests/auto/declarative/qquickloader/data/active.4.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/active.5.qml (renamed from tests/auto/declarative/qquickloader/data/active.5.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/active.6.qml (renamed from tests/auto/declarative/qquickloader/data/active.6.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/active.7.qml (renamed from tests/auto/declarative/qquickloader/data/active.7.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/active.8.qml (renamed from tests/auto/declarative/qquickloader/data/active.8.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/asynchronous.qml (renamed from tests/auto/declarative/qquickloader/data/asynchronous.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/crash.qml (renamed from tests/auto/declarative/qquickloader/data/crash.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/creationContext.qml (renamed from tests/auto/declarative/qquickloader/data/creationContext.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/differentorigin.qml (renamed from tests/auto/declarative/qquickloader/data/differentorigin.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/implicitSize.qml (renamed from tests/auto/declarative/qquickloader/data/implicitSize.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.1.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.2.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.3.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.3.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.4.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.4.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.5.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.5.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.6.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.6.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.7.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.7.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.8.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.8.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.binding.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.binding.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.1.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.2.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.3.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.3.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.4.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.4.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/nonItem.qml (renamed from tests/auto/declarative/qquickloader/data/nonItem.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/parented.qml (renamed from tests/auto/declarative/qquickloader/data/parented.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/qmldir (renamed from tests/auto/declarative/qquickloader/data/qmldir)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/sameorigin-load.qml (renamed from tests/auto/declarative/qquickloader/data/sameorigin-load.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/sameorigin.qml (renamed from tests/auto/declarative/qquickloader/data/sameorigin.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/data/vmeErrors.qml (renamed from tests/auto/declarative/qquickloader/data/vmeErrors.qml)0
-rw-r--r--tests/auto/qtquick2/qquickloader/qquickloader.pro16
-rw-r--r--tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp969
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/clickThrough.qml (renamed from tests/auto/declarative/qquickmousearea/data/clickThrough.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/clickThrough2.qml (renamed from tests/auto/declarative/qquickmousearea/data/clickThrough2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/clickandhold.qml (renamed from tests/auto/declarative/qquickmousearea/data/clickandhold.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/clicktwice.qml (renamed from tests/auto/declarative/qquickmousearea/data/clicktwice.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/doubleclick.qml (renamed from tests/auto/declarative/qquickmousearea/data/doubleclick.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/dragging.qml (renamed from tests/auto/declarative/qquickmousearea/data/dragging.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/dragproperties.qml (renamed from tests/auto/declarative/qquickmousearea/data/dragproperties.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/dragreset.qml (renamed from tests/auto/declarative/qquickmousearea/data/dragreset.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/hoverPosition.qml (renamed from tests/auto/declarative/qquickmousearea/data/hoverPosition.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/hoverPropagation.qml (renamed from tests/auto/declarative/qquickmousearea/data/hoverPropagation.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/noclickandhold.qml (renamed from tests/auto/declarative/qquickmousearea/data/noclickandhold.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/pressedCanceled.qml (renamed from tests/auto/declarative/qquickmousearea/data/pressedCanceled.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/pressedOrdering.qml (renamed from tests/auto/declarative/qquickmousearea/data/pressedOrdering.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/preventstealing.qml (renamed from tests/auto/declarative/qquickmousearea/data/preventstealing.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/rejectEvent.qml (renamed from tests/auto/declarative/qquickmousearea/data/rejectEvent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnClick.qml (renamed from tests/auto/declarative/qquickmousearea/data/updateMousePosOnClick.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnResize.qml (renamed from tests/auto/declarative/qquickmousearea/data/updateMousePosOnResize.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro14
-rw-r--r--tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp824
-rw-r--r--tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/inFlickable.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmultipointtoucharea/data/nested.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/nested.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmultipointtoucharea/data/nonOverlapping.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/nonOverlapping.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmultipointtoucharea/data/properties.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/properties.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/signalTest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickmultipointtoucharea/qquickmultipointtoucharea.pro11
-rw-r--r--tests/auto/qtquick2/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp586
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/ComponentView.qml (renamed from tests/auto/declarative/qquickpathview/data/ComponentView.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/asyncloader.qml (renamed from tests/auto/declarative/qquickpathview/data/asyncloader.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/closedPath.qml (renamed from tests/auto/declarative/qquickpathview/data/closedPath.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/creationContext.qml (renamed from tests/auto/declarative/qquickpathview/data/creationContext.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/datamodel.qml (renamed from tests/auto/declarative/qquickpathview/data/datamodel.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/displaypath.qml (renamed from tests/auto/declarative/qquickpathview/data/displaypath.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/dragpath.qml (renamed from tests/auto/declarative/qquickpathview/data/dragpath.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/emptymodel.qml (renamed from tests/auto/declarative/qquickpathview/data/emptymodel.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/missingPercent.qml (renamed from tests/auto/declarative/qquickpathview/data/missingPercent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/openPath.qml (renamed from tests/auto/declarative/qquickpathview/data/openPath.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathUpdate.qml (renamed from tests/auto/declarative/qquickpathview/data/pathUpdate.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathUpdateOnStartChanged.qml (renamed from tests/auto/declarative/qquickpathview/data/pathUpdateOnStartChanged.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathline.qml (renamed from tests/auto/declarative/qquickpathview/data/pathline.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathtest.qml (renamed from tests/auto/declarative/qquickpathview/data/pathtest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathview0.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview0.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathview1.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathview2.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathview3.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview3.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/pathview_package.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview_package.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/propertychanges.qml (renamed from tests/auto/declarative/qquickpathview/data/propertychanges.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/treemodel.qml (renamed from tests/auto/declarative/qquickpathview/data/treemodel.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/undefinedpath.qml (renamed from tests/auto/declarative/qquickpathview/data/undefinedpath.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/data/vdm.qml (renamed from tests/auto/declarative/qquickpathview/data/vdm.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpathview/qquickpathview.pro12
-rw-r--r--tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp1629
-rw-r--r--tests/auto/qtquick2/qquickpincharea/data/pinchproperties.qml (renamed from tests/auto/declarative/qquickpincharea/data/pinchproperties.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro13
-rw-r--r--tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp395
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/allInvisible.qml (renamed from tests/auto/declarative/qquickpositioners/data/allInvisible.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/attachedproperties-column.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-column.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/attachedproperties-dynamic.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-dynamic.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/attachedproperties-flow.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-flow.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/attachedproperties-grid.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-grid.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/attachedproperties-row.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-row.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/flow-testimplicitsize.qml (renamed from tests/auto/declarative/qquickpositioners/data/flow-testimplicitsize.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/flowtest-toptobottom.qml (renamed from tests/auto/declarative/qquickpositioners/data/flowtest-toptobottom.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/flowtest.qml (renamed from tests/auto/declarative/qquickpositioners/data/flowtest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/grid-animated.qml (renamed from tests/auto/declarative/qquickpositioners/data/grid-animated.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/grid-row-column-spacing.qml (renamed from tests/auto/declarative/qquickpositioners/data/grid-row-column-spacing.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/grid-spacing.qml (renamed from tests/auto/declarative/qquickpositioners/data/grid-spacing.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/grid-toptobottom.qml (renamed from tests/auto/declarative/qquickpositioners/data/grid-toptobottom.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/gridtest.qml (renamed from tests/auto/declarative/qquickpositioners/data/gridtest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/gridzerocolumns.qml (renamed from tests/auto/declarative/qquickpositioners/data/gridzerocolumns.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/horizontal-animated-disabled.qml (renamed from tests/auto/declarative/qquickpositioners/data/horizontal-animated-disabled.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/horizontal-animated.qml (renamed from tests/auto/declarative/qquickpositioners/data/horizontal-animated.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/horizontal-spacing.qml (renamed from tests/auto/declarative/qquickpositioners/data/horizontal-spacing.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/horizontal.qml (renamed from tests/auto/declarative/qquickpositioners/data/horizontal.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/propertychangestest.qml (renamed from tests/auto/declarative/qquickpositioners/data/propertychangestest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/rectangleComponent.qml (renamed from tests/auto/declarative/qquickpositioners/data/rectangleComponent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/repeatertest.qml (renamed from tests/auto/declarative/qquickpositioners/data/repeatertest.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/vertical-animated.qml (renamed from tests/auto/declarative/qquickpositioners/data/vertical-animated.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/vertical-spacing.qml (renamed from tests/auto/declarative/qquickpositioners/data/vertical-spacing.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/data/vertical.qml (renamed from tests/auto/declarative/qquickpositioners/data/vertical.qml)0
-rw-r--r--tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro11
-rw-r--r--tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp1473
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/asyncloader.qml (renamed from tests/auto/declarative/qquickrepeater/data/asyncloader.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/initparent.qml (renamed from tests/auto/declarative/qquickrepeater/data/initparent.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/intmodel.qml (renamed from tests/auto/declarative/qquickrepeater/data/intmodel.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/itemlist.qml (renamed from tests/auto/declarative/qquickrepeater/data/itemlist.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/modelChanged.qml (renamed from tests/auto/declarative/qquickrepeater/data/modelChanged.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/objlist.qml (renamed from tests/auto/declarative/qquickrepeater/data/objlist.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/properties.qml (renamed from tests/auto/declarative/qquickrepeater/data/properties.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/repeater1.qml (renamed from tests/auto/declarative/qquickrepeater/data/repeater1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/data/repeater2.qml (renamed from tests/auto/declarative/qquickrepeater/data/repeater2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro12
-rw-r--r--tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp764
-rw-r--r--tests/auto/qtquick2/qquickshadereffect/qquickshadereffect.pro8
-rw-r--r--tests/auto/qtquick2/qquickshadereffect/tst_qquickshadereffect.cpp (renamed from tests/auto/declarative/qquickshadereffect/tst_qquickshadereffect.cpp)0
-rw-r--r--tests/auto/qtquick2/qquickspriteimage/data/basic.qml (renamed from tests/auto/declarative/qquickspriteimage/data/basic.qml)0
-rw-r--r--tests/auto/qtquick2/qquickspriteimage/data/squarefacesprite.png (renamed from tests/auto/declarative/qquickspriteimage/data/squarefacesprite.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro12
-rw-r--r--tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp81
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments.qml (renamed from tests/auto/declarative/qquicktext/data/alignments.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_cb.png (renamed from tests/auto/declarative/qquicktext/data/alignments_cb.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_cc.png (renamed from tests/auto/declarative/qquicktext/data/alignments_cc.png)bin556 -> 556 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_ct.png (renamed from tests/auto/declarative/qquicktext/data/alignments_ct.png)bin533 -> 533 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_lb.png (renamed from tests/auto/declarative/qquicktext/data/alignments_lb.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_lc.png (renamed from tests/auto/declarative/qquicktext/data/alignments_lc.png)bin535 -> 535 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_lt.png (renamed from tests/auto/declarative/qquicktext/data/alignments_lt.png)bin514 -> 514 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_rb.png (renamed from tests/auto/declarative/qquicktext/data/alignments_rb.png)bin505 -> 505 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_rc.png (renamed from tests/auto/declarative/qquicktext/data/alignments_rc.png)bin559 -> 559 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/alignments_rt.png (renamed from tests/auto/declarative/qquicktext/data/alignments_rt.png)bin539 -> 539 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/embeddedImagesLocal.qml (renamed from tests/auto/declarative/qquicktext/data/embeddedImagesLocal.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/embeddedImagesLocalError.qml (renamed from tests/auto/declarative/qquicktext/data/embeddedImagesLocalError.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/embeddedImagesRemote.qml (renamed from tests/auto/declarative/qquicktext/data/embeddedImagesRemote.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/embeddedImagesRemoteError.qml (renamed from tests/auto/declarative/qquicktext/data/embeddedImagesRemoteError.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qquicktext/data/horizontalAlignment_RightToLeft.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/http/exists.png (renamed from tests/auto/declarative/qquicktext/data/http/exists.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick2/qquicktext/data/lineCount.qml (renamed from tests/auto/declarative/qquicktext/data/lineCount.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/lineHeight.qml (renamed from tests/auto/declarative/qquicktext/data/lineHeight.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/lineLayout.qml (renamed from tests/auto/declarative/qquicktext/data/lineLayout.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/multilineelide.qml (renamed from tests/auto/declarative/qquicktext/data/multilineelide.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/qtbug_14734.qml (renamed from tests/auto/declarative/qquicktext/data/qtbug_14734.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/data/rotated.qml (renamed from tests/auto/declarative/qquicktext/data/rotated.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktext/qquicktext.pro17
-rw-r--r--tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp1460
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/CursorRect.qml (renamed from tests/auto/declarative/qquicktextedit/data/CursorRect.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments.qml (renamed from tests/auto/declarative/qquicktextedit/data/alignments.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_cb.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_cb.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_cc.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_cc.png)bin556 -> 556 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_ct.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_ct.png)bin533 -> 533 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_lb.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_lb.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_lc.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_lc.png)bin535 -> 535 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_lt.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_lt.png)bin514 -> 514 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_rb.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_rb.png)bin505 -> 505 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_rc.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_rc.png)bin559 -> 559 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/alignments_rt.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_rt.png)bin539 -> 539 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/cursorTest.qml (renamed from tests/auto/declarative/qquicktextedit/data/cursorTest.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/cursorVisible.qml (renamed from tests/auto/declarative/qquicktextedit/data/cursorVisible.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/geometrySignals.qml (renamed from tests/auto/declarative/qquicktextedit/data/geometrySignals.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qquicktextedit/data/horizontalAlignment_RightToLeft.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/http/ErrItem.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/ErrItem.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/http/NormItem.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/NormItem.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTest.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTest.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail1.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail1.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail2.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail2.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestPass.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestPass.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/http/qmldir (renamed from tests/auto/declarative/qquicktextedit/data/http/qmldir)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/httpfail/FailItem.qml (renamed from tests/auto/declarative/qquicktextedit/data/httpfail/FailItem.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/httpslow/WaitItem.qml (renamed from tests/auto/declarative/qquicktextedit/data/httpslow/WaitItem.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/inputContext.qml (renamed from tests/auto/declarative/qquicktextedit/data/inputContext.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/inputMethodEvent.qml (renamed from tests/auto/declarative/qquicktextedit/data/inputMethodEvent.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/inputmethodhints.qml (renamed from tests/auto/declarative/qquicktextedit/data/inputmethodhints.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/mouseselection_default.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_default.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/mouseselection_false.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_false.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/mouseselection_false_words.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_false_words.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/mouseselection_true.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_true.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/mouseselection_true_words.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_true_words.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_characters.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_characters.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_default.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_default.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_words.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_words.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/navigation.qml (renamed from tests/auto/declarative/qquicktextedit/data/navigation.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/openInputPanel.qml (renamed from tests/auto/declarative/qquicktextedit/data/openInputPanel.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/positionAt.qml (renamed from tests/auto/declarative/qquicktextedit/data/positionAt.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/qtbug-22058.qml (renamed from tests/auto/declarative/qquicktextedit/data/qtbug-22058.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/data/readOnly.qml (renamed from tests/auto/declarative/qquicktextedit/data/readOnly.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro12
-rw-r--r--tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp3555
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/cursorTest.qml (renamed from tests/auto/declarative/qquicktextinput/data/cursorTest.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/cursorVisible.qml (renamed from tests/auto/declarative/qquicktextinput/data/cursorVisible.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/echoMode.qml (renamed from tests/auto/declarative/qquicktextinput/data/echoMode.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/geometrySignals.qml (renamed from tests/auto/declarative/qquicktextinput/data/geometrySignals.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/halign_center.png (renamed from tests/auto/declarative/qquicktextinput/data/halign_center.png)bin293 -> 293 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/halign_left.png (renamed from tests/auto/declarative/qquicktextinput/data/halign_left.png)bin291 -> 291 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/halign_right.png (renamed from tests/auto/declarative/qquicktextinput/data/halign_right.png)bin292 -> 292 bytes
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment.qml (renamed from tests/auto/declarative/qquicktextinput/data/horizontalAlignment.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qquicktextinput/data/horizontalAlignment_RightToLeft.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/inputContext.qml (renamed from tests/auto/declarative/qquicktextinput/data/inputContext.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/inputMethodEvent.qml (renamed from tests/auto/declarative/qquicktextinput/data/inputMethodEvent.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/inputmethods.qml (renamed from tests/auto/declarative/qquicktextinput/data/inputmethods.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/masks.qml (renamed from tests/auto/declarative/qquicktextinput/data/masks.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/maxLength.qml (renamed from tests/auto/declarative/qquicktextinput/data/maxLength.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/mouseselection_true.qml (renamed from tests/auto/declarative/qquicktextinput/data/mouseselection_true.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_characters.qml (renamed from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_characters.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_default.qml (renamed from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_default.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_words.qml (renamed from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_words.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/navigation.qml (renamed from tests/auto/declarative/qquicktextinput/data/navigation.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/openInputPanel.qml (renamed from tests/auto/declarative/qquicktextinput/data/openInputPanel.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/positionAt.qml (renamed from tests/auto/declarative/qquicktextinput/data/positionAt.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/preeditAutoScroll.qml (renamed from tests/auto/declarative/qquicktextinput/data/preeditAutoScroll.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/qtbug-19956double.qml (renamed from tests/auto/declarative/qquicktextinput/data/qtbug-19956double.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/qtbug-19956int.qml (renamed from tests/auto/declarative/qquicktextinput/data/qtbug-19956int.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/qtbug-19956regexp.qml (renamed from tests/auto/declarative/qquicktextinput/data/qtbug-19956regexp.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/readOnly.qml (renamed from tests/auto/declarative/qquicktextinput/data/readOnly.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/data/validators.qml (renamed from tests/auto/declarative/qquicktextinput/data/validators.qml)0
-rw-r--r--tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro11
-rw-r--r--tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp3310
-rw-r--r--tests/auto/qtquick2/qquickview/data/error1.qml (renamed from tests/auto/declarative/qquickview/data/error1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickview/data/resizemodeitem.qml (renamed from tests/auto/declarative/qquickview/data/resizemodeitem.qml)0
-rw-r--r--tests/auto/qtquick2/qquickview/qquickview.pro11
-rw-r--r--tests/auto/qtquick2/qquickview/tst_qquickview.cpp207
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/create.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/create.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/datalist-package.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/datalist-package.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/datalist.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/datalist.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/groups-invalid.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/groups-invalid.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/groups-package.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/groups-package.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/groups.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/groups.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_listView.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_listView.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_package.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_package.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/modelproperties.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties2.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/modelproperties2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/objectlist.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/objectlist.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/onChanged.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/onChanged.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole1.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/singlerole1.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole2.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/singlerole2.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/data/visualdatamodel.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/visualdatamodel.qml)0
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro13
-rw-r--r--tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp1865
-rw-r--r--tests/auto/qtquick2/qtquick2.pro63
-rw-r--r--tests/auto/shared/testhttpserver.cpp (renamed from tests/auto/declarative/shared/testhttpserver.cpp)0
-rw-r--r--tests/auto/shared/testhttpserver.h (renamed from tests/auto/declarative/shared/testhttpserver.h)0
-rw-r--r--tests/auto/shared/util.h (renamed from tests/auto/declarative/shared/util.h)0
-rw-r--r--tests/benchmarks/particles/affectors/affectors.pro2
-rw-r--r--tests/benchmarks/particles/emission/emission.pro2
-rw-r--r--tools/qmleasing/main.cpp4
-rw-r--r--tools/qmleasing/qmleasing.pro2
-rw-r--r--tools/qmlplugindump/main.cpp16
-rw-r--r--tools/qmlplugindump/qmlplugindump.pro2
-rw-r--r--tools/qmlscene/main.cpp4
-rw-r--r--tools/qmlscene/qmlscene.pro2
1439 files changed, 107138 insertions, 106954 deletions
diff --git a/doc/src/quick/qtquick.qdoc b/doc/src/quick/qtquick.qdoc
new file mode 100644
index 0000000000..358e9f8433
--- /dev/null
+++ b/doc/src/quick/qtquick.qdoc
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \module QtQuick
+ \title Qt Quick Module
+ \ingroup modules
+
+ \brief The Qt Quick module provides classes for embedding Qt Quick
+ in Qt/C++ applications.
+
+ To include the definitions of the module's classes, use the
+ following directive:
+
+ \code
+ #include <QtQuick>
+ \endcode
+
+ To link against the module, add this line to your \l qmake \c
+ .pro file:
+
+ \code
+ QT += quick
+ \endcode
+
+ For more information on the Qt Quick module, see the
+ \l{Qt Quick} documentation.
+*/
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
index e8ccdb7e36..4a13b7a597 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
@@ -44,7 +44,7 @@
#include <QDeclarativeEngine>
#include <QDeclarativeNetworkAccessManagerFactory>
-#include <QQuickView>
+#include <QtQuick/QQuickView>
/*
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 74d8db321d..18d7879900 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = networkaccessmanagerfactory
DEPENDPATH += .
INCLUDEPATH += .
-QT += declarative network
+QT += declarative quick network
# Input
SOURCES += main.cpp
diff --git a/examples/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp
index 205835a9c0..5cc49af684 100644
--- a/examples/declarative/minehunt/main.cpp
+++ b/examples/declarative/minehunt/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <QtGui/QGuiApplication>
-#include <qquickview.h>
+#include <QtQuick/qquickview.h>
#include <QtDeclarative/QDeclarativeContext>
#include <QtDeclarative/QDeclarativeEngine>
diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro
index cf928ce333..82dfc0d5bc 100644
--- a/examples/declarative/minehunt/minehunt.pro
+++ b/examples/declarative/minehunt/minehunt.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = minehunt
-QT += declarative
+QT += declarative quick
# Input
HEADERS += minehunt.h
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
index 6c51eed9d2..eaf2b30c89 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -2,9 +2,9 @@ TEMPLATE = app
TARGET = abstractitemmodel
DEPENDPATH += .
INCLUDEPATH += .
-QT += declarative
+QT += declarative quick
HEADERS = model.h
SOURCES = main.cpp \
model.cpp
-RESOURCES += abstractitemmodel.qrc \ No newline at end of file
+RESOURCES += abstractitemmodel.qrc
diff --git a/examples/declarative/modelviews/abstractitemmodel/main.cpp b/examples/declarative/modelviews/abstractitemmodel/main.cpp
index 7924815879..d8c1abc939 100644
--- a/examples/declarative/modelviews/abstractitemmodel/main.cpp
+++ b/examples/declarative/modelviews/abstractitemmodel/main.cpp
@@ -43,8 +43,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
-#include <qquickitem.h>
-#include <qquickview.h>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickview.h>
//![0]
int main(int argc, char ** argv)
diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp
index 67ffb946c0..fc7252c864 100644
--- a/examples/declarative/modelviews/objectlistmodel/main.cpp
+++ b/examples/declarative/modelviews/objectlistmodel/main.cpp
@@ -43,8 +43,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
-#include <qquickitem.h>
-#include <qquickview.h>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickview.h>
#include "dataobject.h"
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
index 8cc293dbfa..434e6f080b 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = objectlistmodel
DEPENDPATH += .
INCLUDEPATH += .
-QT += declarative
+QT += declarative quick
# Input
SOURCES += main.cpp \
diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp
index ebd3c59307..d5ddbe8fb8 100644
--- a/examples/declarative/modelviews/stringlistmodel/main.cpp
+++ b/examples/declarative/modelviews/stringlistmodel/main.cpp
@@ -44,8 +44,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
-#include <qquickitem.h>
-#include <qquickview.h>
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickview.h>
/*
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
index 23dc481f88..d34f7d0b56 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
+++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = stringlistmodel
DEPENDPATH += .
INCLUDEPATH += .
-QT += declarative
+QT += declarative quick
# Input
SOURCES += main.cpp
diff --git a/examples/declarative/openglunderqml/main.cpp b/examples/declarative/openglunderqml/main.cpp
index 44984c5be3..cb65c3feac 100644
--- a/examples/declarative/openglunderqml/main.cpp
+++ b/examples/declarative/openglunderqml/main.cpp
@@ -41,7 +41,7 @@
#include <QGuiApplication>
-#include <QQuickView>
+#include <QtQuick/QQuickView>
#include "squircle.h"
diff --git a/examples/declarative/openglunderqml/openglunderqml.pro b/examples/declarative/openglunderqml/openglunderqml.pro
index 3cd167335b..c93ac791fe 100644
--- a/examples/declarative/openglunderqml/openglunderqml.pro
+++ b/examples/declarative/openglunderqml/openglunderqml.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += declarative quick
TEMPLATE = app
DEPENDPATH += .
diff --git a/examples/declarative/openglunderqml/squircle.cpp b/examples/declarative/openglunderqml/squircle.cpp
index c2d4c0ac97..55c1dd092c 100644
--- a/examples/declarative/openglunderqml/squircle.cpp
+++ b/examples/declarative/openglunderqml/squircle.cpp
@@ -41,8 +41,8 @@
#include "squircle.h"
-#include <qsgengine.h>
-#include <qquickcanvas.h>
+#include <QtQuick/qsgengine.h>
+#include <QtQuick/qquickcanvas.h>
#include <QOpenGLShaderProgram>
Squircle::Squircle()
diff --git a/examples/declarative/openglunderqml/squircle.h b/examples/declarative/openglunderqml/squircle.h
index c92c93e2db..ab33c6a25f 100644
--- a/examples/declarative/openglunderqml/squircle.h
+++ b/examples/declarative/openglunderqml/squircle.h
@@ -42,7 +42,7 @@
#ifndef SQUIRCLE_H
#define SQUIRCLE_H
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickItem>
#include <QtGui/QOpenGLShaderProgram>
class Squircle : public QQuickItem
diff --git a/examples/declarative/painteditem/smile/main.cpp b/examples/declarative/painteditem/smile/main.cpp
index dc76e71185..0f69f4c962 100644
--- a/examples/declarative/painteditem/smile/main.cpp
+++ b/examples/declarative/painteditem/smile/main.cpp
@@ -41,8 +41,8 @@
#include <QGuiApplication>
#include <QPainter>
#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qquickview.h>
-#include <QtDeclarative/qquickpainteditem.h>
+#include <QtQuick/qquickview.h>
+#include <QtQuick/qquickpainteditem.h>
class MyPaintItem : public QQuickPaintedItem
{
Q_OBJECT
diff --git a/examples/declarative/painteditem/smile/smile.pro b/examples/declarative/painteditem/smile/smile.pro
index 3b9e4e0f62..780d351fe6 100644
--- a/examples/declarative/painteditem/smile/smile.pro
+++ b/examples/declarative/painteditem/smile/smile.pro
@@ -1,7 +1,7 @@
TEMPLATE = app
TARGET = painteditem
-QT += declarative
+QT += declarative quick
macx: CONFIG -= app_bundle
diff --git a/examples/declarative/painteditem/textballoons/textballoon.h b/examples/declarative/painteditem/textballoons/textballoon.h
index 064d20bd7e..e35107c1b2 100644
--- a/examples/declarative/painteditem/textballoons/textballoon.h
+++ b/examples/declarative/painteditem/textballoons/textballoon.h
@@ -42,7 +42,7 @@
#ifndef TEXTBALLOON_H
#define TEXTBALLOON_H
-#include <QtDeclarative>
+#include <QtQuick>
//! [0]
class TextBalloon : public QQuickPaintedItem
diff --git a/examples/declarative/painteditem/textballoons/textballoons.pro b/examples/declarative/painteditem/textballoons/textballoons.pro
index 3148fd20e6..453a00336d 100644
--- a/examples/declarative/painteditem/textballoons/textballoons.pro
+++ b/examples/declarative/painteditem/textballoons/textballoons.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
CONFIG += qt plugin
-QT += declarative
+QT += declarative quick
TARGET = qmltextballoonplugin
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
index 0f0416718c..affc57ce1f 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
+++ b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += declarative quick
HEADERS += piechart.h
SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
index 2670871e61..c507b2c30c 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter1-basics/main.cpp
@@ -39,7 +39,7 @@
****************************************************************************/
//![0]
#include "piechart.h"
-#include <QQuickView>
+#include <QtQuick/QQuickView>
#include <QGuiApplication>
int main(int argc, char *argv[])
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h b/examples/declarative/tutorials/extending/chapter1-basics/piechart.h
index d1beb71545..1bd3019f7b 100644
--- a/examples/declarative/tutorials/extending/chapter1-basics/piechart.h
+++ b/examples/declarative/tutorials/extending/chapter1-basics/piechart.h
@@ -41,7 +41,7 @@
#define PIECHART_H
//![0]
-#include <QtDeclarative/QQuickPaintedItem>
+#include <QtQuick/QQuickPaintedItem>
#include <QColor>
class PieChart : public QQuickPaintedItem
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
index 0f0416718c..affc57ce1f 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
+++ b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += declarative quick
HEADERS += piechart.h
SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
index 2670871e61..c507b2c30c 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter2-methods/main.cpp
@@ -39,7 +39,7 @@
****************************************************************************/
//![0]
#include "piechart.h"
-#include <QQuickView>
+#include <QtQuick/QQuickView>
#include <QGuiApplication>
int main(int argc, char *argv[])
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h b/examples/declarative/tutorials/extending/chapter2-methods/piechart.h
index 5205151a0a..4ed9e0665c 100644
--- a/examples/declarative/tutorials/extending/chapter2-methods/piechart.h
+++ b/examples/declarative/tutorials/extending/chapter2-methods/piechart.h
@@ -40,7 +40,7 @@
#ifndef PIECHART_H
#define PIECHART_H
-#include <QtDeclarative/QQuickPaintedItem>
+#include <QtQuick/QQuickPaintedItem>
#include <QColor>
//![0]
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
index 0f0416718c..affc57ce1f 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
+++ b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += declarative quick
HEADERS += piechart.h
SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
index 2670871e61..c507b2c30c 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter3-bindings/main.cpp
@@ -39,7 +39,7 @@
****************************************************************************/
//![0]
#include "piechart.h"
-#include <QQuickView>
+#include <QtQuick/QQuickView>
#include <QGuiApplication>
int main(int argc, char *argv[])
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h
index 55be2a493f..7c5fda2744 100644
--- a/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h
+++ b/examples/declarative/tutorials/extending/chapter3-bindings/piechart.h
@@ -41,7 +41,7 @@
#define PIECHART_H
#include <QColor>
-#include <QtDeclarative/QQuickPaintedItem>
+#include <QtQuick/QQuickPaintedItem>
//![0]
class PieChart : public QQuickPaintedItem
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
index c3f5402aea..6724fa0375 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += declarative quick
HEADERS += piechart.h \
pieslice.h
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
index c9b9a0b5aa..5d1c4d6839 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/main.cpp
@@ -40,7 +40,7 @@
#include "piechart.h"
#include "pieslice.h"
-#include <QQuickView>
+#include <QtQuick/QQuickView>
#include <QGuiApplication>
//![0]
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h
index c1cdf30805..36a866dfc3 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/piechart.h
@@ -40,7 +40,7 @@
#ifndef PIECHART_H
#define PIECHART_H
-#include <QtDeclarative/QQuickItem>
+#include <QtQuick/QQuickItem>
class PieSlice;
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
index 59606486a4..23913adf84 100644
--- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
+++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/pieslice.h
@@ -40,7 +40,7 @@
#ifndef PIESLICE_H
#define PIESLICE_H
-#include <QtDeclarative/QQuickPaintedItem>
+#include <QtQuick/QQuickPaintedItem>
#include <QColor>
//![0]
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
index c3f5402aea..6724fa0375 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
@@ -1,4 +1,4 @@
-QT += declarative
+QT += declarative quick
HEADERS += piechart.h \
pieslice.h
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
index 78f6f25485..afd34455c8 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/main.cpp
@@ -40,7 +40,7 @@
#include "piechart.h"
#include "pieslice.h"
-#include <QQuickView>
+#include <QtQuick/QQuickView>
#include <QGuiApplication>
int main(int argc, char *argv[])
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h
index feea3d2789..5ba6b10b7a 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.h
@@ -40,7 +40,7 @@
#ifndef PIECHART_H
#define PIECHART_H
-#include <QQuickItem>
+#include <QtQuick/QQuickItem>
class PieSlice;
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h
index 157e9cda77..a9174fbe0c 100644
--- a/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h
+++ b/examples/declarative/tutorials/extending/chapter5-listproperties/pieslice.h
@@ -40,7 +40,7 @@
#ifndef PIESLICE_H
#define PIESLICE_H
-#include <QtDeclarative/QQuickPaintedItem>
+#include <QtQuick/QQuickPaintedItem>
#include <QColor>
//![0]
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
index 47fe0a2fde..c243ec4572 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
+++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
CONFIG += qt plugin
-QT += declarative
+QT += declarative quick
DESTDIR = ChartsPlugin
TARGET = chartsplugin
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h
index 2d58360245..927dc25e5c 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h
+++ b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.h
@@ -40,7 +40,7 @@
#ifndef PIECHART_H
#define PIECHART_H
-#include <QQuickItem>
+#include <QtQuick/QQuickItem>
class PieSlice;
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h
index 4251e49396..c09b37d1c8 100644
--- a/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h
+++ b/examples/declarative/tutorials/extending/chapter6-plugins/pieslice.h
@@ -40,7 +40,7 @@
#ifndef PIESLICE_H
#define PIESLICE_H
-#include <QtDeclarative/QQuickPaintedItem>
+#include <QtQuick/QQuickPaintedItem>
#include <QColor>
class PieSlice : public QQuickPaintedItem
diff --git a/modules/qt_quick.pri b/modules/qt_quick.pri
new file mode 100644
index 0000000000..0dc827b732
--- /dev/null
+++ b/modules/qt_quick.pri
@@ -0,0 +1,17 @@
+QT.quick.VERSION = 5.0.0
+QT.quick.MAJOR_VERSION = 5
+QT.quick.MINOR_VERSION = 0
+QT.quick.PATCH_VERSION = 0
+
+QT.quick.name = QtQuick
+QT.quick.bins = $$QT_MODULE_BIN_BASE
+QT.quick.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuick
+QT.quick.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuick/$$QT.quick.VERSION
+QT.quick.sources = $$QT_MODULE_BASE/src/quick
+QT.quick.libs = $$QT_MODULE_LIB_BASE
+QT.quick.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.quick.imports = $$QT_MODULE_IMPORT_BASE
+QT.quick.depends = declarative
+QT.quick.DEFINES = QT_QUICK_LIB
+
+QT_CONFIG += quick
diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
index 7c74c63801..c2ee93b665 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
@@ -66,7 +66,7 @@ class QDeclarativeWatcher;
class QDataStream;
class QDeclarativeDebugStatesDelegate;
-class QDeclarativeEngineDebugService : public QDeclarativeDebugService
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebugService : public QDeclarativeDebugService
{
Q_OBJECT
public:
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 265e4eba33..ca81a4a3d3 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -31,10 +31,3 @@ HEADERS += qtdeclarativeversion.h
include(util/util.pri)
include(qml/qml.pri)
include(debugger/debugger.pri)
-include(scenegraph/scenegraph.pri)
-include(items/items.pri)
-include(particles/particles.pri)
-include(designer/designer.pri)
-
-HEADERS += qtquick2_p.h
-SOURCES += qtquick2.cpp
diff --git a/src/declarative/designer/designersupport.cpp b/src/declarative/designer/designersupport.cpp
deleted file mode 100644
index 9c565c138c..0000000000
--- a/src/declarative/designer/designersupport.cpp
+++ /dev/null
@@ -1,408 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "designersupport.h"
-#include <private/qquickitem_p.h>
-
-#include <private/qquickshadereffectsource_p.h>
-#include <private/qquickrectangle_p.h>
-#include <private/qdeclarativeengine_p.h>
-#include <private/qquickview_p.h>
-#include <private/qdeclarativestategroup_p.h>
-#include <QtGui/QImage>
-
-QT_BEGIN_NAMESPACE
-
-DesignerSupport::DesignerSupport()
-{
-}
-
-DesignerSupport::~DesignerSupport()
-{
- QHash<QQuickItem*, QQuickShaderEffectTexture*>::iterator iterator;
-
- for (iterator = m_itemTextureHash.begin(); iterator != m_itemTextureHash.end(); ++iterator) {
- QQuickShaderEffectTexture *texture = iterator.value();
- QQuickItem *item = iterator.key();
- QQuickItemPrivate::get(item)->derefFromEffectItem(true);
- delete texture;
- }
-}
-
-void DesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool hide)
-{
- if (referencedItem == 0)
- return;
-
- QQuickItemPrivate::get(referencedItem)->refFromEffectItem(hide);
- QQuickCanvasPrivate::get(referencedItem->canvas())->updateDirtyNode(referencedItem);
-
- Q_ASSERT(QQuickItemPrivate::get(referencedItem)->rootNode);
-
- if (!m_itemTextureHash.contains(referencedItem)) {
- QQuickShaderEffectTexture *texture = new QQuickShaderEffectTexture(referencedItem);
-
- texture->setLive(true);
- texture->setItem(QQuickItemPrivate::get(referencedItem)->rootNode);
- texture->setRect(referencedItem->boundingRect());
- texture->setSize(referencedItem->boundingRect().size().toSize());
- texture->setRecursive(true);
-#ifndef QT_OPENGL_ES
- texture->setFormat(GL_RGBA8);
-#else
- texture->setFormat(GL_RGBA);
-#endif
- texture->setHasMipmaps(false);
-
- m_itemTextureHash.insert(referencedItem, texture);
- }
-}
-
-void DesignerSupport::derefFromEffectItem(QQuickItem *referencedItem, bool unhide)
-{
- if (referencedItem == 0)
- return;
-
- delete m_itemTextureHash.take(referencedItem);
- QQuickItemPrivate::get(referencedItem)->derefFromEffectItem(unhide);
-}
-
-QImage DesignerSupport::renderImageForItem(QQuickItem *referencedItem, const QRectF &boundingRect, const QSize &imageSize)
-{
- if (referencedItem == 0 || referencedItem->parentItem() == 0) {
- qDebug() << __FILE__ << __LINE__ << "Warning: Item can be rendered.";
- return QImage();
- }
-
- QQuickShaderEffectTexture *renderTexture = m_itemTextureHash.value(referencedItem);
-
- Q_ASSERT(renderTexture);
- if (renderTexture == 0)
- return QImage();
- renderTexture->setRect(boundingRect);
- renderTexture->setSize(imageSize);
- renderTexture->updateTexture();
-
- QImage renderImage = renderTexture->toImage();
- renderImage = renderImage.mirrored(false, true);
-
- if (renderImage.size().isEmpty())
- qDebug() << __FILE__ << __LINE__ << "Warning: Image is empty.";
-
- return renderImage;
-}
-
-bool DesignerSupport::isDirty(QQuickItem *referencedItem, DirtyType dirtyType)
-{
- if (referencedItem == 0)
- return false;
-
- return QQuickItemPrivate::get(referencedItem)->dirtyAttributes & dirtyType;
-}
-
-void DesignerSupport::resetDirty(QQuickItem *referencedItem)
-{
- if (referencedItem == 0)
- return;
-
- QQuickItemPrivate::get(referencedItem)->dirtyAttributes = 0x0;
- QQuickItemPrivate::get(referencedItem)->removeFromDirtyList();
-}
-
-QTransform DesignerSupport::canvasTransform(QQuickItem *referencedItem)
-{
- if (referencedItem == 0)
- return QTransform();
-
- return QQuickItemPrivate::get(referencedItem)->itemToCanvasTransform();
-}
-
-QTransform DesignerSupport::parentTransform(QQuickItem *referencedItem)
-{
- if (referencedItem == 0)
- return QTransform();
-
- QTransform parentTransform;
-
- QQuickItemPrivate::get(referencedItem)->itemToParentTransform(parentTransform);
-
- return parentTransform;
-}
-
-QString propertyNameForAnchorLine(const QQuickAnchorLine::AnchorLine &anchorLine)
-{
- switch (anchorLine) {
- case QQuickAnchorLine::Left: return QLatin1String("left");
- case QQuickAnchorLine::Right: return QLatin1String("right");
- case QQuickAnchorLine::Top: return QLatin1String("top");
- case QQuickAnchorLine::Bottom: return QLatin1String("bottom");
- case QQuickAnchorLine::HCenter: return QLatin1String("horizontalCenter");
- case QQuickAnchorLine::VCenter: return QLatin1String("verticalCenter");
- case QQuickAnchorLine::Baseline: return QLatin1String("baseline");
- case QQuickAnchorLine::Invalid:
- default: return QString();
- }
-}
-
-bool isValidAnchorName(const QString &name)
-{
- static QStringList anchorNameList(QStringList() << QLatin1String("anchors.top")
- << QLatin1String("anchors.left")
- << QLatin1String("anchors.right")
- << QLatin1String("anchors.bottom")
- << QLatin1String("anchors.verticalCenter")
- << QLatin1String("anchors.horizontalCenter")
- << QLatin1String("anchors.fill")
- << QLatin1String("anchors.centerIn")
- << QLatin1String("anchors.baseline"));
-
- return anchorNameList.contains(name);
-}
-
-bool DesignerSupport::isAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem)
-{
- Q_ASSERT(dynamic_cast<QQuickItemPrivate*>(QQuickItemPrivate::get(fromItem)));
- QQuickItemPrivate *fromItemPrivate = static_cast<QQuickItemPrivate*>(QQuickItemPrivate::get(fromItem));
- QQuickAnchors *anchors = fromItemPrivate->anchors();
- return anchors->fill() == toItem
- || anchors->centerIn() == toItem
- || anchors->bottom().item == toItem
- || anchors->top().item == toItem
- || anchors->left().item == toItem
- || anchors->right().item == toItem
- || anchors->verticalCenter().item == toItem
- || anchors->horizontalCenter().item == toItem
- || anchors->baseline().item == toItem;
-}
-
-bool DesignerSupport::areChildrenAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem)
-{
- foreach (QQuickItem *childItem, fromItem->childItems()) {
- if (childItem) {
- if (isAnchoredTo(childItem, toItem))
- return true;
-
- if (areChildrenAnchoredTo(childItem, toItem))
- return true;
- }
- }
-
- return false;
-}
-
-QQuickAnchors *anchors(QQuickItem *item)
-{
- QQuickItemPrivate *itemPrivate = static_cast<QQuickItemPrivate*>(QQuickItemPrivate::get(item));
- return itemPrivate->anchors();
-}
-
-QQuickAnchors::Anchor anchorLineFlagForName(const QString &name)
-{
- if (name == QLatin1String("anchors.top"))
- return QQuickAnchors::TopAnchor;
-
- if (name == QLatin1String("anchors.left"))
- return QQuickAnchors::LeftAnchor;
-
- if (name == QLatin1String("anchors.bottom"))
- return QQuickAnchors::BottomAnchor;
-
- if (name == QLatin1String("anchors.right"))
- return QQuickAnchors::RightAnchor;
-
- if (name == QLatin1String("anchors.horizontalCenter"))
- return QQuickAnchors::HCenterAnchor;
-
- if (name == QLatin1String("anchors.verticalCenter"))
- return QQuickAnchors::VCenterAnchor;
-
- if (name == QLatin1String("anchors.baseline"))
- return QQuickAnchors::BaselineAnchor;
-
-
- Q_ASSERT_X(false, Q_FUNC_INFO, "wrong anchor name - this should never happen");
- return QQuickAnchors::LeftAnchor;
-}
-
-bool DesignerSupport::hasAnchor(QQuickItem *item, const QString &name)
-{
- if (!isValidAnchorName(name))
- return false;
-
- if (name == QLatin1String("anchors.fill"))
- return anchors(item)->fill() != 0;
-
- if (name == QLatin1String("anchors.centerIn"))
- return anchors(item)->centerIn() != 0;
-
- if (name == QLatin1String("anchors.right"))
- return anchors(item)->right().item != 0;
-
- if (name == QLatin1String("anchors.top"))
- return anchors(item)->top().item != 0;
-
- if (name == QLatin1String("anchors.left"))
- return anchors(item)->left().item != 0;
-
- if (name == QLatin1String("anchors.bottom"))
- return anchors(item)->bottom().item != 0;
-
- if (name == QLatin1String("anchors.horizontalCenter"))
- return anchors(item)->horizontalCenter().item != 0;
-
- if (name == QLatin1String("anchors.verticalCenter"))
- return anchors(item)->verticalCenter().item != 0;
-
- if (name == QLatin1String("anchors.baseline"))
- return anchors(item)->baseline().item != 0;
-
- return anchors(item)->usedAnchors().testFlag(anchorLineFlagForName(name));
-}
-
-QQuickItem *DesignerSupport::anchorFillTargetItem(QQuickItem *item)
-{
- return anchors(item)->fill();
-}
-
-QQuickItem *DesignerSupport::anchorCenterInTargetItem(QQuickItem *item)
-{
- return anchors(item)->centerIn();
-}
-
-
-
-QPair<QString, QObject*> DesignerSupport::anchorLineTarget(QQuickItem *item, const QString &name, QDeclarativeContext *context)
-{
- QObject *targetObject = 0;
- QString targetName;
-
- if (name == QLatin1String("anchors.fill")) {
- targetObject = anchors(item)->fill();
- } else if (name == QLatin1String("anchors.centerIn")) {
- targetObject = anchors(item)->centerIn();
- } else {
- QDeclarativeProperty metaProperty(item, name, context);
- if (!metaProperty.isValid())
- return QPair<QString, QObject*>();
-
- QQuickAnchorLine anchorLine = metaProperty.read().value<QQuickAnchorLine>();
- if (anchorLine.anchorLine != QQuickAnchorLine::Invalid) {
- targetObject = anchorLine.item;
- targetName = propertyNameForAnchorLine(anchorLine.anchorLine);
- }
-
- }
-
- return QPair<QString, QObject*>(targetName, targetObject);
-}
-
-void DesignerSupport::resetAnchor(QQuickItem *item, const QString &name)
-{
- if (name == QLatin1String("anchors.fill")) {
- anchors(item)->resetFill();
- } else if (name == QLatin1String("anchors.centerIn")) {
- anchors(item)->resetCenterIn();
- } else if (name == QLatin1String("anchors.top")) {
- anchors(item)->resetTop();
- } else if (name == QLatin1String("anchors.left")) {
- anchors(item)->resetLeft();
- } else if (name == QLatin1String("anchors.right")) {
- anchors(item)->resetRight();
- } else if (name == QLatin1String("anchors.bottom")) {
- anchors(item)->resetBottom();
- } else if (name == QLatin1String("anchors.horizontalCenter")) {
- anchors(item)->resetHorizontalCenter();
- } else if (name == QLatin1String("anchors.verticalCenter")) {
- anchors(item)->resetVerticalCenter();
- } else if (name == QLatin1String("anchors.baseline")) {
- anchors(item)->resetBaseline();
- }
-}
-
-QList<QObject*> DesignerSupport::statesForItem(QQuickItem *item)
-{
- QList<QObject*> objectList;
- QList<QDeclarativeState *> stateList = QQuickItemPrivate::get(item)->_states()->states();
- qCopy(stateList.begin(), stateList.end(), objectList.begin());
-
- return objectList;
-}
-
-bool DesignerSupport::isComponentComplete(QQuickItem *item)
-{
- return static_cast<QQuickItemPrivate*>(QQuickItemPrivate::get(item))->componentComplete;
-}
-
-int DesignerSupport::borderWidth(QQuickItem *item)
-{
- QQuickRectangle *rectangle = qobject_cast<QQuickRectangle*>(item);
- if (rectangle)
- return rectangle->border()->width();
-
- return 0;
-}
-
-void DesignerSupport::refreshExpressions(QDeclarativeContext *context)
-{
- QDeclarativeContextPrivate::get(context)->data->refreshExpressions();
-}
-
-void DesignerSupport::setRootItem(QQuickView *view, QQuickItem *item)
-{
- QQuickViewPrivate::get(view)->setRootObject(item);
-}
-
-bool DesignerSupport::isValidWidth(QQuickItem *item)
-{
- return QQuickItemPrivate::get(item)->heightValid;
-}
-
-bool DesignerSupport::isValidHeight(QQuickItem *item)
-{
- return QQuickItemPrivate::get(item)->widthValid;
-}
-
-void DesignerSupport::updateDirtyNode(QQuickItem *item)
-{
- QQuickCanvasPrivate::get(item->canvas())->updateDirtyNode(item);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/designer/designersupport.h b/src/declarative/designer/designersupport.h
deleted file mode 100644
index 7654363276..0000000000
--- a/src/declarative/designer/designersupport.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef DESIGNERSUPPORT_H
-#define DESIGNERSUPPORT_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-
-#include <QtCore/QtGlobal>
-#include <QtCore/QHash>
-#include <QtCore/QRectF>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QQuickItem;
-class QQuickShaderEffectTexture;
-class QImage;
-class QTransform;
-class QDeclarativeContext;
-class QQuickView;
-
-
-class Q_DECLARATIVE_EXPORT DesignerSupport
-{
-public:
- enum DirtyType {
- TransformOrigin = 0x00000001,
- Transform = 0x00000002,
- BasicTransform = 0x00000004,
- Position = 0x00000008,
- Size = 0x00000010,
-
- ZValue = 0x00000020,
- Content = 0x00000040,
- Smooth = 0x00000080,
- OpacityValue = 0x00000100,
- ChildrenChanged = 0x00000200,
- ChildrenStackingChanged = 0x00000400,
- ParentChanged = 0x00000800,
-
- Clip = 0x00001000,
- Canvas = 0x00002000,
-
- EffectReference = 0x00008000,
- Visible = 0x00010000,
- HideReference = 0x00020000,
-
- TransformUpdateMask = TransformOrigin | Transform | BasicTransform | Position | Size | Canvas,
- ComplexTransformUpdateMask = Transform | Canvas,
- ContentUpdateMask = Size | Content | Smooth | Canvas,
- ChildrenUpdateMask = ChildrenChanged | ChildrenStackingChanged | EffectReference | Canvas
- };
-
-
- DesignerSupport();
- ~DesignerSupport();
-
- void refFromEffectItem(QQuickItem *referencedItem, bool hide = true);
- void derefFromEffectItem(QQuickItem *referencedItem, bool unhide = true);
-
- QImage renderImageForItem(QQuickItem *referencedItem, const QRectF &boundingRect, const QSize &imageSize);
-
- static bool isDirty(QQuickItem *referencedItem, DirtyType dirtyType);
- static void resetDirty(QQuickItem *referencedItem);
-
- static QTransform canvasTransform(QQuickItem *referencedItem);
- static QTransform parentTransform(QQuickItem *referencedItem);
-
- static bool isAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem);
- static bool areChildrenAnchoredTo(QQuickItem *fromItem, QQuickItem *toItem);
- static bool hasAnchor(QQuickItem *item, const QString &name);
- static QQuickItem *anchorFillTargetItem(QQuickItem *item);
- static QQuickItem *anchorCenterInTargetItem(QQuickItem *item);
- static QPair<QString, QObject*> anchorLineTarget(QQuickItem *item, const QString &name, QDeclarativeContext *context);
- static void resetAnchor(QQuickItem *item, const QString &name);
-
-
- static QList<QObject*> statesForItem(QQuickItem *item);
-
- static bool isComponentComplete(QQuickItem *item);
-
- static int borderWidth(QQuickItem *item);
-
- static void refreshExpressions(QDeclarativeContext *context);
-
- static void setRootItem(QQuickView *view, QQuickItem *item);
-
- static bool isValidWidth(QQuickItem *item);
- static bool isValidHeight(QQuickItem *item);
-
- static void updateDirtyNode(QQuickItem *item);
-
-private:
- QHash<QQuickItem*, QQuickShaderEffectTexture*> m_itemTextureHash;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // DESIGNERSUPPORT_H
diff --git a/src/declarative/items/context2d/qquickcanvasitem.cpp b/src/declarative/items/context2d/qquickcanvasitem.cpp
deleted file mode 100644
index 81b7a49722..0000000000
--- a/src/declarative/items/context2d/qquickcanvasitem.cpp
+++ /dev/null
@@ -1,714 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <private/qsgadaptationlayer_p.h>
-#include "qquickcanvasitem_p.h"
-#include <private/qquickitem_p.h>
-#include "qquickcontext2d_p.h"
-#include "qquickcontext2dnode_p.h"
-#include "qquickcontext2dtexture_p.h"
-#include <private/qdeclarativepixmapcache_p.h>
-
-#include <qdeclarativeinfo.h>
-#include <private/qdeclarativeengine_p.h>
-#include <QtCore/QBuffer>
-
-QT_BEGIN_NAMESPACE
-
-class QQuickCanvasItemPrivate : public QQuickItemPrivate
-{
-public:
- QQuickCanvasItemPrivate();
- ~QQuickCanvasItemPrivate();
- QQuickContext2D* context;
- QQuickContext2DTexture* texture;
- QSizeF canvasSize;
- QSize tileSize;
- QRectF canvasWindow;
- QRectF dirtyRect;
- uint renderInThread : 1;
- uint hasCanvasSize :1;
- uint hasTileSize :1;
- uint hasCanvasWindow :1;
- uint componentCompleted :1;
- QQuickCanvasItem::RenderTarget renderTarget;
- QHash<QUrl, QDeclarativePixmap*> images;
- QUrl baseUrl;
-};
-
-QQuickCanvasItemPrivate::QQuickCanvasItemPrivate()
- : QQuickItemPrivate()
- , context(0)
- , texture(0)
- , canvasSize(1, 1)
- , tileSize(1, 1)
- , renderInThread(false)
- , hasCanvasSize(false)
- , hasTileSize(false)
- , hasCanvasWindow(false)
- , componentCompleted(false)
- , renderTarget(QQuickCanvasItem::FramebufferObject)
-{
-}
-
-QQuickCanvasItemPrivate::~QQuickCanvasItemPrivate()
-{
- qDeleteAll(images);
-}
-
-/*!
- \qmlclass Canvas QQuickCanvasItem
- \inqmlmodule QtQuick 2
- \since QtQuick 2.0
- \brief The Canvas item provides a 2D canvas element which enables drawing via Javascript.
- \inherits Item
- \ingroup qml-basic-visual-elements
-
- The Canvas item allows drawing of straight and curved lines, simple and
- complex shapes, graphs, and referenced graphic images. It can also add text, colors,
- shadows, gradients, and patterns, and do low level pixel operations. The Canvas
- output may be saved as an image file or serialized to a url.
-
- To define a drawing area in the Canvas item set the \c width and \c height properties.
- For example, the following code creates a Canvas item which has a drawing area with a height of 100
- pixels and width of 200 pixels:
- \qml
- import QtQuick 2.0
- Canvas {
- id:mycanvas
- width:100
- height:200
- }
- \endqml
-
- Currently the Canvas item only supports the two-dimensional rendering context.
-
- \section1 Threaded Rendering and Render Target
-
- The Canvas item supports two render targets: \c Canvas.Image and \c Canvas.FramebufferObject.
-
- The \c Canvas.Image render target is a \a QImage object. This render target supports background
- thread rendering, allowing complex or long running painting to be executed without blocking the UI.
-
- The Canvas.FramebufferObject render target utilizes OpenGL hardware accelaration rather than rendering into
- system memory, which in many cases results in faster rendering.
-
- The default render target is Canvas.Image and the default renderInThread property is
- false.
-
- \section1 Tiled Canvas
- The Canvas item supports tiled rendering by setting \l canvasSize, \l tileSize
- and \l canvasWindow properties.
-
- Tiling allows efficient display of a very large virtual via a smaller canvas
- window. The actual memory consumption is in relatation to the canvas window size. The painting
- code can draw within the virtual canvas without handling coordinate system transformations.
-
- The tiles overlapping with the canvas window may be cached eliminating the need to redraw,
- which can lead to significantly improved performance in some situations.
-
- \section1 Pixel Operations
- All HTML5 2D context pixel operations are supported. In order to ensure improved
- pixel reading/writing performance the \a Canvas.Image render target should be chosen. The
- \a Canvas.FramebufferObject render target requires the pixel data to be exchanged between
- the system memory and the graphic card, which is significantly more expensive. Rendering
- may also be synchronized with the V-sync signal (to avoid {en.wikipedia.org/wiki/Screen_tearing}{screen tearing})
- which will futher impact pixel operations with \c Canvas.FrambufferObject render target.
-
- \section1 Tips for Porting Existing HTML5 Canvas applications
-
- Although the Canvas item is provides a HTML5 like API, HTML5 canvas applications
- need to be modified to run in the Canvas item:
- \list
- \o Replace all DOM API calls with QML property bindings or Canvas item methods.
- \o Replace all HTML event handlers with the \a MouseArea item.
- \o Change setInterval/setTimeout function calls with the \a Timer item.
- \o Place painting code into the \a QtQuick2::Canvas::onPaint handler and trigger
- painting by calling the \c markDirty or \c requestPaint methods.
- \o To draw images, load them by calling the Canvas's loadImage method and then request to paint
- them in the onImageLoaded handler.
- \endlist
-
- \sa QtQuick2::Context2D
-*/
-
-QQuickCanvasItem::QQuickCanvasItem(QQuickItem *parent)
- : QQuickItem(*(new QQuickCanvasItemPrivate), parent)
-{
- setFlag(ItemHasContents);
-}
-
-QQuickCanvasItem::~QQuickCanvasItem()
-{
- Q_D(QQuickCanvasItem);
- delete d->context;
-}
-
-/*!
- \qmlproperty size QtQuick2::Canvas::canvasSize
- Holds the logical canvas size that the context paints on.
-
- By default, the canvas size is the same size as the current canvas item size.
- By setting the canvasSize, tileSize and canvasWindow, the Canvas
- item can act as a large virtual canvas with many seperately rendered tile rectangles
- Only those tiles within the current canvas window are painted by
- the Canvas render engine.
-
- \sa QtQuick2::Canvas::tileSize QtQuick2::Canvas::canvasWindow
-*/
-QSizeF QQuickCanvasItem::canvasSize() const
-{
- Q_D(const QQuickCanvasItem);
- return d->canvasSize;
-}
-
-void QQuickCanvasItem::setCanvasSize(const QSizeF & size)
-{
- Q_D(QQuickCanvasItem);
- if (d->canvasSize != size) {
- d->hasCanvasSize = true;
- d->canvasSize = size;
- emit canvasSizeChanged();
- polish();
- update();
- }
-}
-
-/*!
- \qmlproperty size QtQuick2::Canvas::tileSize
- Holds the canvas rendering tile size.
-
- The Canvas item enters tiled mode by setting canvasSize, tileSize and
- the canvasWindow. This can improve rendering performance
- by rendering and caching tiles instead of rendering the whole canvas every time.
-
- Memory will be consumed only by those tiles within the current visible region.
-
- By default the tileSize is the same as the canvasSize.
-
- \sa QtQuick2::Canvas::canvaasSize QtQuick2::Canvas::canvasWindow
-*/
-QSize QQuickCanvasItem::tileSize() const
-{
- Q_D(const QQuickCanvasItem);
- return d->tileSize;
-}
-
-void QQuickCanvasItem::setTileSize(const QSize & size)
-{
- Q_D(QQuickCanvasItem);
- if (d->tileSize != size) {
- d->hasTileSize = true;
- d->tileSize = size;
-
- emit tileSizeChanged();
- polish();
- update();
- }
-}
-
-/*!
- \qmlproperty rect QtQuick2::Canvas::canvasWindow
- Holds the current canvas visible window.
-
- By default the canvasWindow size is the same as the Canvas item
- size with the topleft point as (0, 0).
-
- If the canvasSize is different to the Canvas item size, the Canvas
- item can display different visible areas by changing the canvas windowSize
- and/or position.
-
- \sa QtQuick2::Canvas::canvasSize QtQuick2::Canvas::tileSize
-*/
-QRectF QQuickCanvasItem::canvasWindow() const
-{
- Q_D(const QQuickCanvasItem);
- return d->canvasWindow;
-}
-
-void QQuickCanvasItem::setCanvasWindow(const QRectF& rect)
-{
- Q_D(QQuickCanvasItem);
- if (d->canvasWindow != rect) {
- d->canvasWindow = rect;
-
- d->hasCanvasWindow = true;
- emit canvasWindowChanged();
- polish();
- update();
- }
-}
-
-
-QQuickContext2D* QQuickCanvasItem::context() const
-{
- Q_D(const QQuickCanvasItem);
- return d->context;
-}
-/*!
- \qmlproperty bool QtQuick2::Canvas::renderInThread
- Holds the current canvas rendering mode.
-
- Set renderInThread to true to render complex and long
- running painting in a dedicated background
- thread, avoiding blocking the main UI.
-
- \note: Not all renderTargets support background rendering. If background rendering
- is not supported by the current renderTarget, the renderInThread
- property is ignored.
-
- The default value is false.
- \sa QtQuick2::Canvas::renderTarget
-*/
-bool QQuickCanvasItem::renderInThread() const
-{
- Q_D(const QQuickCanvasItem);
- return d->renderInThread;
-}
-/*!
- \qmlproperty bool QtQuick2::Canvas::renderTarget
- Holds the current canvas render target.
-
- \list
- \o Canvas.Image - render to an in memory image buffer, the render
- target supports background rendering.
- \o Canvas.FramebufferObject - render to an OpenGL frame buffer,
- this render target will ignore the
- renderInThread property. The actual
- rendering happens in the main QML rendering
- process, which may be in a seperate render thread
- or in the main GUI thread depending upon the platform.
- \endlist
-
- The default render target is \c Canvas.Image.
- \sa QtQuick2::Canvas::renderInThread
-*/
-QQuickCanvasItem::RenderTarget QQuickCanvasItem::renderTarget() const
-{
- Q_D(const QQuickCanvasItem);
- return d->renderTarget;
-}
-
-void QQuickCanvasItem::setRenderTarget(RenderTarget target)
-{
- Q_D(QQuickCanvasItem);
- if (d->renderTarget != target) {
- d->renderTarget = target;
-
- if (d->componentCompleted)
- createTexture();
- emit renderTargetChanged();
- }
-}
-
-void QQuickCanvasItem::_doPainting(const QRectF& region)
-{
- Q_D(QQuickCanvasItem);
- emit paint(QDeclarativeV8Handle::fromHandle(d->context->v8value())
- , QQuickContext2DTexture::tiledRect(region, d->tileSize));
- if (d->texture)
- d->texture->wake();
-}
-
-void QQuickCanvasItem::setRenderInThread(bool renderInThread)
-{
- Q_D(QQuickCanvasItem);
- if (d->renderInThread != renderInThread) {
- d->renderInThread = renderInThread;
-
- if (d->componentCompleted)
- createTexture();
-
- if (d->renderInThread)
- connect(this, SIGNAL(painted()), SLOT(update()));
- else
- disconnect(this, SIGNAL(painted()), this, SLOT(update()));
- emit renderInThreadChanged();
- polish();
- update();
- }
-}
-
-void QQuickCanvasItem::geometryChanged(const QRectF &newGeometry,
- const QRectF &oldGeometry)
-{
- Q_D(QQuickCanvasItem);
- QQuickItem::geometryChanged(newGeometry, oldGeometry);
-
- const qreal w = newGeometry.width();
- const qreal h = newGeometry.height();
-
- if (!d->hasCanvasSize) {
- d->canvasSize = QSizeF(w, h);
- emit canvasSizeChanged();
- }
-
- if (!d->hasTileSize) {
- d->tileSize = d->canvasSize.toSize();
- emit tileSizeChanged();
- }
-
- if (!d->hasCanvasWindow) {
- d->canvasWindow = newGeometry;
- emit canvasWindowChanged();
- }
-
- polish();
- update();
-}
-
-void QQuickCanvasItem::componentComplete()
-{
- Q_D(QQuickCanvasItem);
- QQuickItem::componentComplete();
-
- if (!d->context)
- createContext();
- createTexture();
-
- d->baseUrl = qmlEngine(this)->contextForObject(this)->baseUrl();
- requestPaint();
- updatePolish(); //force update the canvas sizes to texture for the first time
- update();
- d->componentCompleted = true;
-}
-
-void QQuickCanvasItem::updatePolish()
-{
- Q_D(QQuickCanvasItem);
- QQuickItem::updatePolish();
- if (d->texture) {
- if (!d->renderInThread && d->dirtyRect.isValid())
- _doPainting(d->dirtyRect);
-
- d->texture->canvasChanged(d->canvasSize.toSize()
- , d->tileSize
- , d->canvasWindow.toAlignedRect()
- , d->dirtyRect.toAlignedRect()
- , d->smooth);
- d->dirtyRect = QRectF();
- }
-}
-
-QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
-{
- Q_D(QQuickCanvasItem);
- QQuickContext2DNode *node = static_cast<QQuickContext2DNode *>(oldNode);
- if (!node)
- node = new QQuickContext2DNode(this);
-
- node->setTexture(d->texture);
- node->setSize(d->canvasWindow.size());
- node->update();
- return node;
-}
-
-void QQuickCanvasItem::createTexture()
-{
- Q_D(QQuickCanvasItem);
-
- if (!d->texture
- || d->texture->threadRendering() != d->renderInThread
- || d->texture->renderTarget() != d->renderTarget) {
- if (d->texture) {
- d->texture->deleteLater();
- d->texture = 0;
- }
-
- if (d->renderTarget == QQuickCanvasItem::Image) {
- d->texture = new QQuickContext2DImageTexture(d->renderInThread);
- } else if (d->renderTarget == QQuickCanvasItem::FramebufferObject) {
- d->texture = new QQuickContext2DFBOTexture();
- }
-
- if (d->renderInThread && !d->texture->supportThreadRendering()) {
- qWarning("Canvas: render target does not support thread rendering, force to non-thread rendering mode.");
- d->renderInThread = false;
- emit renderInThreadChanged();
- }
-
- if (d->renderInThread)
- connect(d->texture, SIGNAL(textureChanged()), this, SLOT(update()));
-
- d->texture->setItem(this);
- }
-}
-
-void QQuickCanvasItem::createContext()
-{
- Q_D(QQuickCanvasItem);
-
- delete d->context;
-
- d->context = new QQuickContext2D(this);
-
- QV8Engine *e = QDeclarativeEnginePrivate::getV8Engine(qmlEngine(this));
- d->context->setV8Engine(e);
-}
-
-/*!
- \qmlmethod object QtQuick2::Canvas::getContext(string contextId)
-
- Currently, the canvas item only supports the 2D context. If the \a contextId
- parameter isn't provided or is "2d", then the QtQuick2::Context2D object is
- returned, otherwise returns an invalid value.
- */
-QDeclarativeV8Handle QQuickCanvasItem::getContext(const QString &contextId)
-{
- Q_D(QQuickCanvasItem);
-
- if (contextId.toLower() != QLatin1String("2d"))
- return QDeclarativeV8Handle::fromHandle(v8::Undefined());
-
- if (!d->context)
- createContext();
- return QDeclarativeV8Handle::fromHandle(d->context->v8value());
-}
-
-/*!
- \qmlmethod void QtQuick2::Canvas::markDirty(rect region)
-
- Mark the given \a region as dirty, so that when this region is visible
- the canvas renderer will redraw it. This will trigger the "onPaint" signal
- handler function.
-
- \sa QtQuick2::Canvas::paint QtQuick2::Canvas::requestPaint
- */
-void QQuickCanvasItem::markDirty(const QRectF& region)
-{
- Q_D(QQuickCanvasItem);
- d->dirtyRect |= region;
- if (d->componentCompleted)
- polish();
- update();
-}
-
-
-/*!
- \qmlmethod bool QtQuick2::Canvas::save(string filename)
-
- Save the current canvas content into an image file \a filename.
- The saved image format is automatically decided by the \a filename's
- suffix.
-
- Note: calling this method will force painting the whole canvas, not just the
- current canvas visible window.
-
- \sa canvasWindow canvasSize toDataURL
- */
-bool QQuickCanvasItem::save(const QString &filename) const
-{
- Q_D(const QQuickCanvasItem);
- QUrl url = d->baseUrl.resolved(QUrl::fromLocalFile(filename));
- return toImage().save(url.toLocalFile());
-}
-
-QImage QQuickCanvasItem::loadedImage(const QUrl& url)
-{
- Q_D(QQuickCanvasItem);
- QUrl fullPathUrl = d->baseUrl.resolved(url);
- if (!d->images.contains(fullPathUrl)) {
- loadImage(url);
- }
- QDeclarativePixmap* pix = d->images.value(fullPathUrl);
- if (pix->isLoading() || pix->isError()) {
- return QImage();
- }
- return pix->image();
-}
-
-/*!
- \qmlmethod void QtQuick2::Canvas::loadImage(url image)
- Loads the given \c image asynchronously.
-
- When the image is ready, onImageLoaded will be emitted.
- The loaded image can be unloaded by the \a QtQuick2::Canvas::unloadImage method.
-
- Note: Only loaded images can be painted on the Canvas item.
- \sa QtQuick2::Canvas::unloadImage QtQuick2::Canvas::imageLoaded QtQuick2::Canvas::isImageLoaded
- \sa QtQuick2::Context2D::createImageData QtQuick2::Context2D::drawImage
- */
-void QQuickCanvasItem::loadImage(const QUrl& url)
-{
- Q_D(QQuickCanvasItem);
- QUrl fullPathUrl = d->baseUrl.resolved(url);
- if (!d->images.contains(fullPathUrl)) {
- QDeclarativePixmap* pix = new QDeclarativePixmap();
- d->images.insert(fullPathUrl, pix);
-
- pix->load(qmlEngine(this)
- , fullPathUrl
- , QDeclarativePixmap::Cache | QDeclarativePixmap::Asynchronous);
- pix->connectFinished(this, SIGNAL(imageLoaded()));
- }
-}
-/*!
- \qmlmethod void QtQuick2::Canvas::unloadImage(url image)
- Unloads the \c image.
-
- Once an image is unloaded it cannot be painted by the canvas context
- unless it is loaded again.
-
- \sa QtQuick2::Canvas::loadImage QtQuick2::Canvas::imageLoaded QtQuick2::Canvas::isImageLoaded
- \sa QtQuick2::Context2D::createImageData QtQuick2::Context2D::drawImage
- */
-void QQuickCanvasItem::unloadImage(const QUrl& url)
-{
- Q_D(QQuickCanvasItem);
- QUrl removeThis = d->baseUrl.resolved(url);
- if (d->images.contains(removeThis)) {
- delete d->images.value(removeThis);
- d->images.remove(removeThis);
- }
-}
-
-/*!
- \qmlmethod void QtQuick2::Canvas::isImageError(url image)
- Returns true if the \a image failed to load.
-
- \sa QtQuick2::Canvas::loadImage
- */
-bool QQuickCanvasItem::isImageError(const QUrl& url) const
-{
- Q_D(const QQuickCanvasItem);
- QUrl fullPathUrl = d->baseUrl.resolved(url);
- return d->images.contains(fullPathUrl)
- && d->images.value(fullPathUrl)->isError();
-}
-
-/*!
- \qmlmethod void QtQuick2::Canvas::isImageLoading(url image)
- Returns true if the \a image is currently loading.
-
- \sa QtQuick2::Canvas::loadImage
- */
-bool QQuickCanvasItem::isImageLoading(const QUrl& url) const
-{
- Q_D(const QQuickCanvasItem);
- QUrl fullPathUrl = d->baseUrl.resolved(url);
- return d->images.contains(fullPathUrl)
- && d->images.value(fullPathUrl)->isLoading();
-}
-/*!
- \qmlmethod void QtQuick2::Canvas::isImageLoaded(url image)
- Returns true if the \a image is sucessfully loaded and ready to use.
-
- \sa QtQuick2::Canvas::loadImage
- */
-bool QQuickCanvasItem::isImageLoaded(const QUrl& url) const
-{
- Q_D(const QQuickCanvasItem);
- QUrl fullPathUrl = d->baseUrl.resolved(url);
- return d->images.contains(fullPathUrl)
- && d->images.value(fullPathUrl)->isReady();
-}
-
-QImage QQuickCanvasItem::toImage(const QRectF& region) const
-{
- Q_D(const QQuickCanvasItem);
- if (d->texture) {
- if (region.isEmpty())
- return d->texture->toImage(canvasWindow());
- else
- return d->texture->toImage(region);
- }
- return QImage();
-}
-
-/*!
- \qmlmethod string QtQuick2::Canvas::toDataURL(string mimeType)
-
- Returns a data URL for the image in the canvas.
-
- The default \a mimeType is "image/png".
-
- \sa QtQuick2::Canvas::save
- */
-QString QQuickCanvasItem::toDataURL(const QString& mimeType) const
-{
- QImage image = toImage();
-
- if (!image.isNull()) {
- QByteArray ba;
- QBuffer buffer(&ba);
- buffer.open(QIODevice::WriteOnly);
- QString mime = mimeType.toLower();
- QString type;
- if (mime == QLatin1Literal("image/png")) {
- type = QLatin1Literal("PNG");
- } else if (mime == QLatin1Literal("image/bmp"))
- type = QLatin1Literal("BMP");
- else if (mime == QLatin1Literal("image/jpeg"))
- type = QLatin1Literal("JPEG");
- else if (mime == QLatin1Literal("image/x-portable-pixmap"))
- type = QLatin1Literal("PPM");
- else if (mime == QLatin1Literal("image/tiff"))
- type = QLatin1Literal("TIFF");
- else if (mime == QLatin1Literal("image/xpm"))
- type = QLatin1Literal("XPM");
- else
- return QLatin1Literal("data:,");
-
- image.save(&buffer, type.toAscii());
- buffer.close();
- QString dataUrl = QLatin1Literal("data:%1;base64,%2");
- return dataUrl.arg(mime).arg(QLatin1String(ba.toBase64().constData()));
- }
- return QLatin1Literal("data:,");
-}
-
-/*!
- \qmlsignal QtQuick2::Canvas::onPaint(QtQuick2::Context2D context, rect region)
-
- This handler is called to render the \a region.
-
- This signal can be triggered by QtQuick2::Canvas::markdirty, QtQuick2::Canvas::requestPaint
- or by changing the current canvas window.
-*/
-
-/*!
- \qmlsignal QtQuick2::Canvas::onPainted()
-
- This handler is called after all context painting commands are executed and
- the Canvas has been rendered.
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/items/context2d/qquickcanvasitem_p.h b/src/declarative/items/context2d/qquickcanvasitem_p.h
deleted file mode 100644
index 293434209a..0000000000
--- a/src/declarative/items/context2d/qquickcanvasitem_p.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QQUICKCANVASITEM_P_H
-#define QQUICKCANVASITEM_P_H
-
-#include <qquickitem.h>
-#include <private/qv8engine_p.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-class QQuickContext2D;
-class QQuickCanvasItemPrivate;
-class Q_DECLARATIVE_EXPORT QQuickCanvasItem : public QQuickItem
-{
- Q_OBJECT
- Q_ENUMS(RenderTarget)
- Q_ENUMS(ImageFilterMode)
-
- Q_PROPERTY(QSizeF canvasSize READ canvasSize WRITE setCanvasSize NOTIFY canvasSizeChanged)
- Q_PROPERTY(QSize tileSize READ tileSize WRITE setTileSize NOTIFY tileSizeChanged)
- Q_PROPERTY(QRectF canvasWindow READ canvasWindow WRITE setCanvasWindow NOTIFY canvasWindowChanged)
- Q_PROPERTY(bool renderInThread READ renderInThread WRITE setRenderInThread NOTIFY renderInThreadChanged)
- Q_PROPERTY(RenderTarget renderTarget READ renderTarget WRITE setRenderTarget NOTIFY renderTargetChanged)
-public:
- enum RenderTarget {
- Image,
- FramebufferObject
- };
-
- enum ImageFilterMode {
- Threshold,
- Mono,
- GrayScale,
- Brightness,
- Invert,
- Blur,
- Opaque,
- Convolute
- };
-
- QQuickCanvasItem(QQuickItem *parent = 0);
- ~QQuickCanvasItem();
-
- QSizeF canvasSize() const;
- void setCanvasSize(const QSizeF &);
-
- QSize tileSize() const;
- void setTileSize(const QSize &);
-
- QRectF canvasWindow() const;
- void setCanvasWindow(const QRectF& rect);
-
- bool renderInThread() const;
- void setRenderInThread(bool renderInThread);
-
- RenderTarget renderTarget() const;
- void setRenderTarget(RenderTarget target);
-
- QQuickContext2D* context() const;
- QImage toImage(const QRectF& region = QRectF()) const;
-
- QImage loadedImage(const QUrl& url);
-
-Q_SIGNALS:
- void paint(QDeclarativeV8Handle context, const QRect &region);
- void painted();
- void canvasSizeChanged();
- void tileSizeChanged();
- void renderInThreadChanged();
- void textureChanged();
- void canvasWindowChanged();
- void renderTargetChanged();
- void imageLoaded();
-public Q_SLOTS:
- QString toDataURL(const QString& type = QLatin1String("image/png")) const;
- QDeclarativeV8Handle getContext(const QString & = QLatin1String("2d"));
- void markDirty(const QRectF& region);
- void requestPaint() {markDirty(canvasWindow());}
- // Save current canvas to disk
- bool save(const QString& filename) const;
- void loadImage(const QUrl& url);
- void unloadImage(const QUrl& url);
- bool isImageLoaded(const QUrl& url) const;
- bool isImageLoading(const QUrl& url) const;
- bool isImageError(const QUrl& url) const;
-private Q_SLOTS:
- void _doPainting(const QRectF& region);
-protected:
- virtual void componentComplete();
- virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *);
- virtual void geometryChanged(const QRectF &newGeometry,
- const QRectF &oldGeometry);
- virtual void updatePolish();
-private:
- void createContext();
- void createTexture();
- Q_DECLARE_PRIVATE(QQuickCanvasItem)
- friend class QQuickContext2D;
- friend class QQuickContext2DTexture;
-};
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QQuickCanvasItem)
-
-QT_END_HEADER
-
-#endif //QQUICKCANVASITEM_P_H
diff --git a/src/declarative/items/context2d/qquickcontext2d.cpp b/src/declarative/items/context2d/qquickcontext2d.cpp
deleted file mode 100644
index 1f7a84baa6..0000000000
--- a/src/declarative/items/context2d/qquickcontext2d.cpp
+++ /dev/null
@@ -1,3540 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qquickcontext2d_p.h"
-#include "qquickcontext2dcommandbuffer_p.h"
-#include "qquickcanvasitem_p.h"
-#include <private/qquickitem_p.h>
-#include <private/qquickshadereffectsource_p.h>
-#include <QtGui/qopenglframebufferobject.h>
-
-#include <QtCore/qdebug.h>
-#include <private/qsgcontext_p.h>
-#include <private/qdeclarativesvgparser_p.h>
-#include <private/qdeclarativepath_p.h>
-
-#include <private/qquickimage_p_p.h>
-
-#include <QtGui/qguiapplication.h>
-#include <qdeclarativeinfo.h>
-#include <QtCore/qmath.h>
-#include <private/qv8engine_p.h>
-
-#include <qdeclarativeengine.h>
-#include <private/qv8domerrors_p.h>
-#include <QtCore/qnumeric.h>
-
-QT_BEGIN_NAMESPACE
-/*!
- \qmlclass Context2D QQuickContext2D
- \inqmlmodule QtQuick 2
- \since QtQuick 2.0
- \brief The Context2D API allows you to draw 2d graphic shapes on the \c Canvas item.
-
- The Context2D object can be created by \c Canvas item's \c getContext() method:
- \code
- Canvas {
- id:canvas
- onPaint:{
- var ctx = canvas.getContext('2d');
- //...
- }
- }
- \endcode
- The Context2D API implements the same \l {http://www.w3.org/TR/2dcontext}{W3C Canvas 2D Context API standard}
- with some enhanced features.
-
- The Context2D API provides the rendering \bold{context} which defines the methods and attributes needed to draw
- on the \c Canvas item. The following assigns the canvas rendering context to a \c{context}
- variable:
- \code
- var context = mycanvas.getContext("2d")
- \endcode
-
- The Context2D API renders the canvas as a coordinate system whose origin (0,0) is
- at the top left corner, as shown in the figure below. Coordinates increase along
- the \c{x} axis from left to right and along the \c{y} axis from top to bottom of
- the canvas.
- \image qml-item-canvas-context.gif
-*/
-
-Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
-
-static const double Q_PI = 3.14159265358979323846; // pi
-
-#define DEGREES(t) ((t) * 180.0 / Q_PI)
-
-#define CHECK_CONTEXT(r) if (!r || !r->context || !r->context->buffer()) \
- V8THROW_ERROR("Not a Context2D object");
-
-#define CHECK_CONTEXT_SETTER(r) if (!r || !r->context || !r->context->buffer()) \
- V8THROW_ERROR_SETTER("Not a Context2D object");
-#define qClamp(val, min, max) qMin(qMax(val, min), max)
-#define CHECK_RGBA(c) (c == '-' || c == '.' || (c >=0 && c <= 9))
-QColor qt_color_from_string(v8::Local<v8::Value> name)
-{
- v8::String::AsciiValue str(name);
-
- char *p = *str;
- int len = str.length();
- //rgb/hsl color string has at least 7 characters
- if (!p || len > 255 || len <= 7)
- return QColor(p);
- else {
- bool isRgb(false), isHsl(false), hasAlpha(false);
- Q_UNUSED(isHsl)
-
- while (isspace(*p)) p++;
- if (strncmp(p, "rgb", 3) == 0)
- isRgb = true;
- else if (strncmp(p, "hsl", 3) == 0)
- isHsl = true;
- else
- return QColor(p);
-
- p+=3; //skip "rgb" or "hsl"
- hasAlpha = (*p == 'a') ? true : false;
-
- ++p; //skip "("
-
- if (hasAlpha) ++p; //skip "a"
-
- int rh, gs, bl, alpha = 255;
-
- //red
- while (isspace(*p)) p++;
- rh = strtol(p, &p, 10);
- if (*p == '%') {
- rh = qRound(rh/100.0 * 255);
- ++p;
- }
- if (*p++ != ',') return QColor();
-
- //green
- while (isspace(*p)) p++;
- gs = strtol(p, &p, 10);
- if (*p == '%') {
- gs = qRound(gs/100.0 * 255);
- ++p;
- }
- if (*p++ != ',') return QColor();
-
- //blue
- while (isspace(*p)) p++;
- bl = strtol(p, &p, 10);
- if (*p == '%') {
- bl = qRound(bl/100.0 * 255);
- ++p;
- }
-
- if (hasAlpha) {
- if (*p++!= ',') return QColor();
- while (isspace(*p)) p++;
- bool ok = false;
- alpha = qRound(qstrtod(p, const_cast<const char **>(&p), &ok) * 255);
- }
-
- if (*p != ')') return QColor();
- if (isRgb)
- return QColor::fromRgba(qRgba(qClamp(rh, 0, 255), qClamp(gs, 0, 255), qClamp(bl, 0, 255), qClamp(alpha, 0, 255)));
- else
- return QColor::fromHsl(qClamp(rh, 0, 255), qClamp(gs, 0, 255), qClamp(bl, 0, 255), qClamp(alpha, 0, 255));
- }
- return QColor();
-}
-
-QFont qt_font_from_string(const QString& fontString) {
- QFont font;
- // ### this is simplified and incomplete
- // ### TODO:get code from Qt webkit
- QStringList tokens = fontString.split(QLatin1String(" "));
- foreach (const QString &token, tokens) {
- if (token == QLatin1String("italic"))
- font.setItalic(true);
- else if (token == QLatin1String("bold"))
- font.setBold(true);
- else if (token.endsWith(QLatin1String("px"))) {
- QString number = token;
- number.remove(QLatin1String("px"));
- //font.setPointSizeF(number.trimmed().toFloat());
- font.setPixelSize(number.trimmed().toInt());
- } else
- font.setFamily(token);
- }
-
- return font;
-}
-
-
-
-class QQuickContext2DEngineData : public QV8Engine::Deletable
-{
-public:
- QQuickContext2DEngineData(QV8Engine *engine);
- ~QQuickContext2DEngineData();
-
- v8::Persistent<v8::Function> constructorContext;
- v8::Persistent<v8::Function> constructorGradient;
- v8::Persistent<v8::Function> constructorPattern;
- v8::Persistent<v8::Function> constructorPixelArray;
- v8::Persistent<v8::Function> constructorImageData;
-};
-
-V8_DEFINE_EXTENSION(QQuickContext2DEngineData, engineData)
-
-class QV8Context2DResource : public QV8ObjectResource
-{
- V8_RESOURCE_TYPE(Context2DType)
-public:
- QV8Context2DResource(QV8Engine *e) : QV8ObjectResource(e) {}
- QQuickContext2D* context;
-};
-
-class QV8Context2DStyleResource : public QV8ObjectResource
-{
- V8_RESOURCE_TYPE(Context2DStyleType)
-public:
- QV8Context2DStyleResource(QV8Engine *e)
- : QV8ObjectResource(e)
- , patternRepeatX(false)
- , patternRepeatY(false)
- {}
- QBrush brush;
- bool patternRepeatX:1;
- bool patternRepeatY:1;
-};
-
-class QV8Context2DPixelArrayResource : public QV8ObjectResource
-{
- V8_RESOURCE_TYPE(Context2DPixelArrayType)
-public:
- QV8Context2DPixelArrayResource(QV8Engine *e) : QV8ObjectResource(e) {}
-
- QImage image;
-};
-
-QImage qt_image_convolute_filter(const QImage& src, const QVector<qreal>& weights, int radius = 0)
-{
- int sides = radius ? radius : qRound(qSqrt(weights.size()));
- int half = qFloor(sides/2);
-
- QImage dst = QImage(src.size(), src.format());
- int w = src.width();
- int h = src.height();
- for (int y = 0; y < dst.height(); ++y) {
- QRgb *dr = (QRgb*)dst.scanLine(y);
- for (int x = 0; x < dst.width(); ++x) {
- unsigned char* dRgb = ((unsigned char*)&dr[x]);
- unsigned char red=0, green=0, blue=0, alpha=0;
- int sy = y;
- int sx = x;
-
- for (int cy=0; cy<sides; cy++) {
- for (int cx=0; cx<sides; cx++) {
- int scy = sy + cy - half;
- int scx = sx + cx - half;
- if (scy >= 0 && scy < w && scx >= 0 && scx < h) {
- const QRgb *sr = (const QRgb*)(src.constScanLine(scy));
- const unsigned char* sRgb = ((const unsigned char*)&sr[scx]);
- qreal wt = radius ? weights[0] : weights[cy*sides+cx];
- red += sRgb[0] * wt;
- green += sRgb[1] * wt;
- blue += sRgb[2] * wt;
- alpha += sRgb[3] * wt;
- }
- }
- }
- dRgb[0] = red;
- dRgb[1] = green;
- dRgb[2] = blue;
- dRgb[3] = alpha;
- }
- }
- return dst;
-}
-
-void qt_image_boxblur(QImage& image, int radius, bool quality)
-{
- int passes = quality? 3: 1;
- for (int i=0; i < passes; i++) {
- image = qt_image_convolute_filter(image, QVector<qreal>() << 1.0/(radius * radius * 1.0), radius);
- }
-}
-
-static QPainter::CompositionMode qt_composite_mode_from_string(const QString &compositeOperator)
-{
- if (compositeOperator == QLatin1String("source-over")) {
- return QPainter::CompositionMode_SourceOver;
- } else if (compositeOperator == QLatin1String("source-out")) {
- return QPainter::CompositionMode_SourceOut;
- } else if (compositeOperator == QLatin1String("source-in")) {
- return QPainter::CompositionMode_SourceIn;
- } else if (compositeOperator == QLatin1String("source-atop")) {
- return QPainter::CompositionMode_SourceAtop;
- } else if (compositeOperator == QLatin1String("destination-atop")) {
- return QPainter::CompositionMode_DestinationAtop;
- } else if (compositeOperator == QLatin1String("destination-in")) {
- return QPainter::CompositionMode_DestinationIn;
- } else if (compositeOperator == QLatin1String("destination-out")) {
- return QPainter::CompositionMode_DestinationOut;
- } else if (compositeOperator == QLatin1String("destination-over")) {
- return QPainter::CompositionMode_DestinationOver;
- } else if (compositeOperator == QLatin1String("lighter")) {
- return QPainter::CompositionMode_Lighten;
- } else if (compositeOperator == QLatin1String("copy")) {
- return QPainter::CompositionMode_Source;
- } else if (compositeOperator == QLatin1String("xor")) {
- return QPainter::CompositionMode_Xor;
- } else if (compositeOperator == QLatin1String("qt-clear")) {
- return QPainter::CompositionMode_Clear;
- } else if (compositeOperator == QLatin1String("qt-destination")) {
- return QPainter::CompositionMode_Destination;
- } else if (compositeOperator == QLatin1String("qt-multiply")) {
- return QPainter::CompositionMode_Multiply;
- } else if (compositeOperator == QLatin1String("qt-screen")) {
- return QPainter::CompositionMode_Screen;
- } else if (compositeOperator == QLatin1String("qt-overlay")) {
- return QPainter::CompositionMode_Overlay;
- } else if (compositeOperator == QLatin1String("qt-darken")) {
- return QPainter::CompositionMode_Darken;
- } else if (compositeOperator == QLatin1String("qt-lighten")) {
- return QPainter::CompositionMode_Lighten;
- } else if (compositeOperator == QLatin1String("qt-color-dodge")) {
- return QPainter::CompositionMode_ColorDodge;
- } else if (compositeOperator == QLatin1String("qt-color-burn")) {
- return QPainter::CompositionMode_ColorBurn;
- } else if (compositeOperator == QLatin1String("qt-hard-light")) {
- return QPainter::CompositionMode_HardLight;
- } else if (compositeOperator == QLatin1String("qt-soft-light")) {
- return QPainter::CompositionMode_SoftLight;
- } else if (compositeOperator == QLatin1String("qt-difference")) {
- return QPainter::CompositionMode_Difference;
- } else if (compositeOperator == QLatin1String("qt-exclusion")) {
- return QPainter::CompositionMode_Exclusion;
- }
- return QPainter::CompositionMode_SourceOver;
-}
-
-static QString qt_composite_mode_to_string(QPainter::CompositionMode op)
-{
- switch (op) {
- case QPainter::CompositionMode_SourceOver:
- return QLatin1String("source-over");
- case QPainter::CompositionMode_DestinationOver:
- return QLatin1String("destination-over");
- case QPainter::CompositionMode_Clear:
- return QLatin1String("qt-clear");
- case QPainter::CompositionMode_Source:
- return QLatin1String("copy");
- case QPainter::CompositionMode_Destination:
- return QLatin1String("qt-destination");
- case QPainter::CompositionMode_SourceIn:
- return QLatin1String("source-in");
- case QPainter::CompositionMode_DestinationIn:
- return QLatin1String("destination-in");
- case QPainter::CompositionMode_SourceOut:
- return QLatin1String("source-out");
- case QPainter::CompositionMode_DestinationOut:
- return QLatin1String("destination-out");
- case QPainter::CompositionMode_SourceAtop:
- return QLatin1String("source-atop");
- case QPainter::CompositionMode_DestinationAtop:
- return QLatin1String("destination-atop");
- case QPainter::CompositionMode_Xor:
- return QLatin1String("xor");
- case QPainter::CompositionMode_Plus:
- return QLatin1String("plus");
- case QPainter::CompositionMode_Multiply:
- return QLatin1String("qt-multiply");
- case QPainter::CompositionMode_Screen:
- return QLatin1String("qt-screen");
- case QPainter::CompositionMode_Overlay:
- return QLatin1String("qt-overlay");
- case QPainter::CompositionMode_Darken:
- return QLatin1String("qt-darken");
- case QPainter::CompositionMode_Lighten:
- return QLatin1String("lighter");
- case QPainter::CompositionMode_ColorDodge:
- return QLatin1String("qt-color-dodge");
- case QPainter::CompositionMode_ColorBurn:
- return QLatin1String("qt-color-burn");
- case QPainter::CompositionMode_HardLight:
- return QLatin1String("qt-hard-light");
- case QPainter::CompositionMode_SoftLight:
- return QLatin1String("qt-soft-light");
- case QPainter::CompositionMode_Difference:
- return QLatin1String("qt-difference");
- case QPainter::CompositionMode_Exclusion:
- return QLatin1String("qt-exclusion");
- default:
- break;
- }
- return QString();
-}
-
-
-static v8::Local<v8::Object> qt_create_image_data(qreal w, qreal h, QV8Engine* engine, const QImage& image)
-{
- QQuickContext2DEngineData *ed = engineData(engine);
- v8::Local<v8::Object> imageData = ed->constructorImageData->NewInstance();
- QV8Context2DPixelArrayResource *r = new QV8Context2DPixelArrayResource(engine);
- if (image.isNull()) {
- r->image = QImage(w, h, QImage::Format_ARGB32);
- r->image.fill(0x00000000);
- } else {
- Q_ASSERT(image.width() == w && image.height() == h);
- r->image = image.format() == QImage::Format_ARGB32 ? image : image.convertToFormat(QImage::Format_ARGB32);
- }
- v8::Local<v8::Object> pixelData = ed->constructorPixelArray->NewInstance();
- pixelData->SetExternalResource(r);
-
- imageData->SetInternalField(0, pixelData);
- return imageData;
-}
-
-//static script functions
-
-/*!
- \qmlproperty QtQuick2::Canvas QtQuick2::Context2D::canvas
- Holds the canvas item that the context paints on.
-
- This property is read only.
-*/
-static v8::Handle<v8::Value> ctx2d_canvas(v8::Local<v8::String>, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT(r)
-
-
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
- return engine->newQObject(r->context->canvas());
-}
-
-/*!
- \qmlmethod object QtQuick2::Context2D::restore()
- Pops the top state on the stack, restoring the context to that state.
-
- \sa QtQuick2::Context2D::save()
-*/
-static v8::Handle<v8::Value> ctx2d_restore(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
- r->context->popState();
- return args.This();
-}
-
-/*!
- \qmlmethod object QtQuick2::Context2D::reset()
- Resets the context state and properties to the default values.
-*/
-static v8::Handle<v8::Value> ctx2d_reset(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
- r->context->reset();
- r->context->m_path = QPainterPath();
- r->context->m_path.setFillRule(Qt::WindingFill);
-
- return args.This();
-}
-
-/*!
- \qmlmethod object QtQuick2::Context2D::save()
- Pushes the current state onto the state stack.
-
- Before changing any state attributes, you should save the current state
- for future reference. The context maintains a stack of drawing states.
- Each state consists of the current transformation matrix, clipping region,
- and values of the following attributes:
- \list
- \o\a QtQuick2::Context2D::strokeStyle
- \o\a QtQuick2::Context2D::fillStyle
- \o\a QtQuick2::Context2D::fillRule
- \o\a QtQuick2::Context2D::globalAlpha
- \o\a QtQuick2::Context2D::lineWidth
- \o\a QtQuick2::Context2D::lineCap
- \o\a QtQuick2::Context2D::lineJoin
- \o\a QtQuick2::Context2D::miterLimit
- \o\a QtQuick2::Context2D::shadowOffsetX
- \o\a QtQuick2::Context2D::shadowOffsetY
- \o\a QtQuick2::Context2D::shadowBlur
- \o\a QtQuick2::Context2D::shadowColor
- \o\a QtQuick2::Context2D::globalCompositeOperation
- \o\a QtQuick2::Context2D::font
- \o\a QtQuick2::Context2D::textAlign
- \o\a QtQuick2::Context2D::textBaseline
- \endlist
-
- The current path is NOT part of the drawing state. The path can be reset by
- invoking the \a QtQuick2::Context2D::beginPath() method.
-*/
-static v8::Handle<v8::Value> ctx2d_save(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
- r->context->pushState();
-
- return args.This();
-}
-
-// transformations
-/*!
- \qmlmethod object QtQuick2::Context2D::rotate(real angle)
- Rotate the canvas around the current origin by \c angle in radians and clockwise direction.
- \code
- ctx.rotate(Math.PI/2);
- \endcode
- \image qml-item-canvas-rotate.png
-
- The rotation transformation matrix is as follows:
-
- \image qml-item-canvas-math-rotate.png
-
- where the \c angle of rotation is in radians.
-
-*/
-static v8::Handle<v8::Value> ctx2d_rotate(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
- if (args.Length() == 1) {
- qreal angle = args[0]->NumberValue();
- if (!qIsFinite(angle))
- return args.This();
-
- r->context->state.matrix.rotate(DEGREES(angle));
- r->context->buffer()->updateMatrix(r->context->state.matrix);
- }
-
- return args.This();
-}
-
-/*!
- \qmlmethod object QtQuick2::Context2D::scale(real x, real y)
- Increases or decreases the size of each unit in the canvas grid by multiplying the scale factors
- to the current tranform matrix.
- Where \c x is the scale factor in the horizontal direction and \c y is the scale factor in the
- vertical direction.
- The following code doubles the horizontal size of an object drawn on the canvas and half its
- vertical size:
- \code
- ctx.scale(2.0, 0.5);
- \endcode
- \image qml-item-canvas-scale.png
-
-*/
-static v8::Handle<v8::Value> ctx2d_scale(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
-
- if (args.Length() == 2) {
- qreal x, y;
- x = args[0]->NumberValue();
- y = args[1]->NumberValue();
- if (!qIsFinite(x) || !qIsFinite(y))
- return args.This();
-
- r->context->state.matrix.scale(x, y);
- r->context->buffer()->updateMatrix(r->context->state.matrix);
- }
-
- return args.This();
-}
-
-/*!
- \qmlmethod object QtQuick2::Context2D::setTransform(real a, real b, real c, real d, real e, real f)
- Changes the transformation matrix to the matrix given by the arguments as described below.
-
- Modifying the transformation matrix directly enables you to perform scaling,
- rotating, and translating transformations in a single step.
-
- Each point on the canvas is multiplied by the matrix before anything is
- drawn. The \l{HTML5 Canvas API} defines the transformation matrix as:
-
- \image qml-item-canvas-math.png
- where:
- \list
- \o \c{a} is the scale factor in the horizontal (x) direction
- \image qml-item-canvas-scalex.png
- \o \c{c} is the skew factor in the x direction
- \image qml-item-canvas-canvas-skewx.png
- \o \c{e} is the translation in the x direction
- \image qml-item-canvas-canvas-translate.png
- \o \c{b} is the skew factor in the y (vertical) direction
- \image qml-item-canvas-canvas-skewy.png
- \o \c{d} is the scale factor in the y direction
- \image qml-item-canvas-canvas-scaley.png
- \o \c{f} is the translation in the y direction
- \image qml-item-canvas-canvas-translatey.png
- \o the last row remains constant
- \endlist
- The scale factors and skew factors are multiples; \c{e} and \c{f} are
- coordinate space units, just like the units in the \a QtQuick2::Context2D::translate(x,y)
- method.
-
- \sa QtQuick2::Context2D::transform()
-*/
-static v8::Handle<v8::Value> ctx2d_setTransform(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
-
- if (args.Length() == 6) {
- qreal a = args[0]->NumberValue();
- qreal b = args[1]->NumberValue();
- qreal c = args[2]->NumberValue();
- qreal d = args[3]->NumberValue();
- qreal e = args[4]->NumberValue();
- qreal f = args[5]->NumberValue();
-
- if (!qIsFinite(a)
- || !qIsFinite(b)
- || !qIsFinite(c)
- || !qIsFinite(d)
- || !qIsFinite(e)
- || !qIsFinite(f))
- return args.This();
-
- r->context->state.matrix = QTransform(a, b, c, d, e, f);
- r->context->buffer()->updateMatrix(r->context->state.matrix);
- }
-
- return args.This();
-}
-
-/*!
- \qmlmethod object QtQuick2::Context2D::transform(real a, real b, real c, real d, real e, real f)
- This method is very similar to \a QtQuick2::Context2D::setTransform(), but instead of replacing the old
- tranform matrix, this method applies the given tranform matrix to the current matrix by mulitplying to it.
-
- The \a setTransform(a, b, c, d, e, f) method actually resets the current transform to the identity matrix,
- and then invokes the transform(a, b, c, d, e, f) method with the same arguments.
-
- \sa QtQuick2::Context2D::setTransform()
-*/
-static v8::Handle<v8::Value> ctx2d_transform(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
-
- if (args.Length() == 6) {
- qreal a = args[0]->NumberValue();
- qreal b = args[1]->NumberValue();
- qreal c = args[2]->NumberValue();
- qreal d = args[3]->NumberValue();
- qreal e = args[4]->NumberValue();
- qreal f = args[5]->NumberValue();
-
- if (!qIsFinite(a)
- || !qIsFinite(b)
- || !qIsFinite(c)
- || !qIsFinite(d)
- || !qIsFinite(e)
- || !qIsFinite(f))
- return args.This();
-
- r->context->state.matrix *= QTransform(a, b, c, d, e, f);
- r->context->buffer()->updateMatrix(r->context->state.matrix);
- }
-
- return args.This();
-}
-
-/*!
- \qmlmethod object QtQuick2::Context2D::translate(real x, real y)
- Translates the origin of the canvas to point (\c x, \c y).
-
- \c x is the horizontal distance that the origin is translated, in coordinate space units,
- \c y is the vertical distance that the origin is translated, in coordinate space units.
- Translating the origin enables you to draw patterns of different objects on the canvas
- without having to measure the coordinates manually for each shape.
-*/
-static v8::Handle<v8::Value> ctx2d_translate(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
-
- if (args.Length() == 2) {
- qreal x = args[0]->NumberValue();
- qreal y = args[1]->NumberValue();
-
- if (!qIsFinite(x) || !qIsFinite(y))
- return args.This();
-
- r->context->state.matrix.translate(x, y);
- r->context->buffer()->updateMatrix(r->context->state.matrix);
- }
-
- return args.This();
-}
-
-
-/*!
- \qmlmethod object QtQuick2::Context2D::resetTransform()
- Reset the transformation matrix to default value.
-
- \sa QtQuick2::Context2D::transform(), QtQuick2::Context2D::setTransform(), QtQuick2::Context2D::reset()
-*/
-static v8::Handle<v8::Value> ctx2d_resetTransform(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
- r->context->state.matrix = QTransform();
- r->context->buffer()->updateMatrix(r->context->state.matrix);
-
- return args.This();
-}
-
-
-/*!
- \qmlmethod object QtQuick2::Context2D::shear(real sh, real sv )
- Shear the transformation matrix with \a sh in horizontal direction and \a sv in vertical direction.
-*/
-static v8::Handle<v8::Value> ctx2d_shear(const v8::Arguments &args)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(args.This());
- CHECK_CONTEXT(r)
-
- if (args.Length() == 2) {
- qreal sh = args[0]->NumberValue();
- qreal sv = args[1]->NumberValue();
-
- if (!qIsFinite(sh) || !qIsFinite(sv))
- return args.This();
-
- r->context->state.matrix.shear(sh, sv);
- r->context->buffer()->updateMatrix(r->context->state.matrix);
- }
- return args.This();
-}
-// compositing
-
-/*!
- \qmlproperty real QtQuick2::Context2D::globalAlpha
- Holds the the current alpha value applied to rendering operations.
- The value must be in the range from 0.0 (fully transparent) to 1.0 (fully opque).
- The default value is 1.0.
-*/
-static v8::Handle<v8::Value> ctx2d_globalAlpha(v8::Local<v8::String>, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT(r)
-
- return v8::Number::New(r->context->state.globalAlpha);
-}
-
-static void ctx2d_globalAlpha_set(v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT_SETTER(r)
-
- qreal globalAlpha = value->NumberValue();
-
- if (!qIsFinite(globalAlpha))
- return;
-
- if (globalAlpha >= 0.0 && globalAlpha <= 1.0 && r->context->state.globalAlpha != globalAlpha) {
- r->context->state.globalAlpha = globalAlpha;
- r->context->buffer()->setGlobalAlpha(r->context->state.globalAlpha);
- }
-}
-
-/*!
- \qmlproperty string QtQuick2::Context2D::globalCompositeOperation
- Holds the the current the current composition operation, from the list below:
- \list
- \o source-atop - A atop B. Display the source image wherever both images are opaque.
- Display the destination image wherever the destination image is opaque but the source image is transparent.
- Display transparency elsewhere.
- \o source-in - A in B. Display the source image wherever both the source image and destination image are opaque.
- Display transparency elsewhere.
- \o source-out - A out B. Display the source image wherever the source image is opaque and the destination image is transparent.
- Display transparency elsewhere.
- \o source-over - (default) A over B. Display the source image wherever the source image is opaque.
- Display the destination image elsewhere.
- \o destination-atop - B atop A. Same as source-atop but using the destination image instead of the source image and vice versa.
- \o destination-in - B in A. Same as source-in but using the destination image instead of the source image and vice versa.
- \o destination-out - B out A. Same as source-out but using the destination image instead of the source image and vice versa.
- \o destination-over - B over A. Same as source-over but using the destination image instead of the source image and vice versa.
- \o lighter - A plus B. Display the sum of the source image and destination image, with color values approaching 255 (100%) as a limit.
- \o copy - A (B is ignored). Display the source image instead of the destination image.
- \o xor - A xor B. Exclusive OR of the source image and destination image.
- \endlist
-
- Additionally, this property also accepts the compositon modes listed in \a {QPainter::CompositionMode}. According to the W3C standard, these
- extension composition modes are provided as "vendorName-operationName" syntax, for example: \c {QPainter::CompositionMode_Exclusion} is porvided as
- "qt-exclusion".
-*/
-static v8::Handle<v8::Value> ctx2d_globalCompositeOperation(v8::Local<v8::String>, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT(r)
-
-
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
- return engine->toString(qt_composite_mode_to_string(r->context->state.globalCompositeOperation));
-}
-
-static void ctx2d_globalCompositeOperation_set(v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT_SETTER(r)
-
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
-
- QString mode = engine->toString(value);
- QPainter::CompositionMode cm = qt_composite_mode_from_string(mode);
- if (cm == QPainter::CompositionMode_SourceOver && mode != QStringLiteral("source-over"))
- return;
-
- if (cm != r->context->state.globalCompositeOperation) {
- r->context->state.globalCompositeOperation = cm;
- r->context->buffer()->setGlobalCompositeOperation(cm);
- }
-}
-
-// colors and styles
-/*!
- \qmlproperty variant QtQuick2::Context2D::fillStyle
- Holds the current style used for filling shapes.
- The style can be either a string containing a CSS color, a CanvasGradient or CanvasPattern object. Invalid values are ignored.
- This property accepts several color syntaxes:
- \list
- \o 'rgb(red, green, blue)' - for example: 'rgb(255, 100, 55)' or 'rgb(100%, 70%, 30%)'
- \o 'rgba(red, green, blue, alpha)' - for example: 'rgb(255, 100, 55, 1.0)' or 'rgb(100%, 70%, 30%, 0.5)'
- \o 'hsl(hue, saturation, lightness)'
- \o 'hsla(hue, saturation, lightness, alpha)'
- \o '#RRGGBB' - for example: '#00FFCC'
- \o Qt.rgba(red, green, blue, alpha) - for example: Qt.rgba(0.3, 0.7, 1, 1.0)
- \endlist
- If the \a fillStyle or \a strokeStyle is assigned many times in a loop, the last Qt.rgba() syntax should be chosen, as it has the
- best performance, because it's already a valid QColor value, does not need to be parsed everytime.
-
- The default value is '#000000'.
- \sa QtQuick2::Context2D::createLinearGradient
- \sa QtQuick2::Context2D::createRadialGradient
- \sa QtQuick2::Context2D::createPattern
- \sa QtQuick2::Context2D::strokeStyle
- */
-static v8::Handle<v8::Value> ctx2d_fillStyle(v8::Local<v8::String>, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT(r)
-
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
- QColor color = r->context->state.fillStyle.color();
- if (color.isValid()) {
- if (color.alpha() == 255)
- return engine->toString(color.name());
- QString alphaString = QString::number(color.alphaF(), 'f');
- while (alphaString.endsWith(QLatin1Char('0')))
- alphaString.chop(1);
- if (alphaString.endsWith(QLatin1Char('.')))
- alphaString += QLatin1Char('0');
- return engine->toString(QString::fromLatin1("rgba(%1, %2, %3, %4)").arg(color.red()).arg(color.green()).arg(color.blue()).arg(alphaString));
- }
- return r->context->m_fillStyle;
-}
-
-static void ctx2d_fillStyle_set(v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT_SETTER(r)
-
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
- if (value->IsObject()) {
- QColor color = engine->toVariant(value, qMetaTypeId<QColor>()).value<QColor>();
- if (color.isValid()) {
- r->context->state.fillStyle = color;
- r->context->buffer()->setFillStyle(color);
- r->context->m_fillStyle = value;
- } else {
- QV8Context2DStyleResource *style = v8_resource_cast<QV8Context2DStyleResource>(value->ToObject());
- if (style && style->brush != r->context->state.fillStyle) {
- r->context->state.fillStyle = style->brush;
- r->context->buffer()->setFillStyle(style->brush, style->patternRepeatX, style->patternRepeatY);
- r->context->m_fillStyle = value;
- r->context->state.fillPatternRepeatX = style->patternRepeatX;
- r->context->state.fillPatternRepeatY = style->patternRepeatY;
- }
- }
- } else if (value->IsString()) {
- QColor color = qt_color_from_string(value);
- if (color.isValid() && r->context->state.fillStyle != QBrush(color)) {
- r->context->state.fillStyle = QBrush(color);
- r->context->buffer()->setFillStyle(r->context->state.fillStyle);
- r->context->m_fillStyle = value;
- }
- }
-}
-/*!
- \qmlproperty enumeration QtQuick2::Context2D::fillRule
- Holds the current fill rule used for filling shapes. The following fill rules supported:
- \list
- \o Qt.OddEvenFill
- \o Qt.WindingFill
- \endlist
- Note: Unlike the \a QPainterPath, the Canvas API uses the winding fill as the default fill rule.
- The fillRule property is part of the context rendering state.
-
- \sa QtQuick2::Context2D::fillStyle
- */
-static v8::Handle<v8::Value> ctx2d_fillRule(v8::Local<v8::String>, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT(r)
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
- return engine->fromVariant(r->context->state.fillRule);
-}
-
-static void ctx2d_fillRule_set(v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT_SETTER(r)
-
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
- if ((value->IsString() && engine->toString(value) == QStringLiteral("WindingFill"))
- ||(value->IsNumber() && value->NumberValue() == Qt::WindingFill)) {
- r->context->state.fillRule = Qt::WindingFill;
- } else if ((value->IsString() && engine->toString(value) == QStringLiteral("OddEvenFill"))
- ||(value->IsNumber() && value->NumberValue() == Qt::OddEvenFill)) {
- r->context->state.fillRule = Qt::OddEvenFill;
- } else {
- //error
- }
- r->context->m_path.setFillRule(r->context->state.fillRule);
-}
-/*!
- \qmlproperty variant QtQuick2::Context2D::strokeStyle
- Holds the current color or style to use for the lines around shapes,
- The style can be either a string containing a CSS color, a CanvasGradient or CanvasPattern object.
- Invalid values are ignored.
-
- The default value is '#000000'.
-
- \sa QtQuick2::Context2D::createLinearGradient
- \sa QtQuick2::Context2D::createRadialGradient
- \sa QtQuick2::Context2D::createPattern
- \sa QtQuick2::Context2D::fillStyle
- */
-v8::Handle<v8::Value> ctx2d_strokeStyle(v8::Local<v8::String>, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT(r)
-
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
- QColor color = r->context->state.strokeStyle.color();
- if (color.isValid()) {
- if (color.alpha() == 255)
- return engine->toString(color.name());
- QString alphaString = QString::number(color.alphaF(), 'f');
- while (alphaString.endsWith(QLatin1Char('0')))
- alphaString.chop(1);
- if (alphaString.endsWith(QLatin1Char('.')))
- alphaString += QLatin1Char('0');
- return engine->toString(QString::fromLatin1("rgba(%1, %2, %3, %4)").arg(color.red()).arg(color.green()).arg(color.blue()).arg(alphaString));
- }
- return r->context->m_strokeStyle;
-}
-
-static void ctx2d_strokeStyle_set(v8::Local<v8::String>, v8::Local<v8::Value> value, const v8::AccessorInfo &info)
-{
- QV8Context2DResource *r = v8_resource_cast<QV8Context2DResource>(info.This());
- CHECK_CONTEXT_SETTER(r)
-
- QV8Engine *engine = V8ENGINE_ACCESSOR();
-
- if (value->IsObject()) {
- QColor color = engine->toVariant(value, qMetaTypeId<QColor>()).value<QColor>();
- if (color.isValid()) {
- r->context->state.fillStyle = color;
- r->context->buffer()->setStrokeStyle(color);
- r->context->m_strokeStyle = value;
- } else {
- QV8Context2DStyleResource *style = v8_resource_cast<QV8Context2DStyleResource>(value->ToObject());
- if (style && style->brush != r->context->state.strokeStyle) {
- r->context->state.strokeStyle = style->brush;
- r->context->buffer()->setStrokeStyle(style->brush, style->patternRepeatX, style->patternRepeatY);
- r->context->m_strokeStyle = value;
- r->context->state.strokePatternRepeatX = style->patternRepeatX;
- r->context->state.strokePatternRepeatY = style->patternRepeatY;
-