summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-07-11 13:47:51 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-12 06:38:09 +0200
commit4442dea01b9d4d45964228ac442166d89f091f9e (patch)
tree28ae20cb26967765a988b1ee522fc2d64d777671
parentb119220da60453ecf31898f7a57eda9d3c4e9225 (diff)
Extract all QtQuick 1 elements into a separate library/plugin.
Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
-rw-r--r--doc/src/declarative/whatsnew.qdoc13
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.pro2
-rw-r--r--examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro2
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro2
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro2
-rw-r--r--examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro2
-rw-r--r--examples/declarative/minehunt/main.cpp2
-rw-r--r--examples/declarative/minehunt/minehunt.pro2
-rw-r--r--examples/declarative/modelviews/objectlistmodel/main.cpp7
-rw-r--r--examples/declarative/modelviews/objectlistmodel/view.qml3
-rw-r--r--examples/declarative/modelviews/stringlistmodel/main.cpp6
-rw-r--r--examples/declarative/modelviews/stringlistmodel/view.qml3
-rw-r--r--examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro2
-rw-r--r--examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro2
-rw-r--r--modules/qt_qtquick1.pri17
-rw-r--r--src/declarative/debugger/qdeclarativedebugtrace_p.h2
-rw-r--r--src/declarative/declarative.pro1
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanchors.cpp1165
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanchors_p.h206
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanchors_p_p.h170
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp404
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h116
-rw-r--r--src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h87
-rw-r--r--src/declarative/graphicsitems/qdeclarativeborderimage.cpp617
-rw-r--r--src/declarative/graphicsitems/qdeclarativeborderimage_p.h111
-rw-r--r--src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h106
-rw-r--r--src/declarative/graphicsitems/qdeclarativeevents.cpp237
-rw-r--r--src/declarative/graphicsitems/qdeclarativeevents_p_p.h141
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable.cpp1799
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable_p.h229
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflickable_p_p.h241
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflipable.cpp254
-rw-r--r--src/declarative/graphicsitems/qdeclarativeflipable_p.h100
-rw-r--r--src/declarative/graphicsitems/qdeclarativefocuspanel.cpp89
-rw-r--r--src/declarative/graphicsitems/qdeclarativefocuspanel_p.h78
-rw-r--r--src/declarative/graphicsitems/qdeclarativefocusscope.cpp73
-rw-r--r--src/declarative/graphicsitems/qdeclarativefocusscope_p.h69
-rw-r--r--src/declarative/graphicsitems/qdeclarativegraphicswidget.cpp125
-rw-r--r--src/declarative/graphicsitems/qdeclarativegraphicswidget_p.h90
-rw-r--r--src/declarative/graphicsitems/qdeclarativegridview.cpp3130
-rw-r--r--src/declarative/graphicsitems/qdeclarativegridview_p.h288
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimage.cpp584
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimage_p.h100
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimage_p_p.h79
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimagebase.cpp284
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimagebase_p.h116
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h93
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimplicitsizeitem.cpp92
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h100
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p_p.h90
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.cpp3814
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem.h235
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitem_p.h633
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitemchangelistener_p.h76
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp261
-rw-r--r--src/declarative/graphicsitems/qdeclarativeitemsmodule_p.h63
-rw-r--r--src/declarative/graphicsitems/qdeclarativelayoutitem.cpp112
-rw-r--r--src/declarative/graphicsitems/qdeclarativelayoutitem_p.h94
-rw-r--r--src/declarative/graphicsitems/qdeclarativelistview.cpp3614
-rw-r--r--src/declarative/graphicsitems/qdeclarativelistview_p.h372
-rw-r--r--src/declarative/graphicsitems/qdeclarativeloader.cpp597
-rw-r--r--src/declarative/graphicsitems/qdeclarativeloader_p.h108
-rw-r--r--src/declarative/graphicsitems/qdeclarativeloader_p_p.h91
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea.cpp988
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea_p.h218
-rw-r--r--src/declarative/graphicsitems/qdeclarativemousearea_p_p.h128
-rw-r--r--src/declarative/graphicsitems/qdeclarativepainteditem.cpp497
-rw-r--r--src/declarative/graphicsitems/qdeclarativepainteditem_p.h118
-rw-r--r--src/declarative/graphicsitems/qdeclarativepainteditem_p_p.h90
-rw-r--r--src/declarative/graphicsitems/qdeclarativepath_p.h286
-rw-r--r--src/declarative/graphicsitems/qdeclarativepath_p_p.h82
-rw-r--r--src/declarative/graphicsitems/qdeclarativepathview.cpp1729
-rw-r--r--src/declarative/graphicsitems/qdeclarativepathview_p.h252
-rw-r--r--src/declarative/graphicsitems/qdeclarativepathview_p_p.h192
-rw-r--r--src/declarative/graphicsitems/qdeclarativepincharea.cpp607
-rw-r--r--src/declarative/graphicsitems/qdeclarativepincharea_p.h313
-rw-r--r--src/declarative/graphicsitems/qdeclarativepincharea_p_p.h115
-rw-r--r--src/declarative/graphicsitems/qdeclarativepositioners.cpp1392
-rw-r--r--src/declarative/graphicsitems/qdeclarativepositioners_p.h239
-rw-r--r--src/declarative/graphicsitems/qdeclarativepositioners_p_p.h173
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle.cpp587
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle_p.h188
-rw-r--r--src/declarative/graphicsitems/qdeclarativerectangle_p_p.h112
-rw-r--r--src/declarative/graphicsitems/qdeclarativerepeater.cpp447
-rw-r--r--src/declarative/graphicsitems/qdeclarativerepeater_p.h110
-rw-r--r--src/declarative/graphicsitems/qdeclarativerepeater_p_p.h82
-rw-r--r--src/declarative/graphicsitems/qdeclarativescalegrid.cpp213
-rw-r--r--src/declarative/graphicsitems/qdeclarativescalegrid_p_p.h134
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext.cpp1640
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext_p.h213
-rw-r--r--src/declarative/graphicsitems/qdeclarativetext_p_p.h143
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit.cpp1888
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit_p.h307
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextedit_p_p.h138
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput.cpp2010
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput_p.h306
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextinput_p_p.h156
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextlayout.cpp391
-rw-r--r--src/declarative/graphicsitems/qdeclarativetextlayout_p.h75
-rw-r--r--src/declarative/graphicsitems/qdeclarativetranslate.cpp125
-rw-r--r--src/declarative/graphicsitems/qdeclarativetranslate_p.h89
-rw-r--r--src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp1425
-rw-r--r--src/declarative/graphicsitems/qdeclarativevisualitemmodel_p.h257
-rw-r--r--src/declarative/items/qsgitem.cpp4
-rw-r--r--src/declarative/items/qsgitem.h1
-rw-r--r--src/declarative/items/qsgtext_p_p.h2
-rw-r--r--src/declarative/qml/qdeclarative.h3
-rw-r--r--src/declarative/qml/qdeclarativeboundsignal_p.h4
-rw-r--r--src/declarative/qml/qdeclarativecompiler.cpp2
-rw-r--r--src/declarative/qml/qdeclarativecontext_p.h2
-rw-r--r--src/declarative/qml/qdeclarativedata_p.h2
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp27
-rw-r--r--src/declarative/qml/qdeclarativeengine_p.h3
-rw-r--r--src/declarative/qml/qdeclarativefastproperties.cpp14
-rw-r--r--src/declarative/qml/qdeclarativefastproperties_p.h11
-rw-r--r--src/declarative/qml/qdeclarativeimport.cpp103
-rw-r--r--src/declarative/qml/qdeclarativemetatype.cpp66
-rw-r--r--src/declarative/qml/qdeclarativemetatype_p.h1
-rw-r--r--src/declarative/qml/qdeclarativenotifier_p.h2
-rw-r--r--src/declarative/qml/qdeclarativenullablevalue_p_p.h (renamed from src/declarative/util/qdeclarativenullablevalue_p_p.h)0
-rw-r--r--src/declarative/qml/qdeclarativepropertycache_p.h2
-rw-r--r--src/declarative/qml/qdeclarativevaluetype.cpp13
-rw-r--r--src/declarative/qml/qdeclarativevaluetype_p.h1
-rw-r--r--src/declarative/qml/qml.pri2
-rw-r--r--src/declarative/qml/rewriter/textwriter_p.h2
-rw-r--r--src/declarative/qml/v4/qdeclarativev4bindings.cpp16
-rw-r--r--src/declarative/qml/v4/qdeclarativev4compiler.cpp14
-rw-r--r--src/declarative/qml/v4/qdeclarativev4compiler_p.h2
-rw-r--r--src/declarative/qml/v4/qdeclarativev4compiler_p_p.h32
-rw-r--r--src/declarative/qml/v4/qdeclarativev4irbuilder.cpp4
-rw-r--r--src/declarative/qml/v8/qv8engine_p.h2
-rw-r--r--src/declarative/qml/v8/qv8qobjectwrapper_p.h2
-rw-r--r--src/declarative/qml/v8/qv8stringwrapper_p.h2
-rw-r--r--src/declarative/util/qdeclarativeanimation.cpp513
-rw-r--r--src/declarative/util/qdeclarativeanimation_p.h69
-rw-r--r--src/declarative/util/qdeclarativeanimation_p_p.h33
-rw-r--r--src/declarative/util/qdeclarativepath.cpp (renamed from src/declarative/graphicsitems/qdeclarativepath.cpp)0
-rw-r--r--src/declarative/util/qdeclarativepath_p.h284
-rw-r--r--src/declarative/util/qdeclarativepath_p_p.h83
-rw-r--r--src/declarative/util/qdeclarativestateoperations.cpp1424
-rw-r--r--src/declarative/util/qdeclarativestateoperations_p.h211
-rw-r--r--src/declarative/util/qdeclarativeutilmodule.cpp128
-rw-r--r--src/declarative/util/qdeclarativeutilmodule_p.h1
-rw-r--r--src/declarative/util/qdeclarativeview.cpp737
-rw-r--r--src/declarative/util/qdeclarativeview.h120
-rw-r--r--src/declarative/util/util.pri6
-rw-r--r--src/imports/gestures/gestures.pro2
-rw-r--r--src/imports/gestures/qdeclarativegesturearea.cpp2
-rw-r--r--src/imports/imports.pro2
-rw-r--r--src/imports/particles/V1/qdeclarativeparticles.cpp6
-rw-r--r--src/imports/particles/V1/qdeclarativeparticles_p.h2
-rw-r--r--src/imports/particles/particles.pro2
-rw-r--r--src/imports/qt47/plugin.cpp68
-rw-r--r--src/imports/qt47/qmldir1
-rw-r--r--src/imports/qt47/qt47.pro30
-rw-r--r--src/imports/qtquick1/plugin.cpp68
-rw-r--r--src/imports/qtquick1/qmldir1
-rw-r--r--src/imports/qtquick1/qtquick1.pro30
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/editor/liveselectiontool.cpp2
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.cpp5
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector.h2
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qdeclarativeviewinspector_p.h2
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro2
-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/qtquick1/graphicsitems/graphicsitems.pri (renamed from src/declarative/graphicsitems/graphicsitems.pri)0
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeanchors.cpp1169
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeanchors_p.h206
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeanchors_p_p.h171
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeanimatedimage.cpp408
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeanimatedimage_p.h117
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeanimatedimage_p_p.h87
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeborderimage.cpp621
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeborderimage_p.h111
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeborderimage_p_p.h107
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeevents.cpp241
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeevents_p_p.h141
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeflickable.cpp1803
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeflickable_p.h229
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeflickable_p_p.h241
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeflipable.cpp258
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeflipable_p.h100
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativefocuspanel.cpp93
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativefocuspanel_p.h78
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativefocusscope.cpp77
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativefocusscope_p.h69
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativegraphicswidget.cpp129
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativegraphicswidget_p.h90
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativegridview.cpp3133
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativegridview_p.h288
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimage.cpp588
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimage_p.h100
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimage_p_p.h79
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimagebase.cpp288
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimagebase_p.h116
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimagebase_p_p.h94
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimplicitsizeitem.cpp96
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimplicitsizeitem_p.h100
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeimplicitsizeitem_p_p.h90
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeitem.cpp3815
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeitem.h235
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeitem_p.h635
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeitemchangelistener_p.h76
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeitemsmodule.cpp267
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeitemsmodule_p.h64
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativelayoutitem.cpp116
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativelayoutitem_p.h94
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativelistview.cpp3617
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativelistview_p.h371
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeloader.cpp601
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeloader_p.h108
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativeloader_p_p.h91
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativemousearea.cpp990
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativemousearea_p.h218
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativemousearea_p_p.h128
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepainteditem.cpp501
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepainteditem_p.h118
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepainteditem_p_p.h90
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepath.cpp926
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepath_p.h286
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepath_p_p.h83
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepathview.cpp1732
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepathview_p.h252
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepathview_p_p.h192
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepincharea.cpp611
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepincharea_p.h313
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepincharea_p_p.h115
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepositioners.cpp1396
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepositioners_p.h239
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativepositioners_p_p.h174
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativerectangle.cpp591
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativerectangle_p.h188
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativerectangle_p_p.h112
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativerepeater.cpp449
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativerepeater_p.h110
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativerepeater_p_p.h82
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativescalegrid.cpp217
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativescalegrid_p_p.h134
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetext.cpp1645
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetext_p.h213
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetext_p_p.h143
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetextedit.cpp1892
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetextedit_p.h307
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetextedit_p_p.h139
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetextinput.cpp2016
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetextinput_p.h306
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetextinput_p_p.h156
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetextlayout.cpp395
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetextlayout_p.h75
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetranslate.cpp129
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativetranslate_p.h89
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativevisualitemmodel.cpp1429
-rw-r--r--src/qtquick1/graphicsitems/qdeclarativevisualitemmodel_p.h257
-rw-r--r--src/qtquick1/qtquick1.cpp66
-rw-r--r--src/qtquick1/qtquick1.pro42
-rw-r--r--src/qtquick1/qtquick1_p.h64
-rw-r--r--src/qtquick1/util/qdeclarativeanimation.cpp2956
-rw-r--r--src/qtquick1/util/qdeclarativeanimation_p.h528
-rw-r--r--src/qtquick1/util/qdeclarativeanimation_p_p.h397
-rw-r--r--src/qtquick1/util/qdeclarativeapplication.cpp116
-rw-r--r--src/qtquick1/util/qdeclarativeapplication_p.h86
-rw-r--r--src/qtquick1/util/qdeclarativebehavior.cpp234
-rw-r--r--src/qtquick1/util/qdeclarativebehavior_p.h98
-rw-r--r--src/qtquick1/util/qdeclarativebind.cpp217
-rw-r--r--src/qtquick1/util/qdeclarativebind_p.h96
-rw-r--r--src/qtquick1/util/qdeclarativeconnections.cpp293
-rw-r--r--src/qtquick1/util/qdeclarativeconnections_p.h102
-rw-r--r--src/qtquick1/util/qdeclarativefontloader.cpp342
-rw-r--r--src/qtquick1/util/qdeclarativefontloader_p.h97
-rw-r--r--src/qtquick1/util/qdeclarativelistaccessor.cpp142
-rw-r--r--src/qtquick1/util/qdeclarativelistaccessor_p.h81
-rw-r--r--src/qtquick1/util/qdeclarativelistmodel.cpp1631
-rw-r--r--src/qtquick1/util/qdeclarativelistmodel_p.h157
-rw-r--r--src/qtquick1/util/qdeclarativelistmodel_p_p.h281
-rw-r--r--src/qtquick1/util/qdeclarativelistmodelworkeragent.cpp282
-rw-r--r--src/qtquick1/util/qdeclarativelistmodelworkeragent_p.h163
-rw-r--r--src/qtquick1/util/qdeclarativeopenmetaobject.cpp384
-rw-r--r--src/qtquick1/util/qdeclarativeopenmetaobject_p.h130
-rw-r--r--src/qtquick1/util/qdeclarativepackage.cpp205
-rw-r--r--src/qtquick1/util/qdeclarativepackage_p.h98
-rw-r--r--src/qtquick1/util/qdeclarativepixmapcache.cpp1084
-rw-r--r--src/qtquick1/util/qdeclarativepixmapcache_p.h123
-rw-r--r--src/qtquick1/util/qdeclarativepropertychanges.cpp801
-rw-r--r--src/qtquick1/util/qdeclarativepropertychanges_p.h111
-rw-r--r--src/qtquick1/util/qdeclarativesmoothedanimation.cpp497
-rw-r--r--src/qtquick1/util/qdeclarativesmoothedanimation_p.h104
-rw-r--r--src/qtquick1/util/qdeclarativesmoothedanimation_p_p.h135
-rw-r--r--src/qtquick1/util/qdeclarativespringanimation.cpp466
-rw-r--r--src/qtquick1/util/qdeclarativespringanimation_p.h111
-rw-r--r--src/qtquick1/util/qdeclarativestate.cpp734
-rw-r--r--src/qtquick1/util/qdeclarativestate_p.h211
-rw-r--r--src/qtquick1/util/qdeclarativestate_p_p.h253
-rw-r--r--src/qtquick1/util/qdeclarativestategroup.cpp473
-rw-r--r--src/qtquick1/util/qdeclarativestategroup_p.h96
-rw-r--r--src/qtquick1/util/qdeclarativestateoperations.cpp1591
-rw-r--r--src/qtquick1/util/qdeclarativestateoperations_p.h299
-rw-r--r--src/qtquick1/util/qdeclarativestyledtext.cpp351
-rw-r--r--src/qtquick1/util/qdeclarativestyledtext_p.h70
-rw-r--r--src/qtquick1/util/qdeclarativesystempalette.cpp316
-rw-r--r--src/qtquick1/util/qdeclarativesystempalette_p.h122
-rw-r--r--src/qtquick1/util/qdeclarativetimeline.cpp951
-rw-r--r--src/qtquick1/util/qdeclarativetimeline_p_p.h200
-rw-r--r--src/qtquick1/util/qdeclarativetimer.cpp328
-rw-r--r--src/qtquick1/util/qdeclarativetimer_p.h115
-rw-r--r--src/qtquick1/util/qdeclarativetransition.cpp349
-rw-r--r--src/qtquick1/util/qdeclarativetransition_p.h106
-rw-r--r--src/qtquick1/util/qdeclarativetransitionmanager.cpp280
-rw-r--r--src/qtquick1/util/qdeclarativetransitionmanager_p_p.h85
-rw-r--r--src/qtquick1/util/qdeclarativeutilmodule.cpp177
-rw-r--r--src/qtquick1/util/qdeclarativeutilmodule_p.h64
-rw-r--r--src/qtquick1/util/qdeclarativeview.cpp737
-rw-r--r--src/qtquick1/util/qdeclarativeview.h120
-rw-r--r--src/qtquick1/util/qdeclarativexmllistmodel.cpp1058
-rw-r--r--src/qtquick1/util/qdeclarativexmllistmodel_p.h213
-rw-r--r--src/qtquick1/util/util.pri69
-rw-r--r--src/src.pro2
-rw-r--r--sync.profile2
-rw-r--r--tests/auto/auto.pro1
-rw-r--r--tests/auto/declarative/declarative.pro28
-rw-r--r--tests/auto/declarative/examples/examples.pro4
-rw-r--r--tests/auto/declarative/moduleqt47/moduleqt47.pro17
-rw-r--r--tests/auto/declarative/moduleqt47/tst_moduleqt47.cpp136
-rw-r--r--tests/auto/declarative/qdeclarativeanchors/qdeclarativeanchors.pro16
-rw-r--r--tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp773
-rw-r--r--tests/auto/declarative/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro17
-rw-r--r--tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp387
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/Double.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/attached.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/properties.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/properties2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/properties3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/properties4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/properties5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/rotation.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro4
-rw-r--r--tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp176
-rw-r--r--tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp23
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/binding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/color.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/delayedRegistration.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/empty.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml6
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/loop.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/parent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/simple.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/startup.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro4
-rw-r--r--tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp126
-rw-r--r--tests/auto/declarative/qdeclarativebinding/data/test-binding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebinding/data/test-binding2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp5
-rw-r--r--tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro18
-rw-r--r--tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp427
-rw-r--r--tests/auto/declarative/qdeclarativecomponent/data/createObject.qml5
-rw-r--r--tests/auto/declarative/qdeclarativecomponent/data/createObjectWithScript.qml2
-rw-r--r--tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp14
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/connection-targetchange.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals-parent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/connection-unknownsignals.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/error-object.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/error-property.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/test-connection.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/test-connection2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/test-connection3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/data/trimming.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro2
-rw-r--r--tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp14
-rw-r--r--tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp18
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsAssignCorrectlyType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsOverrideTargetType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/AliasBindingsOverrideTargetType3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/CustomObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/MethodsObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/NestedTypeTransientErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/ScopeObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/SpuriousWarning.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsAssignCorrectly.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasBindingsOverrideTarget.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasPropertyAndBinding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/aliasWritesOverrideBindings.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/assignBasicTypes.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/attachedPropertyScope.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/bug.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/canAssignNullToQObject.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlotErrors.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/changeslots/propertyChangeSlots.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/compositePropertyType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/deferredPropertiesErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/deleteLater.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/deletedEngine.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/deletedObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/eval.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/exceptionProducesWarning2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/extendedObjectPropertyLookup.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/extensionObjects.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/function.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/functionErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/idShortcutInvalidates.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/in.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/include.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/include_callback.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/include_pragma.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/include_remote.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/include_remote_missing.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/include_shared.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectArg.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/invokableObjectRet.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimport/SpecialRectangleOne.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimport/SpecialRectangleTwo.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImport.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportPragmaLibrary.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportScoping.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFive.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFour.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failOne.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failThree.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failTwo.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testImportPragmaLibrary.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/libraryScriptAssert.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/listProperties.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/listToVariant.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/methods.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/methods.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/methods.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/moduleApi.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/moduleApiCaching.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/moduleApiMajorVersionFail.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/moduleApiMinorVersionFail.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/moduleApiWriting.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/multiEngineObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/noSpuriousWarningsAtShutdown.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/nonscriptable.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/nullObjectBinding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/objectName.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/objectsCompareAsEqual.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/ownership.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/propertyAssignmentErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/propertySplicing.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/qlistqobjectMethods.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/qtbug_10696.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11600.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/qtbug_11606.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/qtcreatorbug_1289.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/realToInt.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/ScarceResourceSignalComponent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceCopy.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceCopyFromJs.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceCopyImport.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceCopyImportFail.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceCopyImportNoBinding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceCopyNoBinding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceDestroyedCopy.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceFunction.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceFunctionFail.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceSignal.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceTest.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceTestMultiple.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scarceresources/scarceResourceTestPreserve.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scope.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scope.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scope.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scope.6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scope.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptConnect.6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/scriptDisconnect.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/sharedAttachedObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/shutdownErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/signalTriggeredBindings.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/strictlyEquals.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/transientErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/variantsAssignedUndefined.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/writeAttachedProperty.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/writeRemovesBinding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeflickable/qdeclarativeflickable.pro17
-rw-r--r--tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp507
-rw-r--r--tests/auto/declarative/qdeclarativeflipable/qdeclarativeflipable.pro17
-rw-r--r--tests/auto/declarative/qdeclarativeflipable/tst_qdeclarativeflipable.cpp143
-rw-r--r--tests/auto/declarative/qdeclarativefocusscope/qdeclarativefocusscope.pro14
-rw-r--r--tests/auto/declarative/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp546
-rw-r--r--tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro18
-rw-r--r--tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp230
-rw-r--r--tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro17
-rw-r--r--tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp2225
-rw-r--r--tests/auto/declarative/qdeclarativeimage/qdeclarativeimage.pro18
-rw-r--r--tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp806
-rw-r--r--tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp44
-rw-r--r--tests/auto/declarative/qdeclarativeinfo/data/NestedComponent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeinfo/data/NestedObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeinfo/data/nestedQmlObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeinfo/data/qmlObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeitem/qdeclarativeitem.pro17
-rw-r--r--tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp1370
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/Alias.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/Alias2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/Alias3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/Alias4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/AliasPropertyChangeSignalsType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/ComponentComposite.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/CompositeType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/CompositeType3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/DynamicPropertiesNestedType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/HelperAlias.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/InlineAssignmentsOverrideBindingsType2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/LocalLast.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/NestedErrorsType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.7.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.8.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.9.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/aliasPropertiesAndSignals.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/aliasPropertyChangeSignals.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/assignCompositeToType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/assignLiteralToVariant.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/assignObjectToVariant.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/assignToNamespace.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/attachedProperties.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.7.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.8.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/component.9.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/componentCompositeType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/crash2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/customOnProperty.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/customParserIdNotAllowed.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/customParserTypes.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/declaredPropertyValues.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/defaultGrouped.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/destroyedSignal.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dontDoubleCallClassBegin.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicMeta.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicObject.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml4
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml4
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicProperties.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicPropertiesNested.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicSignalsAndSlots.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/enumTypes.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/importIncorrectCase.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/importNamespaceConflict.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/importNonExist.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/incorrectCase.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/incorrectCaseType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/inlineAssignmentsOverrideBindings.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/inlineQmlComponents.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/interfaceProperty.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAlias.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.10.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.11.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.7.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.8.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidAttachedProperty.9.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidImportID.qml4
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidProperty.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/listAssignment.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/listItemDeleteSelf.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/listProperties.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/method.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/missingSignal.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/nestedErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/noCreation.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/property.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/property.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/property.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/property.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/property.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/property.6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/property.7.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/propertyInit.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/propertyInit.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/qmlAttachedPropertiesObjectMethod.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/readOnly.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/signal.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/signal.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/signal.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/singularProperty.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/singularProperty.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/subdir/Test.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/subdir/subsubdir/SubTest.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/variantNotify.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/wrongType.16.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/LocalInternal.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/Test.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/UndeclaredLocal.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/noqmldir/Test.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/qtest/declarative/qmllanguage/subdir/SubTest.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp60
-rw-r--r--tests/auto/declarative/qdeclarativelayoutitem/qdeclarativelayoutitem.pro14
-rw-r--r--tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp125
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/data/enumerate.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/data/model.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/data/multipleroles.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/data/setmodelcachelist.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro2
-rw-r--r--tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp66
-rw-r--r--tests/auto/declarative/qdeclarativelistreference/data/MyType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelistreference/data/engineTypes.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelistreference/data/variantToList.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelistview/qdeclarativelistview.pro17
-rw-r--r--tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp2852
-rw-r--r--tests/auto/declarative/qdeclarativeloader/qdeclarativeloader.pro20
-rw-r--r--tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp637
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/data/implicit1/temptest.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/Test.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/data/implicit2/temptest2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml4
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml2
-rw-r--r--tests/auto/declarative/qdeclarativemousearea/qdeclarativemousearea.pro18
-rw-r--r--tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp705
-rw-r--r--tests/auto/declarative/qdeclarativeparticles/qdeclarativeparticles.pro17
-rw-r--r--tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp227
-rw-r--r--tests/auto/declarative/qdeclarativepathview/qdeclarativepathview.pro17
-rw-r--r--tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp1068
-rw-r--r--tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro17
-rw-r--r--tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp388
-rw-r--r--tests/auto/declarative/qdeclarativepositioners/qdeclarativepositioners.pro16
-rw-r--r--tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp1356
-rw-r--r--tests/auto/declarative/qdeclarativeproperty/data/TestType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeproperty/data/aliasPropertyBindings.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeproperty/data/readSynthesizedObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp8
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/atob.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/btoa.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/consoleLog.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/createComponent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/createComponentData.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/createComponent_lib.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/createQmlObject.qml16
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/darker.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/enums.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/fontFamilies.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/formatting.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/hsla.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/isQtObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/lighter.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/md5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/openUrlExternally.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/openUrlExternally_lib.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/point.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/quit.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/rect.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/rgba.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/size.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/tint.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/data/vector.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp4
-rw-r--r--tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro16
-rw-r--r--tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp736
-rw-r--r--tests/auto/declarative/qdeclarativescriptdebugging/data/backtrace1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml2
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml2
-rw-r--r--tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp12
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp6
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicBinding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicChanges.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/basicExtension.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/deleting.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/deletingState.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/editProperties.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/explicit.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/extendsBug.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/illegalObj.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/legalTempState.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/parentChange1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/parentChange2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/parentChange3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/parentChange4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/parentChange5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/parentChange6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/reset.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/returnToBase.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/script.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/signalOverride.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/urlResolution.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml2
-rw-r--r--tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro2
-rw-r--r--tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp393
-rw-r--r--tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp10
-rw-r--r--tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro22
-rw-r--r--tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp1450
-rw-r--r--tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro15
-rw-r--r--tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp2624
-rw-r--r--tests/auto/declarative/qdeclarativetextinput/qdeclarativetextinput.pro15
-rw-r--r--tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp2754
-rw-r--r--tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp22
-rw-r--r--tests/auto/declarative/qdeclarativev4/data/doubleBoolJump.qml2
-rw-r--r--tests/auto/declarative/qdeclarativev4/data/fetchException.qml2
-rw-r--r--tests/auto/declarative/qdeclarativev4/data/nullQObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativev4/data/qrealToIntRounding.qml2
-rw-r--r--tests/auto/declarative/qdeclarativev4/data/subscriptionsInConditionalExpressions.qml2
-rw-r--r--tests/auto/declarative/qdeclarativev4/data/unaryMinus.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/bindingsSpliceCorrectly.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/bindingsSpliceCorrectly.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/bindingsSpliceCorrectly.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/bindingsSpliceCorrectly.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/bindingsSpliceCorrectly.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/deletedObject.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/enums.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/enums.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/enums.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/font_write.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/returnValues.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/scriptAccess.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/sizereadonly_writeerror4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/data/varAssignment.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeview/qdeclarativeview.pro14
-rw-r--r--tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp323
-rw-r--r--tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro20
-rw-r--r--tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp373
-rw-r--r--tests/auto/declarative/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro17
-rw-r--r--tests/auto/declarative/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp533
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/BaseWorker.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onCall.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onLoad.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker_include.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/data/worker_pragma.qml2
-rw-r--r--tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp1
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/abort.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_opened.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/abort_unsent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/attr.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/callbackException.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/cdata.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/constructor.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/defaultState.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/document.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/domExceptionCodes.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/element.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_args.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_sent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/getAllResponseHeaders_unsent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_args.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_sent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/getResponseHeader_unsent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/instanceStateValues.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/invalidMethodUsage.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/open.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/open_arg_count.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/open_invalid_method.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/open_sync.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/open_user.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/open_username.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectError.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/redirectRecur.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/redirects.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/responseText.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/responseXML_invalid.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_alreadySent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.3.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.6.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_data.7.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_ignoreData.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/send_unsent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_args.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_illegalName.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_sent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/setRequestHeader_unsent.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/staticStateValues.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/status.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/statusText.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/text.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmlhttprequest/data/utf16.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/data/roleCrash.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml2
-rw-r--r--tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml2
-rw-r--r--tests/auto/declarative/qsgflickable/data/disabledcontent.qml8
-rw-r--r--tests/auto/declarative/qsgflickable/tst_qsgflickable.cpp39
-rw-r--r--tests/auto/declarative/qsglistview/data/displaylist.qml2
-rw-r--r--tests/auto/declarative/qsglistview/tst_qsglistview.cpp12
-rw-r--r--tests/auto/declarative/shared/debugutil_p.h1
-rw-r--r--tests/auto/qtquick1/moduleqt47/data/importqt47.qml (renamed from tests/auto/declarative/moduleqt47/data/importqt47.qml)0
-rw-r--r--tests/auto/qtquick1/moduleqt47/moduleqt47.pro17
-rw-r--r--tests/auto/qtquick1/moduleqt47/tst_moduleqt47.cpp141
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/anchors.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/anchors.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/anchorsqgraphicswidget.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/centerin.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/centerin.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/crash1.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/crash1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/fill.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/fill.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/hvCenter.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/hvCenter.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/loop1.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/loop1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/loop2.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/loop2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/data/margins.qml (renamed from tests/auto/declarative/qdeclarativeanchors/data/margins.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/qdeclarativeanchors.pro16
-rw-r--r--tests/auto/qtquick1/qdeclarativeanchors/tst_qdeclarativeanchors.cpp772
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/colors.gif (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/colors.gif)bin505 -> 505 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/colors.qml (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/colors.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/hearts.gif (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/hearts.gif)bin6524 -> 6524 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/hearts.qml (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/hearts.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/qmldir (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/qmldir)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/qtbug-16520.qml (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/qtbug-16520.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/stickman.gif (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.gif)bin164923 -> 164923 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/stickman.qml (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/stickman.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/stickmanerror1.qml (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanerror1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/stickmanpause.qml (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanpause.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/stickmanscaled.qml (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanscaled.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/data/stickmanstopped.qml (renamed from tests/auto/declarative/qdeclarativeanimatedimage/data/stickmanstopped.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp387
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/Double.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/attached.qml34
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badproperty1.qml21
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badproperty2.qml21
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badtype1.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badtype2.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badtype3.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/badtype4.qml27
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/dontAutoStart.qml18
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/dontStart.qml19
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/dontStart2.qml19
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/dotproperty.qml24
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/doubleRegistrationBug.qml8
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype1.qml25
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/mixedtype2.qml25
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/nonTransitionBug.qml30
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties2.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties3.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties4.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/properties5.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition2.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition3.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition4.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition5.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition6.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/propertiesTransition7.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/registrationBug.qml18
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/rotation.qml48
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/runningTrueBug.qml30
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/valuesource.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/data/valuesource2.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/qdeclarativeanimations.pro16
-rw-r--r--tests/auto/qtquick1/qdeclarativeanimations/tst_qdeclarativeanimations.cpp855
-rw-r--r--tests/auto/qtquick1/qdeclarativeapplication/qdeclarativeapplication.pro6
-rw-r--r--tests/auto/qtquick1/qdeclarativeapplication/tst_qdeclarativeapplication.cpp123
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/binding.qml26
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/color.qml24
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/cpptrigger.qml11
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/delayedRegistration.qml25
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/disabled.qml27
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/dontStart.qml18
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/empty.qml23
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/explicit.qml26
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/groupProperty.qml23
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/groupProperty2.qml23
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/groupedPropertyCrash.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/loop.qml19
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/nonSelecting2.qml26
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/parent.qml28
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/qtbug12295.qml17
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/reassignedAnimation.qml32
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/runningTrue.qml20
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/scripttrigger.qml16
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/simple.qml26
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/startup.qml17
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/data/startup2.qml16
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/qdeclarativebehaviors.pro16
-rw-r--r--tests/auto/qtquick1/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp435
-rw-r--r--tests/auto/qtquick1/qdeclarativebinding/data/test-binding.qml16
-rw-r--r--tests/auto/qtquick1/qdeclarativebinding/data/test-binding2.qml16
-rw-r--r--tests/auto/qtquick1/qdeclarativebinding/qdeclarativebinding.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativebinding/tst_qdeclarativebinding.cpp118
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/data/colors-round-remote.sci (renamed from tests/auto/declarative/qdeclarativeborderimage/data/colors-round-remote.sci)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/data/colors-round.sci (renamed from tests/auto/declarative/qdeclarativeborderimage/data/colors-round.sci)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/data/colors.png (renamed from tests/auto/declarative/qdeclarativeborderimage/data/colors.png)bin1655 -> 1655 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/data/heart200.png (renamed from tests/auto/declarative/qdeclarativeborderimage/data/heart200.png)bin7943 -> 7943 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/data/invalid.sci (renamed from tests/auto/declarative/qdeclarativeborderimage/data/invalid.sci)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro18
-rw-r--r--tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp427
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/connection-targetchange.qml25
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-ignored.qml8
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-notarget.qml7
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals-parent.qml7
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/connection-unknownsignals.qml7
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/error-object.qml7
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/error-property.qml5
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/error-property2.qml5
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/error-syntax.qml9
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/test-connection.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/test-connection2.qml3
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/test-connection3.qml3
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/data/trimming.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/qdeclarativeconnection.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativeconnection/tst_qdeclarativeconnection.cpp234
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/disabledcontent.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/disabledcontent.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/flickable01.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/flickable01.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/flickable02.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/flickable02.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/flickable03.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/flickable03.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/flickable04.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/flickable04.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/flickableqgraphicswidget.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/flickableqgraphicswidget.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/nestedPressDelay.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/nestedPressDelay.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/resize.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/resize.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/data/wheel.qml (renamed from tests/auto/declarative/qdeclarativeflickable/data/wheel.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/qdeclarativeflickable.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativeflickable/tst_qdeclarativeflickable.cpp507
-rw-r--r--tests/auto/qtquick1/qdeclarativeflipable/data/crash.qml (renamed from tests/auto/declarative/qdeclarativeflipable/data/crash.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflipable/data/flipable-abort.qml (renamed from tests/auto/declarative/qdeclarativeflipable/data/flipable-abort.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflipable/data/test-flipable.qml (renamed from tests/auto/declarative/qdeclarativeflipable/data/test-flipable.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeflipable/qdeclarativeflipable.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativeflipable/tst_qdeclarativeflipable.cpp143
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/chain.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/chain.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/forceActiveFocus.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/forceActiveFocus.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/forcefocus.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/forcefocus.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/qtBug13380.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/qtBug13380.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/signalEmission.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/signalEmission.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/test.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/test.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/test2.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/test2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/test3.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/test3.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/test4.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/test4.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/data/test5.qml (renamed from tests/auto/declarative/qdeclarativefocusscope/data/test5.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/qdeclarativefocusscope.pro14
-rw-r--r--tests/auto/qtquick1/qdeclarativefocusscope/tst_qdeclarativefocusscope.cpp546
-rw-r--r--tests/auto/qtquick1/qdeclarativefontloader/data/daniel.ttf (renamed from tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf)bin51984 -> 51984 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativefontloader/data/dummy.ttf (renamed from tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf)0
-rw-r--r--tests/auto/qtquick1/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/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro18
-rw-r--r--tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp230
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/attachedSignals.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/attachedSignals.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/displaygrid.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/displaygrid.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/footer.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/footer.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/gridview-enforcerange.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/gridview-enforcerange.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/gridview-initCurrent.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/gridview-initCurrent.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/gridview-noCurrent.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/gridview-noCurrent.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/gridview1.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/gridview1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/gridview2.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/gridview2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/gridview3.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/gridview3.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/header.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/header.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/manual-highlight.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/mirroring.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/mirroring.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/propertychangestest.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/propertychangestest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/data/setindex.qml (renamed from tests/auto/declarative/qdeclarativegridview/data/setindex.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/qdeclarativegridview.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativegridview/tst_qdeclarativegridview.cpp2223
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/aspectratio.qml (renamed from tests/auto/declarative/qdeclarativeimage/data/aspectratio.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/big.jpeg (renamed from tests/auto/declarative/qdeclarativeimage/data/big.jpeg)bin1700081 -> 1700081 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/big256.png (renamed from tests/auto/declarative/qdeclarativeimage/data/big256.png)bin3566 -> 3566 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/colors.png (renamed from tests/auto/declarative/qdeclarativeimage/data/colors.png)bin1655 -> 1655 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/colors1.png (renamed from tests/auto/declarative/qdeclarativeimage/data/colors1.png)bin1655 -> 1655 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/green.png (renamed from tests/auto/declarative/qdeclarativeimage/data/green.png)bin314 -> 314 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/heart-win32.png (renamed from tests/auto/declarative/qdeclarativeimage/data/heart-win32.png)bin12621 -> 12621 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/heart.png (renamed from tests/auto/declarative/qdeclarativeimage/data/heart.png)bin12577 -> 12577 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/heart.svg (renamed from tests/auto/declarative/qdeclarativeimage/data/heart.svg)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/heart200-win32.png (renamed from tests/auto/declarative/qdeclarativeimage/data/heart200-win32.png)bin8062 -> 8062 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/heart200.png (renamed from tests/auto/declarative/qdeclarativeimage/data/heart200.png)bin8063 -> 8063 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/qtbug_16389.qml (renamed from tests/auto/declarative/qdeclarativeimage/data/qtbug_16389.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/rect.png (renamed from tests/auto/declarative/qdeclarativeimage/data/rect.png)bin171 -> 171 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/data/tiling.qml (renamed from tests/auto/declarative/qdeclarativeimage/data/tiling.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro18
-rw-r--r--tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp807
-rw-r--r--tests/auto/qtquick1/qdeclarativeimageprovider/qdeclarativeimageprovider.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp432
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/childrenProperty.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/childrenProperty.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/childrenRect.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/childrenRect.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/childrenRectBug.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/childrenRectBug.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/childrenRectBug2.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/childrenRectBug2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/childrenRectBug3.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/childrenRectBug3.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/implicitsize.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/implicitsize.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/keynavigationtest.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/keynavigationtest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/keynavigationtest_implicit.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/keynavigationtest_implicit.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/keyspriority.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/keyspriority.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/keystest.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/keystest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/layoutmirroring.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/layoutmirroring.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/mapCoordinates.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/mapCoordinates.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/mouseFocus.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/mouseFocus.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/propertychanges.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/propertychanges.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/qtbug_16871.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/qtbug_16871.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/resourcesProperty.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/resourcesProperty.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/data/transformCrash.qml (renamed from tests/auto/declarative/qdeclarativeitem/data/transformCrash.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/qdeclarativeitem.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativeitem/tst_qdeclarativeitem.cpp1370
-rw-r--r--tests/auto/qtquick1/qdeclarativelayoutitem/data/layoutItem.qml (renamed from tests/auto/declarative/qdeclarativelayoutitem/data/layoutItem.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelayoutitem/qdeclarativelayoutitem.pro14
-rw-r--r--tests/auto/qtquick1/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp125
-rw-r--r--tests/auto/qtquick1/qdeclarativelistmodel/data/enumerate.qml24
-rw-r--r--tests/auto/qtquick1/qdeclarativelistmodel/data/model.qml22
-rw-r--r--tests/auto/qtquick1/qdeclarativelistmodel/data/multipleroles.qml25
-rw-r--r--tests/auto/qtquick1/qdeclarativelistmodel/data/script.js13
-rw-r--r--tests/auto/qtquick1/qdeclarativelistmodel/data/setmodelcachelist.qml20
-rw-r--r--tests/auto/qtquick1/qdeclarativelistmodel/qdeclarativelistmodel.pro18
-rw-r--r--tests/auto/qtquick1/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp1125
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/attachedSignals.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/attachedSignals.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/displaylist.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/displaylist.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/footer.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/footer.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/header.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/header.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/header1.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/header1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/headerfooter.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/headerfooter.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/itemlist.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/itemlist.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/listview-enforcerange.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/listview-enforcerange.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/listview-initCurrent.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/listview-initCurrent.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/listview-noCurrent.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/listview-noCurrent.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/listview-sections.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/listview-sections.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/listview-sections_delegate.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/listview-sections_delegate.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/listviewtest.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/manual-highlight.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/manual-highlight.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/orientchange.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/orientchange.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/propertychangestest.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/propertychangestest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/qtbug14821.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/qtbug14821.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/qtbug16037.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/qtbug16037.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/rightToLeft.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/rightToLeft.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/sizelessthan1.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/sizelessthan1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/data/strictlyenforcerange.qml (renamed from tests/auto/declarative/qdeclarativelistview/data/strictlyenforcerange.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/incrementalmodel.cpp (renamed from tests/auto/declarative/qdeclarativelistview/incrementalmodel.cpp)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/incrementalmodel.h (renamed from tests/auto/declarative/qdeclarativelistview/incrementalmodel.h)0
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/qdeclarativelistview.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativelistview/tst_qdeclarativelistview.cpp2851
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/AnchoredLoader.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/AnchoredLoader.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/BlueRect.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/BlueRect.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/CreationContextLoader.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/CreationContextLoader.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/GraphicsWidget250x250.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/GreenRect.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/GreenRect.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/NoResize.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/NoResize.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/NoResizeGraphicsWidget.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/NoResizeGraphicsWidget.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/QTBUG_16928.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/QTBUG_16928.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/QTBUG_17114.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/QTBUG_17114.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/Rect120x60.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/Rect120x60.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/SetSourceComponent.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/SetSourceComponent.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/SizeGraphicsWidgetToLoader.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/SizeLoaderToGraphicsWidget.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/SizeToItem.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/SizeToItem.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/SizeToLoader.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/SizeToLoader.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/VmeError.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/VmeError.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/crash.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/crash.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/creationContext.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/creationContext.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/differentorigin.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/differentorigin.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/implicitSize.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/implicitSize.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/nonItem.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/nonItem.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/qmldir (renamed from tests/auto/declarative/qdeclarativeloader/data/qmldir)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/sameorigin-load.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/sameorigin-load.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/sameorigin.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/sameorigin.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/data/vmeErrors.qml (renamed from tests/auto/declarative/qdeclarativeloader/data/vmeErrors.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro20
-rw-r--r--tests/auto/qtquick1/qdeclarativeloader/tst_qdeclarativeloader.cpp637
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/clickandhold.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/clickandhold.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/clicktwice.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/clicktwice.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/doubleclick.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/doubleclick.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/dragging.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/dragging.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/dragproperties.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/dragproperties.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/dragreset.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/dragreset.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/pressedOrdering.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/pressedOrdering.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/preventContextMenu.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/preventContextMenu.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/preventstealing.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/preventstealing.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/rejectEvent.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnClick.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnClick.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/data/updateMousePosOnResize.qml (renamed from tests/auto/declarative/qdeclarativemousearea/data/updateMousePosOnResize.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro18
-rw-r--r--tests/auto/qtquick1/qdeclarativemousearea/tst_qdeclarativemousearea.cpp705
-rw-r--r--tests/auto/qtquick1/qdeclarativeparticles/data/particle.png (renamed from tests/auto/declarative/qdeclarativeparticles/data/particle.png)bin262 -> 262 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativeparticles/data/particlemotiontest.qml (renamed from tests/auto/declarative/qdeclarativeparticles/data/particlemotiontest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeparticles/data/particlestest.qml (renamed from tests/auto/declarative/qdeclarativeparticles/data/particlestest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeparticles/qdeclarativeparticles.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativeparticles/tst_qdeclarativeparticles.cpp227
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/closedPath.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/closedPath.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/datamodel.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/datamodel.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/displaypath.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/displaypath.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/dragpath.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/dragpath.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/emptymodel.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/emptymodel.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/openPath.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/openPath.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/pathUpdate.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/pathUpdate.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/pathUpdateOnStartChanged.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/pathUpdateOnStartChanged.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/pathtest.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/pathtest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/pathview0.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/pathview0.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/pathview1.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/pathview1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/pathview2.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/pathview2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/pathview3.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/pathview3.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/pathview_package.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/propertychanges.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/propertychanges.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/treemodel.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/treemodel.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/undefinedpath.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/undefinedpath.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/data/vdm.qml (renamed from tests/auto/declarative/qdeclarativepathview/data/vdm.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/qdeclarativepathview.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativepathview/tst_qdeclarativepathview.cpp1068
-rw-r--r--tests/auto/qtquick1/qdeclarativepincharea/data/flickresize.qml (renamed from tests/auto/declarative/qdeclarativepincharea/data/flickresize.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepincharea/data/pinchproperties.qml (renamed from tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepincharea/qdeclarativepincharea.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativepincharea/tst_qdeclarativepincharea.cpp388
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/flow-testimplicitsize.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/flowtest-toptobottom.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/flowtest-toptobottom.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/flowtest.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/grid-animated.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/grid-spacing.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/grid-spacing.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/grid-toptobottom.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/grid-toptobottom.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/gridtest.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/gridtest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/gridzerocolumns.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/gridzerocolumns.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/horizontal-animated.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/horizontal-spacing.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/horizontal.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/propertychangestest.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/propertychangestest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/repeatertest.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/vertical-animated.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/vertical-animated.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/vertical-spacing.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/vertical-spacing.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/vertical.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/vertical.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/data/verticalqgraphicswidget.qml (renamed from tests/auto/declarative/qdeclarativepositioners/data/verticalqgraphicswidget.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/qdeclarativepositioners.pro16
-rw-r--r--tests/auto/qtquick1/qdeclarativepositioners/tst_qdeclarativepositioners.cpp1355
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/data/intmodel.qml (renamed from tests/auto/declarative/qdeclarativerepeater/data/intmodel.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/data/itemlist.qml (renamed from tests/auto/declarative/qdeclarativerepeater/data/itemlist.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/data/modelChanged.qml (renamed from tests/auto/declarative/qdeclarativerepeater/data/modelChanged.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/data/objlist.qml (renamed from tests/auto/declarative/qdeclarativerepeater/data/objlist.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/data/properties.qml (renamed from tests/auto/declarative/qdeclarativerepeater/data/properties.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/data/repeater1.qml (renamed from tests/auto/declarative/qdeclarativerepeater/data/repeater1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/data/repeater2.qml (renamed from tests/auto/declarative/qdeclarativerepeater/data/repeater2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/qdeclarativerepeater.pro16
-rw-r--r--tests/auto/qtquick1/qdeclarativerepeater/tst_qdeclarativerepeater.cpp735
-rw-r--r--tests/auto/qtquick1/qdeclarativesmoothedanimation/data/smoothedanimation1.qml3
-rw-r--r--tests/auto/qtquick1/qdeclarativesmoothedanimation/data/smoothedanimation2.qml5
-rw-r--r--tests/auto/qtquick1/qdeclarativesmoothedanimation/data/smoothedanimation3.qml6
-rw-r--r--tests/auto/qtquick1/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml24
-rw-r--r--tests/auto/qtquick1/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml13
-rw-r--r--tests/auto/qtquick1/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp216
-rw-r--r--tests/auto/qtquick1/qdeclarativespringanimation/data/springanimation1.qml4
-rw-r--r--tests/auto/qtquick1/qdeclarativespringanimation/data/springanimation2.qml9
-rw-r--r--tests/auto/qtquick1/qdeclarativespringanimation/data/springanimation3.qml8
-rw-r--r--tests/auto/qtquick1/qdeclarativespringanimation/qdeclarativespringanimation.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp136
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/ExtendedRectangle.qml19
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/Implementation/MyType.qml32
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/Implementation/images/qt-logo.pngbin0 -> 5149 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/QTBUG-14830.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/anchorChanges1.qml23
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/anchorChanges2.qml21
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/anchorChanges3.qml29
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/anchorChanges4.qml22
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/anchorChanges5.qml22
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/anchorChangesCrash.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/anchorRewindBug.qml37
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/anchorRewindBug2.qml25
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/attachedPropertyChanges.qml20
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml18
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicBinding.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicBinding2.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicBinding3.qml13
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicBinding4.qml17
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicChanges.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicChanges2.qml15
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicChanges3.qml15
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicChanges4.qml19
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/basicExtension.qml16
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/deleting.qml11
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/deletingState.qml13
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/editProperties.qml34
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/explicit.qml15
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/extendsBug.qml26
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/fakeExtension.qml16
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/illegalObj.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/illegalTempState.qml21
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/image.pngbin0 -> 173 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/legalTempState.qml23
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/nonExistantProp.qml11
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/parentChange1.qml37
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/parentChange2.qml31
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/parentChange3.qml42
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/parentChange4.qml30
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/parentChange5.qml30
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/parentChange6.qml30
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/propertyErrors.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/reset.qml19
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/restoreEntryValues.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/returnToBase.qml21
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/script.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/signalOverride.qml18
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/signalOverride2.qml9
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/signalOverrideCrash.qml15
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/signalOverrideCrash2.qml24
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/unnamedWhen.qml14
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/urlResolution.qml12
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/data/whenOrdering.qml11
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/qdeclarativestates.pro16
-rw-r--r--tests/auto/qtquick1/qdeclarativestates/tst_qdeclarativestates.cpp1514
-rw-r--r--tests/auto/qtquick1/qdeclarativesystempalette/qdeclarativesystempalette.pro13
-rw-r--r--tests/auto/qtquick1/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp192
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments.qml (renamed from tests/auto/declarative/qdeclarativetext/data/alignments.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_cb.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_cb.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_cc.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_cc.png)bin556 -> 556 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_ct.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_ct.png)bin533 -> 533 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_lb.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_lb.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_lc.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_lc.png)bin535 -> 535 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_lt.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_lt.png)bin514 -> 514 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_rb.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_rb.png)bin505 -> 505 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_rc.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_rc.png)bin559 -> 559 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/alignments_rt.png (renamed from tests/auto/declarative/qdeclarativetext/data/alignments_rt.png)bin539 -> 539 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/elideimplicitwidth.qml (renamed from tests/auto/declarative/qdeclarativetext/data/elideimplicitwidth.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/embeddedImagesLocal.qml (renamed from tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocal.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/embeddedImagesLocalError.qml (renamed from tests/auto/declarative/qdeclarativetext/data/embeddedImagesLocalError.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/embeddedImagesRemote.qml (renamed from tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemote.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/embeddedImagesRemoteError.qml (renamed from tests/auto/declarative/qdeclarativetext/data/embeddedImagesRemoteError.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qdeclarativetext/data/horizontalAlignment_RightToLeft.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/http/exists.png (renamed from tests/auto/declarative/qdeclarativetext/data/http/exists.png)bin2738 -> 2738 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/lineCount.qml (renamed from tests/auto/declarative/qdeclarativetext/data/lineCount.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/lineHeight.qml (renamed from tests/auto/declarative/qdeclarativetext/data/lineHeight.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/qtbug_14734.qml (renamed from tests/auto/declarative/qdeclarativetext/data/qtbug_14734.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/data/rotated.qml (renamed from tests/auto/declarative/qdeclarativetext/data/rotated.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro22
-rw-r--r--tests/auto/qtquick1/qdeclarativetext/tst_qdeclarativetext.cpp1450
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/CursorRect.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/CursorRect.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_cb.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_cb.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_cc.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_cc.png)bin556 -> 556 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_ct.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_ct.png)bin533 -> 533 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_lb.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_lb.png)bin496 -> 496 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_lc.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_lc.png)bin535 -> 535 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_lt.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_lt.png)bin514 -> 514 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_rb.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_rb.png)bin505 -> 505 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_rc.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_rc.png)bin559 -> 559 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/alignments_rt.png (renamed from tests/auto/declarative/qdeclarativetextedit/data/alignments_rt.png)bin539 -> 539 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/cursorTest.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/cursorTest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/geometrySignals.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/geometrySignals.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/horizontalAlignment_RightToLeft.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/http/ErrItem.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/http/ErrItem.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/http/NormItem.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/http/NormItem.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/http/cursorHttpTest.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestFail2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/http/cursorHttpTestPass.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/http/cursorHttpTestPass.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/http/qmldir (renamed from tests/auto/declarative/qdeclarativetextedit/data/http/qmldir)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/httpfail/FailItem.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/httpfail/FailItem.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/httpslow/WaitItem.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/httpslow/WaitItem.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/inputmethodhints.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/inputmethodhints.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselection_default.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselection_default.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselection_false.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselection_false_readonly.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false_readonly.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselection_false_words.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselection_false_words.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselection_multiline.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselection_multiline.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselection_true.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselection_true_readonly.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true_readonly.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselection_true_words.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselection_true_words.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselectionmode_characters.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_characters.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselectionmode_default.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_default.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/mouseselectionmode_words.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_words.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/navigation.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/navigation.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/positionAt.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/positionAt.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/data/readOnly.qml (renamed from tests/auto/declarative/qdeclarativetextedit/data/readOnly.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro15
-rw-r--r--tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp2624
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/cursorTest.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/cursorTest.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/echoMode.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/echoMode.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/geometrySignals.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/geometrySignals.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/halign_center.png (renamed from tests/auto/declarative/qdeclarativetextinput/data/halign_center.png)bin293 -> 293 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/halign_left.png (renamed from tests/auto/declarative/qdeclarativetextinput/data/halign_left.png)bin291 -> 291 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/halign_right.png (renamed from tests/auto/declarative/qdeclarativetextinput/data/halign_right.png)bin292 -> 292 bytes
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/horizontalAlignment.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment_RightToLeft.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/inputmethods.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/inputmethods.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/masks.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/masks.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/maxLength.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/maxLength.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselection_default.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselection_default.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselection_false.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselection_false_readonly.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false_readonly.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselection_false_words.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselection_false_words.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselection_true.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselection_true_readonly.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true_readonly.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselection_true_words.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true_words.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselectionmode_characters.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_characters.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselectionmode_default.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_default.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/mouseselectionmode_words.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_words.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/navigation.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/navigation.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/positionAt.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/positionAt.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/readOnly.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/readOnly.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/data/validators.qml (renamed from tests/auto/declarative/qdeclarativetextinput/data/validators.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/qdeclarativetextinput.pro15
-rw-r--r--tests/auto/qtquick1/qdeclarativetextinput/tst_qdeclarativetextinput.cpp2754
-rw-r--r--tests/auto/qtquick1/qdeclarativetimer/qdeclarativetimer.pro12
-rw-r--r--tests/auto/qtquick1/qdeclarativetimer/tst_qdeclarativetimer.cpp344
-rw-r--r--tests/auto/qtquick1/qdeclarativeview/data/error1.qml (renamed from tests/auto/declarative/qdeclarativeview/data/error1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeview/data/resizemodedeclarativeitem.qml (renamed from tests/auto/declarative/qdeclarativeview/data/resizemodedeclarativeitem.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeview/data/resizemodegraphicswidget.qml (renamed from tests/auto/declarative/qdeclarativeview/data/resizemodegraphicswidget.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeview/qdeclarativeview.pro14
-rw-r--r--tests/auto/qtquick1/qdeclarativeview/tst_qdeclarativeview.cpp323
-rw-r--r--tests/auto/qtquick1/qdeclarativeviewer/data/orientation.qml (renamed from tests/auto/declarative/qdeclarativeviewer/data/orientation.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro20
-rw-r--r--tests/auto/qtquick1/qdeclarativeviewer/tst_qdeclarativeviewer.cpp373
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/data/datalist.qml (renamed from tests/auto/declarative/qdeclarativevisualdatamodel/data/datalist.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/data/modelproperties.qml (renamed from tests/auto/declarative/qdeclarativevisualdatamodel/data/modelproperties.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/data/modelproperties2.qml (renamed from tests/auto/declarative/qdeclarativevisualdatamodel/data/modelproperties2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/data/objectlist.qml (renamed from tests/auto/declarative/qdeclarativevisualdatamodel/data/objectlist.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/data/singlerole1.qml (renamed from tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole1.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/data/singlerole2.qml (renamed from tests/auto/declarative/qdeclarativevisualdatamodel/data/singlerole2.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/data/visualdatamodel.qml (renamed from tests/auto/declarative/qdeclarativevisualdatamodel/data/visualdatamodel.qml)0
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/qdeclarativevisualdatamodel.pro17
-rw-r--r--tests/auto/qtquick1/qdeclarativevisualdatamodel/tst_qdeclarativevisualdatamodel.cpp533
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/get.qml61
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/model.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/model.xml54
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/model2.xml14
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/propertychanges.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/recipes.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/recipes.xml90
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/roleCrash.qml7
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/roleErrors.qml10
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/roleKeys.qml13
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/testtypes.qml8
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/data/unique.qml8
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro21
-rw-r--r--tests/auto/qtquick1/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp965
-rw-r--r--tests/auto/qtquick1/qtquick1.pro50
-rw-r--r--tools/qmlplugindump/main.cpp12
-rw-r--r--tools/qmlscene/main.cpp3
-rw-r--r--tools/qmlscene/qmlscene.pro2
-rw-r--r--tools/qmlviewer/qdeclarativetester.cpp4
-rw-r--r--tools/qmlviewer/qmlruntime.cpp2
-rw-r--r--tools/qmlviewer/qmlviewer.pro1
1471 files changed, 98950 insertions, 68678 deletions
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index e20efa7392..0bf0fe6f59 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -43,6 +43,19 @@ set binding when its \e when clause becomes false.
QDeclarativeExpression can now be directly (and more efficiently) constructed from a
QDeclarativeScriptString.
+\section2 QtQuick 1 is now a separate library and module
+
+Writing C++ applications using QtQuick 1 specific API, i.e. QDeclarativeView or QDeclarativeItem
+requires adding the "qtquick1" module to the .pro file, e.g. QT += declarative qtquick1
+
+QDeclarativeView and QDeclarativeItem headers are now in the QtQuick 1 module, i.e.
+#include <QtQuick1/QDeclarativeView>
+#include <QtQuick1/QDeclarativeItem>
+
+"import QtQuick 1.0" loads the module dynamically. To deploy QtQuick 1 applications
+the library (lib/libQtQuick1*) and plugin (imports/QtQuick/) must be installed.
+
+
\section1 Qt 4.7.4 includes QtQuick 1.1
QtQuick 1.1 is a minor feature update. \e {import QtQuick 1.1} to use the new
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index eaa48cd901..5a915034dc 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -1,6 +1,6 @@
TEMPLATE = lib
CONFIG += qt plugin
-QT += declarative
+QT += declarative qtquick1
DESTDIR = ImageProviderCore
TARGET = qmlimageproviderplugin
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 74d8db321d..ba0498eaf8 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 network qtquick1
# Input
SOURCES += main.cpp
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
index 77c6b2a287..32e81fe557 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET =
DEPENDPATH += .
INCLUDEPATH += .
-QT += declarative
+QT += declarative qtquick1
SOURCES += main.cpp
RESOURCES += layoutitem.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
index ae6373d49b..2d9e7bc04e 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = qgraphicsgridlayout
-QT += declarative
+QT += declarative qtquick1
SOURCES += \
gridlayout.cpp \
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
index 79eb6ff8b4..c2e9b57fd1 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = qgraphicslinearlayout
-QT += declarative
+QT += declarative qtquick1
SOURCES += \
linearlayout.cpp \
diff --git a/examples/declarative/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp
index 9e7ab5f120..93b9a5280b 100644
--- a/examples/declarative/minehunt/main.cpp
+++ b/examples/declarative/minehunt/main.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <QtGui/QApplication>
-#include <QtDeclarative/QDeclarativeView>
+#include <QtQuick1/QDeclarativeView>
#include <QtDeclarative/QDeclarativeContext>
#include <QtDeclarative/QDeclarativeEngine>
diff --git a/examples/declarative/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro
index 67e25dcfad..fe464fb498 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 qtquick1
# Input
HEADERS += minehunt.h
diff --git a/examples/declarative/modelviews/objectlistmodel/main.cpp b/examples/declarative/modelviews/objectlistmodel/main.cpp
index 812d8addf1..345b5eec87 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 <qdeclarativeitem.h>
-#include <qdeclarativeview.h>
+#include <qsgitem.h>
+#include <qsgview.h>
#include "dataobject.h"
@@ -64,7 +64,8 @@ int main(int argc, char ** argv)
dataList.append(new DataObject("Item 3", "blue"));
dataList.append(new DataObject("Item 4", "yellow"));
- QDeclarativeView view;
+ QSGView view;
+ view.setResizeMode(QSGView::SizeRootObjectToView);
QDeclarativeContext *ctxt = view.rootContext();
ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
//![0]
diff --git a/examples/declarative/modelviews/objectlistmodel/view.qml b/examples/declarative/modelviews/objectlistmodel/view.qml
index 264289f3bf..6dab6d95f0 100644
--- a/examples/declarative/modelviews/objectlistmodel/view.qml
+++ b/examples/declarative/modelviews/objectlistmodel/view.qml
@@ -38,12 +38,11 @@
**
****************************************************************************/
-import QtQuick 1.0
+import QtQuick 2.0
//![0]
ListView {
width: 100; height: 100
- anchors.fill: parent
model: myModel
delegate: Rectangle {
diff --git a/examples/declarative/modelviews/stringlistmodel/main.cpp b/examples/declarative/modelviews/stringlistmodel/main.cpp
index b3452baf5b..c69963b89a 100644
--- a/examples/declarative/modelviews/stringlistmodel/main.cpp
+++ b/examples/declarative/modelviews/stringlistmodel/main.cpp
@@ -43,8 +43,8 @@
#include <qdeclarativeengine.h>
#include <qdeclarativecontext.h>
#include <qdeclarative.h>
-#include <qdeclarativeitem.h>
-#include <qdeclarativeview.h>
+#include <qsgitem.h>
+#include <qsgview.h>
/*
@@ -63,7 +63,7 @@ int main(int argc, char ** argv)
dataList.append("Item 3");
dataList.append("Item 4");
- QDeclarativeView view;
+ QSGView view;
QDeclarativeContext *ctxt = view.rootContext();
ctxt->setContextProperty("myModel", QVariant::fromValue(dataList));
//![0]
diff --git a/examples/declarative/modelviews/stringlistmodel/view.qml b/examples/declarative/modelviews/stringlistmodel/view.qml
index 9c65d80514..d4dfb3e97b 100644
--- a/examples/declarative/modelviews/stringlistmodel/view.qml
+++ b/examples/declarative/modelviews/stringlistmodel/view.qml
@@ -38,12 +38,11 @@
**
****************************************************************************/
-import QtQuick 1.0
+import QtQuick 2.0
//![0]
ListView {
width: 100; height: 100
- anchors.fill: parent
model: myModel
delegate: Rectangle {
diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro
index 0f0416718c..77cc4cdfca 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 qtquick1
HEADERS += piechart.h
SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro
index 0f0416718c..77cc4cdfca 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 qtquick1
HEADERS += piechart.h
SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro
index 0f0416718c..77cc4cdfca 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 qtquick1
HEADERS += piechart.h
SOURCES += piechart.cpp \
diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro
index c3f5402aea..9942ccd0a9 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 qtquick1
HEADERS += piechart.h \
pieslice.h
diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro
index c3f5402aea..9942ccd0a9 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 qtquick1
HEADERS += piechart.h \
pieslice.h
diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro
index aa1fb0129b..e5963ee3e5 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 qtquick1
DESTDIR = lib
OBJECTS_DIR = tmp
diff --git a/modules/qt_qtquick1.pri b/modules/qt_qtquick1.pri
new file mode 100644
index 0000000000..173c3da684
--- /dev/null
+++ b/modules/qt_qtquick1.pri
@@ -0,0 +1,17 @@
+QT.qtquick1.VERSION = 5.0.0
+QT.qtquick1.MAJOR_VERSION = 5
+QT.qtquick1.MINOR_VERSION = 0
+QT.qtquick1.PATCH_VERSION = 0
+
+QT.qtquick1.name = QtQuick1
+QT.qtquick1.bins = $$QT_MODULE_BIN_BASE
+QT.qtquick1.includes = $$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/QtQuick1
+QT.qtquick1.private_includes = $$QT_MODULE_INCLUDE_BASE/QtQuick1/$$QT.qtquick1.VERSION
+QT.qtquick1.sources = $$QT_MODULE_BASE/src/qtquick1
+QT.qtquick1.libs = $$QT_MODULE_LIB_BASE
+QT.qtquick1.plugins = $$QT_MODULE_PLUGIN_BASE
+QT.qtquick1.imports = $$QT_MODULE_IMPORT_BASE
+QT.qtquick1.depends = declarative
+QT.qtquick1.DEFINES = QT_DECLARATIVE_LIB
+
+QT_CONFIG += qtquick1
diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h
index 6681d28846..f2710cde93 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace_p.h
+++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h
@@ -63,7 +63,7 @@ struct QDeclarativeDebugData
};
class QUrl;
-class Q_AUTOTEST_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService
{
public:
enum Message {
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 5cb1d9570c..a43dbdac51 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -28,7 +28,6 @@ HEADERS += qtdeclarativeversion.h
#modules
include(util/util.pri)
-include(graphicsitems/graphicsitems.pri)
include(qml/qml.pri)
include(debugger/debugger.pri)
include(scenegraph/scenegraph.pri)
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors.cpp b/src/declarative/graphicsitems/qdeclarativeanchors.cpp
deleted file mode 100644
index c15384e632..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeanchors.cpp
+++ /dev/null
@@ -1,1165 +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 "private/qdeclarativeanchors_p_p.h"
-
-#include "qdeclarativeitem.h"
-#include "private/qdeclarativeitem_p.h"
-
-#include <qdeclarativeinfo.h>
-
-#include <QDebug>
-
-QT_BEGIN_NAMESPACE
-
-//TODO: should we cache relationships, so we don't have to check each time (parent-child or sibling)?
-//TODO: support non-parent, non-sibling (need to find lowest common ancestor)
-
-static qreal hcenter(QGraphicsItem *i)
-{
- QGraphicsItemPrivate *item = QGraphicsItemPrivate::get(i);
-
- qreal width = item->width();
- int iw = width;
- if (iw % 2)
- return (width + 1) / 2;
- else
- return width / 2;
-}
-
-static qreal vcenter(QGraphicsItem *i)
-{
- QGraphicsItemPrivate *item = QGraphicsItemPrivate::get(i);
-
- qreal height = item->height();
- int ih = height;
- if (ih % 2)
- return (height + 1) / 2;
- else
- return height / 2;
-}
-
-//### const item?
-//local position
-static qreal position(QGraphicsObject *item, QDeclarativeAnchorLine::AnchorLine anchorLine)
-{
- qreal ret = 0.0;
- QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(item);
- switch(anchorLine) {
- case QDeclarativeAnchorLine::Left:
- ret = item->x();
- break;
- case QDeclarativeAnchorLine::Right:
- ret = item->x() + d->width();
- break;
- case QDeclarativeAnchorLine::Top:
- ret = item->y();
- break;
- case QDeclarativeAnchorLine::Bottom:
- ret = item->y() + d->height();
- break;
- case QDeclarativeAnchorLine::HCenter:
- ret = item->x() + hcenter(item);
- break;
- case QDeclarativeAnchorLine::VCenter:
- ret = item->y() + vcenter(item);
- break;
- case QDeclarativeAnchorLine::Baseline:
- if (d->isDeclarativeItem)
- ret = item->y() + static_cast<QDeclarativeItem*>(item)->baselineOffset();
- break;
- default:
- break;
- }
-
- return ret;
-}
-
-//position when origin is 0,0
-static qreal adjustedPosition(QGraphicsObject *item, QDeclarativeAnchorLine::AnchorLine anchorLine)
-{
- qreal ret = 0.0;
- QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(item);
- switch(anchorLine) {
- case QDeclarativeAnchorLine::Left:
- ret = 0.0;
- break;
- case QDeclarativeAnchorLine::Right:
- ret = d->width();
- break;
- case QDeclarativeAnchorLine::Top:
- ret = 0.0;
- break;
- case QDeclarativeAnchorLine::Bottom:
- ret = d->height();
- break;
- case QDeclarativeAnchorLine::HCenter:
- ret = hcenter(item);
- break;
- case QDeclarativeAnchorLine::VCenter:
- ret = vcenter(item);
- break;
- case QDeclarativeAnchorLine::Baseline:
- if (d->isDeclarativeItem)
- ret = static_cast<QDeclarativeItem*>(item)->baselineOffset();
- break;
- default:
- break;
- }
-
- return ret;
-}
-
-QDeclarativeAnchors::QDeclarativeAnchors(QObject *parent)
- : QObject(*new QDeclarativeAnchorsPrivate(0), parent)
-{
- qFatal("QDeclarativeAnchors::QDeclarativeAnchors(QObject*) called");
-}
-
-QDeclarativeAnchors::QDeclarativeAnchors(QGraphicsObject *item, QObject *parent)
- : QObject(*new QDeclarativeAnchorsPrivate(item), parent)
-{
-}
-
-QDeclarativeAnchors::~QDeclarativeAnchors()
-{
- Q_D(QDeclarativeAnchors);
- d->remDepend(d->fill);
- d->remDepend(d->centerIn);
- d->remDepend(d->left.item);
- d->remDepend(d->right.item);
- d->remDepend(d->top.item);
- d->remDepend(d->bottom.item);
- d->remDepend(d->vCenter.item);
- d->remDepend(d->hCenter.item);
- d->remDepend(d->baseline.item);
-}
-
-void QDeclarativeAnchorsPrivate::fillChanged()
-{
- Q_Q(QDeclarativeAnchors);
- if (!fill || !isItemComplete())
- return;
-
- if (updatingFill < 2) {
- ++updatingFill;
-
- qreal horizontalMargin = q->mirrored() ? rightMargin : leftMargin;
-
- if (fill == item->parentItem()) { //child-parent
- setItemPos(QPointF(horizontalMargin, topMargin));
- } else if (fill->parentItem() == item->parentItem()) { //siblings
- setItemPos(QPointF(fill->x()+horizontalMargin, fill->y()+topMargin));
- }
- QGraphicsItemPrivate *fillPrivate = QGraphicsItemPrivate::get(fill);
- setItemSize(QSizeF(fillPrivate->width()-leftMargin-rightMargin, fillPrivate->height()-topMargin-bottomMargin));
-
- --updatingFill;
- } else {
- // ### Make this certain :)
- qmlInfo(item) << QDeclarativeAnchors::tr("Possible anchor loop detected on fill.");
- }
-
-}
-
-void QDeclarativeAnchorsPrivate::centerInChanged()
-{
- Q_Q(QDeclarativeAnchors);
- if (!centerIn || fill || !isItemComplete())
- return;
-
- if (updatingCenterIn < 2) {
- ++updatingCenterIn;
-
- qreal effectiveHCenterOffset = q->mirrored() ? -hCenterOffset : hCenterOffset;
- if (centerIn == item->parentItem()) {
- QPointF p(hcenter(item->parentItem()) - hcenter(item) + effectiveHCenterOffset,
- vcenter(item->parentItem()) - vcenter(item) + vCenterOffset);
- setItemPos(p);
-
- } else if (centerIn->parentItem() == item->parentItem()) {
- QPointF p(centerIn->x() + hcenter(centerIn) - hcenter(item) + effectiveHCenterOffset,
- centerIn->y() + vcenter(centerIn) - vcenter(item) + vCenterOffset);
- setItemPos(p);
- }
-
- --updatingCenterIn;
- } else {
- // ### Make this certain :)
- qmlInfo(item) << QDeclarativeAnchors::tr("Possible anchor loop detected on centerIn.");
- }
-}
-
-void QDeclarativeAnchorsPrivate::clearItem(QGraphicsObject *item)
-{
- if (!item)
- return;
- if (fill == item)
- fill = 0;
- if (centerIn == item)
- centerIn = 0;
- if (left.item == item) {
- left.item = 0;
- usedAnchors &= ~QDeclarativeAnchors::LeftAnchor;
- }
- if (right.item == item) {
- right.item = 0;
- usedAnchors &= ~QDeclarativeAnchors::RightAnchor;
- }
- if (top.item == item) {
- top.item = 0;
- usedAnchors &= ~QDeclarativeAnchors::TopAnchor;
- }
- if (bottom.item == item) {
- bottom.item = 0;
- usedAnchors &= ~QDeclarativeAnchors::BottomAnchor;
- }
- if (vCenter.item == item) {
- vCenter.item = 0;
- usedAnchors &= ~QDeclarativeAnchors::VCenterAnchor;
- }
- if (hCenter.item == item) {
- hCenter.item = 0;
- usedAnchors &= ~QDeclarativeAnchors::HCenterAnchor;
- }
- if (baseline.item == item) {
- baseline.item = 0;
- usedAnchors &= ~QDeclarativeAnchors::BaselineAnchor;
- }
-}
-
-void QDeclarativeAnchorsPrivate::addDepend(QGraphicsObject *item)
-{
- if (!item)
- return;
- QGraphicsItemPrivate * itemPrivate = QGraphicsItemPrivate::get(item);
- if (itemPrivate->isDeclarativeItem) {
- QDeclarativeItemPrivate *p =
- static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(item));
- p->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
- } else if(itemPrivate->isWidget) {
- Q_Q(QDeclarativeAnchors);
- QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
- QObject::connect(widget, SIGNAL(destroyed(QObject*)), q, SLOT(_q_widgetDestroyed(QObject*)));
- QObject::connect(widget, SIGNAL(geometryChanged()), q, SLOT(_q_widgetGeometryChanged()));
- }
-}
-
-void QDeclarativeAnchorsPrivate::remDepend(QGraphicsObject *item)
-{
- if (!item)
- return;
- QGraphicsItemPrivate * itemPrivate = QGraphicsItemPrivate::get(item);
- if (itemPrivate->isDeclarativeItem) {
- QDeclarativeItemPrivate *p =
- static_cast<QDeclarativeItemPrivate *>(itemPrivate);
- p->removeItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
- } else if(itemPrivate->isWidget) {
- Q_Q(QDeclarativeAnchors);
- QGraphicsWidget *widget = static_cast<QGraphicsWidget *>(item);
- QObject::disconnect(widget, SIGNAL(destroyed(QObject*)), q, SLOT(_q_widgetDestroyed(QObject*)));
- QObject::disconnect(widget, SIGNAL(geometryChanged()), q, SLOT(_q_widgetGeometryChanged()));
- }
-}
-
-bool QDeclarativeAnchorsPrivate::isItemComplete() const
-{
- return componentComplete;
-}
-
-void QDeclarativeAnchors::classBegin()
-{
- Q_D(QDeclarativeAnchors);
- d->componentComplete = false;
-}
-
-void QDeclarativeAnchors::componentComplete()
-{
- Q_D(QDeclarativeAnchors);
- d->componentComplete = true;
-}
-
-bool QDeclarativeAnchors::mirrored()
-{
- Q_D(QDeclarativeAnchors);
- QGraphicsItemPrivate * itemPrivate = QGraphicsItemPrivate::get(d->item);
- return itemPrivate->isDeclarativeItem ? static_cast<QDeclarativeItemPrivate *>(itemPrivate)->effectiveLayoutMirror : false;
-}
-
-void QDeclarativeAnchorsPrivate::setItemHeight(qreal v)
-{
- updatingMe = true;
- QGraphicsItemPrivate::get(item)->setHeight(v);
- updatingMe = false;
-}
-
-void QDeclarativeAnchorsPrivate::setItemWidth(qreal v)
-{
- updatingMe = true;
- QGraphicsItemPrivate::get(item)->setWidth(v);
- updatingMe = false;
-}
-
-void QDeclarativeAnchorsPrivate::setItemX(qreal v)
-{
- updatingMe = true;
- item->setX(v);
- updatingMe = false;
-}
-
-void QDeclarativeAnchorsPrivate::setItemY(qreal v)
-{
- updatingMe = true;
- item->setY(v);
- updatingMe = false;
-}
-
-void QDeclarativeAnchorsPrivate::setItemPos(const QPointF &v)
-{
- updatingMe = true;
- item->setPos(v);
- updatingMe = false;
-}
-
-void QDeclarativeAnchorsPrivate::setItemSize(const QSizeF &v)
-{
- updatingMe = true;
- if(QGraphicsItemPrivate::get(item)->isWidget)
- static_cast<QGraphicsWidget *>(item)->resize(v);
- else if (QGraphicsItemPrivate::get(item)->isDeclarativeItem)
- static_cast<QDeclarativeItem *>(item)->setSize(v);
- updatingMe = false;
-}
-
-void QDeclarativeAnchorsPrivate::updateMe()
-{
- if (updatingMe) {
- updatingMe = false;
- return;
- }
-
- fillChanged();
- centerInChanged();
- updateHorizontalAnchors();
- updateVerticalAnchors();
-}
-
-void QDeclarativeAnchorsPrivate::updateOnComplete()
-{
- fillChanged();
- centerInChanged();
- updateHorizontalAnchors();
- updateVerticalAnchors();
-}
-
-void QDeclarativeAnchorsPrivate::_q_widgetDestroyed(QObject *obj)
-{
- clearItem(qobject_cast<QGraphicsObject*>(obj));
-}
-
-void QDeclarativeAnchorsPrivate::_q_widgetGeometryChanged()
-{
- fillChanged();
- centerInChanged();
- updateHorizontalAnchors();
- updateVerticalAnchors();
-}
-
-void QDeclarativeAnchorsPrivate::itemGeometryChanged(QDeclarativeItem *, const QRectF &newG, const QRectF &oldG)
-{
- fillChanged();
- centerInChanged();
- if (newG.x() != oldG.x() || newG.width() != oldG.width())
- updateHorizontalAnchors();
- if (newG.y() != oldG.y() || newG.height() != oldG.height())
- updateVerticalAnchors();
-}
-
-QGraphicsObject *QDeclarativeAnchors::fill() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->fill;
-}
-
-void QDeclarativeAnchors::setFill(QGraphicsObject *f)
-{
- Q_D(QDeclarativeAnchors);
- if (d->fill == f)
- return;
-
- if (!f) {
- d->remDepend(d->fill);
- d->fill = f;
- emit fillChanged();
- return;
- }
- if (f != d->item->parentItem() && f->parentItem() != d->item->parentItem()){
- qmlInfo(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
- return;
- }
- d->remDepend(d->fill);
- d->fill = f;
- d->addDepend(d->fill);
- emit fillChanged();
- d->fillChanged();
-}
-
-void QDeclarativeAnchors::resetFill()
-{
- setFill(0);
-}
-
-QGraphicsObject *QDeclarativeAnchors::centerIn() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->centerIn;
-}
-
-void QDeclarativeAnchors::setCenterIn(QGraphicsObject* c)
-{
- Q_D(QDeclarativeAnchors);
- if (d->centerIn == c)
- return;
-
- if (!c) {
- d->remDepend(d->centerIn);
- d->centerIn = c;
- emit centerInChanged();
- return;
- }
- if (c != d->item->parentItem() && c->parentItem() != d->item->parentItem()){
- qmlInfo(d->item) << tr("Cannot anchor to an item that isn't a parent or sibling.");
- return;
- }
-
- d->remDepend(d->centerIn);
- d->centerIn = c;
- d->addDepend(d->centerIn);
- emit centerInChanged();
- d->centerInChanged();
-}
-
-void QDeclarativeAnchors::resetCenterIn()
-{
- setCenterIn(0);
-}
-
-bool QDeclarativeAnchorsPrivate::calcStretch(const QDeclarativeAnchorLine &edge1,
- const QDeclarativeAnchorLine &edge2,
- qreal offset1,
- qreal offset2,
- QDeclarativeAnchorLine::AnchorLine line,
- qreal &stretch)
-{
- bool edge1IsParent = (edge1.item == item->parentItem());
- bool edge2IsParent = (edge2.item == item->parentItem());
- bool edge1IsSibling = (edge1.item->parentItem() == item->parentItem());
- bool edge2IsSibling = (edge2.item->parentItem() == item->parentItem());
-
- bool invalid = false;
- if ((edge2IsParent && edge1IsParent) || (edge2IsSibling && edge1IsSibling)) {
- stretch = (position(edge2.item, edge2.anchorLine) + offset2)
- - (position(edge1.item, edge1.anchorLine) + offset1);
- } else if (edge2IsParent && edge1IsSibling) {
- stretch = (position(edge2.item, edge2.anchorLine) + offset2)
- - (position(item->parentObject(), line)
- + position(edge1.item, edge1.anchorLine) + offset1);
- } else if (edge2IsSibling && edge1IsParent) {
- stretch = (position(item->parentObject(), line) + position(edge2.item, edge2.anchorLine) + offset2)
- - (position(edge1.item, edge1.anchorLine) + offset1);
- } else
- invalid = true;
-
- return invalid;
-}
-
-void QDeclarativeAnchorsPrivate::updateVerticalAnchors()
-{
- if (fill || centerIn || !isItemComplete())
- return;
-
- if (updatingVerticalAnchor < 2) {
- ++updatingVerticalAnchor;
- QGraphicsItemPrivate *itemPrivate = QGraphicsItemPrivate::get(item);
- if (usedAnchors & QDeclarativeAnchors::TopAnchor) {
- //Handle stretching
- bool invalid = true;
- qreal height = 0.0;
- if (usedAnchors & QDeclarativeAnchors::BottomAnchor) {
- invalid = calcStretch(top, bottom, topMargin, -bottomMargin, QDeclarativeAnchorLine::Top, height);
- } else if (usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
- invalid = calcStretch(top, vCenter, topMargin, vCenterOffset, QDeclarativeAnchorLine::Top, height);
- height *= 2;
- }
- if (!invalid)
- setItemHeight(height);
-
- //Handle top
- if (top.item == item->parentItem()) {
- setItemY(adjustedPosition(top.item, top.anchorLine) + topMargin);
- } else if (top.item->parentItem() == item->parentItem()) {
- setItemY(position(top.item, top.anchorLine) + topMargin);
- }
- } else if (usedAnchors & QDeclarativeAnchors::BottomAnchor) {
- //Handle stretching (top + bottom case is handled above)
- if (usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
- qreal height = 0.0;
- bool invalid = calcStretch(vCenter, bottom, vCenterOffset, -bottomMargin,
- QDeclarativeAnchorLine::Top, height);
- if (!invalid)
- setItemHeight(height*2);
- }
-
- //Handle bottom
- if (bottom.item == item->parentItem()) {
- setItemY(adjustedPosition(bottom.item, bottom.anchorLine) - itemPrivate->height() - bottomMargin);
- } else if (bottom.item->parentItem() == item->parentItem()) {
- setItemY(position(bottom.item, bottom.anchorLine) - itemPrivate->height() - bottomMargin);
- }
- } else if (usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
- //(stetching handled above)
-
- //Handle vCenter
- if (vCenter.item == item->parentItem()) {
- setItemY(adjustedPosition(vCenter.item, vCenter.anchorLine)
- - vcenter(item) + vCenterOffset);
- } else if (vCenter.item->parentItem() == item->parentItem()) {
- setItemY(position(vCenter.item, vCenter.anchorLine) - vcenter(item) + vCenterOffset);
- }
- } else if (usedAnchors & QDeclarativeAnchors::BaselineAnchor) {
- //Handle baseline
- if (baseline.item == item->parentItem()) {
- if (itemPrivate->isDeclarativeItem)
- setItemY(adjustedPosition(baseline.item, baseline.anchorLine)
- - static_cast<QDeclarativeItem *>(item)->baselineOffset() + baselineOffset);
- } else if (baseline.item->parentItem() == item->parentItem()) {
- if (itemPrivate->isDeclarativeItem)
- setItemY(position(baseline.item, baseline.anchorLine)
- - static_cast<QDeclarativeItem *>(item)->baselineOffset() + baselineOffset);
- }
- }
- --updatingVerticalAnchor;
- } else {
- // ### Make this certain :)
- qmlInfo(item) << QDeclarativeAnchors::tr("Possible anchor loop detected on vertical anchor.");
- }
-}
-
-inline QDeclarativeAnchorLine::AnchorLine reverseAnchorLine(QDeclarativeAnchorLine::AnchorLine anchorLine) {
- if (anchorLine == QDeclarativeAnchorLine::Left) {
- return QDeclarativeAnchorLine::Right;
- } else if (anchorLine == QDeclarativeAnchorLine::Right) {
- return QDeclarativeAnchorLine::Left;
- } else {
- return anchorLine;
- }
-}
-
-void QDeclarativeAnchorsPrivate::updateHorizontalAnchors()
-{
- Q_Q(QDeclarativeAnchors);
- if (fill || centerIn || !isItemComplete())
- return;
-
- if (updatingHorizontalAnchor < 3) {
- ++updatingHorizontalAnchor;
- qreal effectiveRightMargin, effectiveLeftMargin, effectiveHorizontalCenterOffset;
- QDeclarativeAnchorLine effectiveLeft, effectiveRight, effectiveHorizontalCenter;
- QDeclarativeAnchors::Anchor effectiveLeftAnchor, effectiveRightAnchor;
- if (q->mirrored()) {
- effectiveLeftAnchor = QDeclarativeAnchors::RightAnchor;
- effectiveRightAnchor = QDeclarativeAnchors::LeftAnchor;
- effectiveLeft.item = right.item;
- effectiveLeft.anchorLine = reverseAnchorLine(right.anchorLine);
- effectiveRight.item = left.item;
- effectiveRight.anchorLine = reverseAnchorLine(left.anchorLine);
- effectiveHorizontalCenter.item = hCenter.item;
- effectiveHorizontalCenter.anchorLine = reverseAnchorLine(hCenter.anchorLine);
- effectiveLeftMargin = rightMargin;
- effectiveRightMargin = leftMargin;
- effectiveHorizontalCenterOffset = -hCenterOffset;
- } else {
- effectiveLeftAnchor = QDeclarativeAnchors::LeftAnchor;
- effectiveRightAnchor = QDeclarativeAnchors::RightAnchor;
- effectiveLeft = left;
- effectiveRight = right;
- effectiveHorizontalCenter = hCenter;
- effectiveLeftMargin = leftMargin;
- effectiveRightMargin = rightMargin;
- effectiveHorizontalCenterOffset = hCenterOffset;
- }
-
- QGraphicsItemPrivate *itemPrivate = QGraphicsItemPrivate::get(item);
- if (usedAnchors & effectiveLeftAnchor) {
- //Handle stretching
- bool invalid = true;
- qreal width = 0.0;
- if (usedAnchors & effectiveRightAnchor) {
- invalid = calcStretch(effectiveLeft, effectiveRight, effectiveLeftMargin, -effectiveRightMargin, QDeclarativeAnchorLine::Left, width);
- } else if (usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
- invalid = calcStretch(effectiveLeft, effectiveHorizontalCenter, effectiveLeftMargin, effectiveHorizontalCenterOffset, QDeclarativeAnchorLine::Left, width);
- width *= 2;
- }
- if (!invalid)
- setItemWidth(width);
-
- //Handle left
- if (effectiveLeft.item == item->parentItem()) {
- setItemX(adjustedPosition(effectiveLeft.item, effectiveLeft.anchorLine) + effectiveLeftMargin);
- } else if (effectiveLeft.item->parentItem() == item->parentItem()) {
- setItemX(position(effectiveLeft.item, effectiveLeft.anchorLine) + effectiveLeftMargin);
- }
- } else if (usedAnchors & effectiveRightAnchor) {
- //Handle stretching (left + right case is handled in updateLeftAnchor)
- if (usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
- qreal width = 0.0;
- bool invalid = calcStretch(effectiveHorizontalCenter, effectiveRight, effectiveHorizontalCenterOffset, -effectiveRightMargin,
- QDeclarativeAnchorLine::Left, width);
- if (!invalid)
- setItemWidth(width*2);
- }
-
- //Handle right
- if (effectiveRight.item == item->parentItem()) {
- setItemX(adjustedPosition(effectiveRight.item, effectiveRight.anchorLine) - itemPrivate->width() - effectiveRightMargin);
- } else if (effectiveRight.item->parentItem() == item->parentItem()) {
- setItemX(position(effectiveRight.item, effectiveRight.anchorLine) - itemPrivate->width() - effectiveRightMargin);
- }
- } else if (usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
- //Handle hCenter
- if (effectiveHorizontalCenter.item == item->parentItem()) {
- setItemX(adjustedPosition(effectiveHorizontalCenter.item, effectiveHorizontalCenter.anchorLine) - hcenter(item) + effectiveHorizontalCenterOffset);
- } else if (effectiveHorizontalCenter.item->parentItem() == item->parentItem()) {
- setItemX(position(effectiveHorizontalCenter.item, effectiveHorizontalCenter.anchorLine) - hcenter(item) + effectiveHorizontalCenterOffset);
- }
- }
- --updatingHorizontalAnchor;
- } else {
- // ### Make this certain :)
- qmlInfo(item) << QDeclarativeAnchors::tr("Possible anchor loop detected on horizontal anchor.");
- }
-}
-
-QDeclarativeAnchorLine QDeclarativeAnchors::top() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->top;
-}
-
-void QDeclarativeAnchors::setTop(const QDeclarativeAnchorLine &edge)
-{
- Q_D(QDeclarativeAnchors);
- if (!d->checkVAnchorValid(edge) || d->top == edge)
- return;
-
- d->usedAnchors |= TopAnchor;
-
- if (!d->checkVValid()) {
- d->usedAnchors &= ~TopAnchor;
- return;
- }
-
- d->remDepend(d->top.item);
- d->top = edge;
- d->addDepend(d->top.item);
- emit topChanged();
- d->updateVerticalAnchors();
-}
-
-void QDeclarativeAnchors::resetTop()
-{
- Q_D(QDeclarativeAnchors);
- d->usedAnchors &= ~TopAnchor;
- d->remDepend(d->top.item);
- d->top = QDeclarativeAnchorLine();
- emit topChanged();
- d->updateVerticalAnchors();
-}
-
-QDeclarativeAnchorLine QDeclarativeAnchors::bottom() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->bottom;
-}
-
-void QDeclarativeAnchors::setBottom(const QDeclarativeAnchorLine &edge)
-{
- Q_D(QDeclarativeAnchors);
- if (!d->checkVAnchorValid(edge) || d->bottom == edge)
- return;
-
- d->usedAnchors |= BottomAnchor;
-
- if (!d->checkVValid()) {
- d->usedAnchors &= ~BottomAnchor;
- return;
- }
-
- d->remDepend(d->bottom.item);
- d->bottom = edge;
- d->addDepend(d->bottom.item);
- emit bottomChanged();
- d->updateVerticalAnchors();
-}
-
-void QDeclarativeAnchors::resetBottom()
-{
- Q_D(QDeclarativeAnchors);
- d->usedAnchors &= ~BottomAnchor;
- d->remDepend(d->bottom.item);
- d->bottom = QDeclarativeAnchorLine();
- emit bottomChanged();
- d->updateVerticalAnchors();
-}
-
-QDeclarativeAnchorLine QDeclarativeAnchors::verticalCenter() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->vCenter;
-}
-
-void QDeclarativeAnchors::setVerticalCenter(const QDeclarativeAnchorLine &edge)
-{
- Q_D(QDeclarativeAnchors);
- if (!d->checkVAnchorValid(edge) || d->vCenter == edge)
- return;
-
- d->usedAnchors |= VCenterAnchor;
-
- if (!d->checkVValid()) {
- d->usedAnchors &= ~VCenterAnchor;
- return;
- }
-
- d->remDepend(d->vCenter.item);
- d->vCenter = edge;
- d->addDepend(d->vCenter.item);
- emit verticalCenterChanged();
- d->updateVerticalAnchors();
-}
-
-void QDeclarativeAnchors::resetVerticalCenter()
-{
- Q_D(QDeclarativeAnchors);
- d->usedAnchors &= ~VCenterAnchor;
- d->remDepend(d->vCenter.item);
- d->vCenter = QDeclarativeAnchorLine();
- emit verticalCenterChanged();
- d->updateVerticalAnchors();
-}
-
-QDeclarativeAnchorLine QDeclarativeAnchors::baseline() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->baseline;
-}
-
-void QDeclarativeAnchors::setBaseline(const QDeclarativeAnchorLine &edge)
-{
- Q_D(QDeclarativeAnchors);
- if (!d->checkVAnchorValid(edge) || d->baseline == edge)
- return;
-
- d->usedAnchors |= BaselineAnchor;
-
- if (!d->checkVValid()) {
- d->usedAnchors &= ~BaselineAnchor;
- return;
- }
-
- d->remDepend(d->baseline.item);
- d->baseline = edge;
- d->addDepend(d->baseline.item);
- emit baselineChanged();
- d->updateVerticalAnchors();
-}
-
-void QDeclarativeAnchors::resetBaseline()
-{
- Q_D(QDeclarativeAnchors);
- d->usedAnchors &= ~BaselineAnchor;
- d->remDepend(d->baseline.item);
- d->baseline = QDeclarativeAnchorLine();
- emit baselineChanged();
- d->updateVerticalAnchors();
-}
-
-QDeclarativeAnchorLine QDeclarativeAnchors::left() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->left;
-}
-
-void QDeclarativeAnchors::setLeft(const QDeclarativeAnchorLine &edge)
-{
- Q_D(QDeclarativeAnchors);
- if (!d->checkHAnchorValid(edge) || d->left == edge)
- return;
-
- d->usedAnchors |= LeftAnchor;
-
- if (!d->checkHValid()) {
- d->usedAnchors &= ~LeftAnchor;
- return;
- }
-
- d->remDepend(d->left.item);
- d->left = edge;
- d->addDepend(d->left.item);
- emit leftChanged();
- d->updateHorizontalAnchors();
-}
-
-void QDeclarativeAnchors::resetLeft()
-{
- Q_D(QDeclarativeAnchors);
- d->usedAnchors &= ~LeftAnchor;
- d->remDepend(d->left.item);
- d->left = QDeclarativeAnchorLine();
- emit leftChanged();
- d->updateHorizontalAnchors();
-}
-
-QDeclarativeAnchorLine QDeclarativeAnchors::right() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->right;
-}
-
-void QDeclarativeAnchors::setRight(const QDeclarativeAnchorLine &edge)
-{
- Q_D(QDeclarativeAnchors);
- if (!d->checkHAnchorValid(edge) || d->right == edge)
- return;
-
- d->usedAnchors |= RightAnchor;
-
- if (!d->checkHValid()) {
- d->usedAnchors &= ~RightAnchor;
- return;
- }
-
- d->remDepend(d->right.item);
- d->right = edge;
- d->addDepend(d->right.item);
- emit rightChanged();
- d->updateHorizontalAnchors();
-}
-
-void QDeclarativeAnchors::resetRight()
-{
- Q_D(QDeclarativeAnchors);
- d->usedAnchors &= ~RightAnchor;
- d->remDepend(d->right.item);
- d->right = QDeclarativeAnchorLine();
- emit rightChanged();
- d->updateHorizontalAnchors();
-}
-
-QDeclarativeAnchorLine QDeclarativeAnchors::horizontalCenter() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->hCenter;
-}
-
-void QDeclarativeAnchors::setHorizontalCenter(const QDeclarativeAnchorLine &edge)
-{
- Q_D(QDeclarativeAnchors);
- if (!d->checkHAnchorValid(edge) || d->hCenter == edge)
- return;
-
- d->usedAnchors |= HCenterAnchor;
-
- if (!d->checkHValid()) {
- d->usedAnchors &= ~HCenterAnchor;
- return;
- }
-
- d->remDepend(d->hCenter.item);
- d->hCenter = edge;
- d->addDepend(d->hCenter.item);
- emit horizontalCenterChanged();
- d->updateHorizontalAnchors();
-}
-
-void QDeclarativeAnchors::resetHorizontalCenter()
-{
- Q_D(QDeclarativeAnchors);
- d->usedAnchors &= ~HCenterAnchor;
- d->remDepend(d->hCenter.item);
- d->hCenter = QDeclarativeAnchorLine();
- emit horizontalCenterChanged();
- d->updateHorizontalAnchors();
-}
-
-qreal QDeclarativeAnchors::leftMargin() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->leftMargin;
-}
-
-void QDeclarativeAnchors::setLeftMargin(qreal offset)
-{
- Q_D(QDeclarativeAnchors);
- if (d->leftMargin == offset)
- return;
- d->leftMargin = offset;
- if(d->fill)
- d->fillChanged();
- else
- d->updateHorizontalAnchors();
- emit leftMarginChanged();
-}
-
-qreal QDeclarativeAnchors::rightMargin() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->rightMargin;
-}
-
-void QDeclarativeAnchors::setRightMargin(qreal offset)
-{
- Q_D(QDeclarativeAnchors);
- if (d->rightMargin == offset)
- return;
- d->rightMargin = offset;
- if(d->fill)
- d->fillChanged();
- else
- d->updateHorizontalAnchors();
- emit rightMarginChanged();
-}
-
-qreal QDeclarativeAnchors::margins() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->margins;
-}
-
-void QDeclarativeAnchors::setMargins(qreal offset)
-{
- Q_D(QDeclarativeAnchors);
- if (d->margins == offset)
- return;
- //###Is it significantly faster to set them directly so we can call fillChanged only once?
- if(!d->rightMargin || d->rightMargin == d->margins)
- setRightMargin(offset);
- if(!d->leftMargin || d->leftMargin == d->margins)
- setLeftMargin(offset);
- if(!d->topMargin || d->topMargin == d->margins)
- setTopMargin(offset);
- if(!d->bottomMargin || d->bottomMargin == d->margins)
- setBottomMargin(offset);
- d->margins = offset;
- emit marginsChanged();
-
-}
-
-qreal QDeclarativeAnchors::horizontalCenterOffset() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->hCenterOffset;
-}
-
-void QDeclarativeAnchors::setHorizontalCenterOffset(qreal offset)
-{
- Q_D(QDeclarativeAnchors);
- if (d->hCenterOffset == offset)
- return;
- d->hCenterOffset = offset;
- if(d->centerIn)
- d->centerInChanged();
- else
- d->updateHorizontalAnchors();
- emit horizontalCenterOffsetChanged();
-}
-
-qreal QDeclarativeAnchors::topMargin() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->topMargin;
-}
-
-void QDeclarativeAnchors::setTopMargin(qreal offset)
-{
- Q_D(QDeclarativeAnchors);
- if (d->topMargin == offset)
- return;
- d->topMargin = offset;
- if(d->fill)
- d->fillChanged();
- else
- d->updateVerticalAnchors();
- emit topMarginChanged();
-}
-
-qreal QDeclarativeAnchors::bottomMargin() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->bottomMargin;
-}
-
-void QDeclarativeAnchors::setBottomMargin(qreal offset)
-{
- Q_D(QDeclarativeAnchors);
- if (d->bottomMargin == offset)
- return;
- d->bottomMargin = offset;
- if(d->fill)
- d->fillChanged();
- else
- d->updateVerticalAnchors();
- emit bottomMarginChanged();
-}
-
-qreal QDeclarativeAnchors::verticalCenterOffset() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->vCenterOffset;
-}
-
-void QDeclarativeAnchors::setVerticalCenterOffset(qreal offset)
-{
- Q_D(QDeclarativeAnchors);
- if (d->vCenterOffset == offset)
- return;
- d->vCenterOffset = offset;
- if(d->centerIn)
- d->centerInChanged();
- else
- d->updateVerticalAnchors();
- emit verticalCenterOffsetChanged();
-}
-
-qreal QDeclarativeAnchors::baselineOffset() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->baselineOffset;
-}
-
-void QDeclarativeAnchors::setBaselineOffset(qreal offset)
-{
- Q_D(QDeclarativeAnchors);
- if (d->baselineOffset == offset)
- return;
- d->baselineOffset = offset;
- d->updateVerticalAnchors();
- emit baselineOffsetChanged();
-}
-
-QDeclarativeAnchors::Anchors QDeclarativeAnchors::usedAnchors() const
-{
- Q_D(const QDeclarativeAnchors);
- return d->usedAnchors;
-}
-
-bool QDeclarativeAnchorsPrivate::checkHValid() const
-{
- if (usedAnchors & QDeclarativeAnchors::LeftAnchor &&
- usedAnchors & QDeclarativeAnchors::RightAnchor &&
- usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot specify left, right, and hcenter anchors.");
- return false;
- }
-
- return true;
-}
-
-bool QDeclarativeAnchorsPrivate::checkHAnchorValid(QDeclarativeAnchorLine anchor) const
-{
- if (!anchor.item) {
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor to a null item.");
- return false;
- } else if (anchor.anchorLine & QDeclarativeAnchorLine::Vertical_Mask) {
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor a horizontal edge to a vertical edge.");
- return false;
- } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
- return false;
- } else if (anchor.item == item) {
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor item to self.");
- return false;
- }
-
- return true;
-}
-
-bool QDeclarativeAnchorsPrivate::checkVValid() const
-{
- if (usedAnchors & QDeclarativeAnchors::TopAnchor &&
- usedAnchors & QDeclarativeAnchors::BottomAnchor &&
- usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot specify top, bottom, and vcenter anchors.");
- return false;
- } else if (usedAnchors & QDeclarativeAnchors::BaselineAnchor &&
- (usedAnchors & QDeclarativeAnchors::TopAnchor ||
- usedAnchors & QDeclarativeAnchors::BottomAnchor ||
- usedAnchors & QDeclarativeAnchors::VCenterAnchor)) {
- qmlInfo(item) << QDeclarativeAnchors::tr("Baseline anchor cannot be used in conjunction with top, bottom, or vcenter anchors.");
- return false;
- }
-
- return true;
-}
-
-bool QDeclarativeAnchorsPrivate::checkVAnchorValid(QDeclarativeAnchorLine anchor) const
-{
- if (!anchor.item) {
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor to a null item.");
- return false;
- } else if (anchor.anchorLine & QDeclarativeAnchorLine::Horizontal_Mask) {
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor a vertical edge to a horizontal edge.");
- return false;
- } else if (anchor.item != item->parentItem() && anchor.item->parentItem() != item->parentItem()){
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor to an item that isn't a parent or sibling.");
- return false;
- } else if (anchor.item == item){
- qmlInfo(item) << QDeclarativeAnchors::tr("Cannot anchor item to self.");
- return false;
- }
-
- return true;
-}
-
-QT_END_NAMESPACE
-
-#include <moc_qdeclarativeanchors_p.cpp>
-
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p.h
deleted file mode 100644
index d222ef5491..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeanchors_p.h
+++ /dev/null
@@ -1,206 +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 QDECLARATIVEANCHORS_H
-#define QDECLARATIVEANCHORS_H
-
-#include "qdeclarativeitem.h"
-
-#include <qdeclarative.h>
-
-#include <QtCore/QObject>
-
-#include <private/qdeclarativeglobal_p.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QDeclarativeAnchorsPrivate;
-class QDeclarativeAnchorLine;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAnchors : public QObject
-{
- Q_OBJECT
-
- Q_PROPERTY(QDeclarativeAnchorLine left READ left WRITE setLeft RESET resetLeft NOTIFY leftChanged)
- Q_PROPERTY(QDeclarativeAnchorLine right READ right WRITE setRight RESET resetRight NOTIFY rightChanged)
- Q_PROPERTY(QDeclarativeAnchorLine horizontalCenter READ horizontalCenter WRITE setHorizontalCenter RESET resetHorizontalCenter NOTIFY horizontalCenterChanged)
- Q_PROPERTY(QDeclarativeAnchorLine top READ top WRITE setTop RESET resetTop NOTIFY topChanged)
- Q_PROPERTY(QDeclarativeAnchorLine bottom READ bottom WRITE setBottom RESET resetBottom NOTIFY bottomChanged)
- Q_PROPERTY(QDeclarativeAnchorLine verticalCenter READ verticalCenter WRITE setVerticalCenter RESET resetVerticalCenter NOTIFY verticalCenterChanged)
- Q_PROPERTY(QDeclarativeAnchorLine baseline READ baseline WRITE setBaseline RESET resetBaseline NOTIFY baselineChanged)
- Q_PROPERTY(qreal margins READ margins WRITE setMargins NOTIFY marginsChanged)
- Q_PROPERTY(qreal leftMargin READ leftMargin WRITE setLeftMargin NOTIFY leftMarginChanged)
- Q_PROPERTY(qreal rightMargin READ rightMargin WRITE setRightMargin NOTIFY rightMarginChanged)
- Q_PROPERTY(qreal horizontalCenterOffset READ horizontalCenterOffset WRITE setHorizontalCenterOffset NOTIFY horizontalCenterOffsetChanged)
- Q_PROPERTY(qreal topMargin READ topMargin WRITE setTopMargin NOTIFY topMarginChanged)
- Q_PROPERTY(qreal bottomMargin READ bottomMargin WRITE setBottomMargin NOTIFY bottomMarginChanged)
- Q_PROPERTY(qreal verticalCenterOffset READ verticalCenterOffset WRITE setVerticalCenterOffset NOTIFY verticalCenterOffsetChanged)
- Q_PROPERTY(qreal baselineOffset READ baselineOffset WRITE setBaselineOffset NOTIFY baselineOffsetChanged)
- Q_PROPERTY(QGraphicsObject *fill READ fill WRITE setFill RESET resetFill NOTIFY fillChanged)
- Q_PROPERTY(QGraphicsObject *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn NOTIFY centerInChanged)
- Q_PROPERTY(bool mirrored READ mirrored NOTIFY mirroredChanged REVISION 1)
-
-public:
- QDeclarativeAnchors(QObject *parent=0);
- QDeclarativeAnchors(QGraphicsObject *item, QObject *parent=0);
- virtual ~QDeclarativeAnchors();
-
- enum Anchor {
- LeftAnchor = 0x01,
- RightAnchor = 0x02,
- TopAnchor = 0x04,
- BottomAnchor = 0x08,
- HCenterAnchor = 0x10,
- VCenterAnchor = 0x20,
- BaselineAnchor = 0x40,
- Horizontal_Mask = LeftAnchor | RightAnchor | HCenterAnchor,
- Vertical_Mask = TopAnchor | BottomAnchor | VCenterAnchor | BaselineAnchor
- };
- Q_DECLARE_FLAGS(Anchors, Anchor)
-
- QDeclarativeAnchorLine left() const;
- void setLeft(const QDeclarativeAnchorLine &edge);
- void resetLeft();
-
- QDeclarativeAnchorLine right() const;
- void setRight(const QDeclarativeAnchorLine &edge);
- void resetRight();
-
- QDeclarativeAnchorLine horizontalCenter() const;
- void setHorizontalCenter(const QDeclarativeAnchorLine &edge);
- void resetHorizontalCenter();
-
- QDeclarativeAnchorLine top() const;
- void setTop(const QDeclarativeAnchorLine &edge);
- void resetTop();
-
- QDeclarativeAnchorLine bottom() const;
- void setBottom(const QDeclarativeAnchorLine &edge);
- void resetBottom();
-
- QDeclarativeAnchorLine verticalCenter() const;
- void setVerticalCenter(const QDeclarativeAnchorLine &edge);
- void resetVerticalCenter();
-
- QDeclarativeAnchorLine baseline() const;
- void setBaseline(const QDeclarativeAnchorLine &edge);
- void resetBaseline();
-
- qreal leftMargin() const;
- void setLeftMargin(qreal);
-
- qreal rightMargin() const;
- void setRightMargin(qreal);
-
- qreal horizontalCenterOffset() const;
- void setHorizontalCenterOffset(qreal);
-
- qreal topMargin() const;
- void setTopMargin(qreal);
-
- qreal bottomMargin() const;
- void setBottomMargin(qreal);
-
- qreal margins() const;
- void setMargins(qreal);
-
- qreal verticalCenterOffset() const;
- void setVerticalCenterOffset(qreal);
-
- qreal baselineOffset() const;
- void setBaselineOffset(qreal);
-
- QGraphicsObject *fill() const;
- void setFill(QGraphicsObject *);
- void resetFill();
-
- QGraphicsObject *centerIn() const;
- void setCenterIn(QGraphicsObject *);
- void resetCenterIn();
-
- Anchors usedAnchors() const;
-
- void classBegin();
- void componentComplete();
-
- bool mirrored();
-
-Q_SIGNALS:
- void leftChanged();
- void rightChanged();
- void topChanged();
- void bottomChanged();
- void verticalCenterChanged();
- void horizontalCenterChanged();
- void baselineChanged();
- void fillChanged();
- void centerInChanged();
- void leftMarginChanged();
- void rightMarginChanged();
- void topMarginChanged();
- void bottomMarginChanged();
- void marginsChanged();
- void verticalCenterOffsetChanged();
- void horizontalCenterOffsetChanged();
- void baselineOffsetChanged();
- Q_REVISION(1) void mirroredChanged();
-
-private:
- friend class QDeclarativeItem;
- friend class QDeclarativeItemPrivate;
- friend class QDeclarativeGraphicsWidget;
- Q_DISABLE_COPY(QDeclarativeAnchors)
- Q_DECLARE_PRIVATE(QDeclarativeAnchors)
- Q_PRIVATE_SLOT(d_func(), void _q_widgetGeometryChanged())
- Q_PRIVATE_SLOT(d_func(), void _q_widgetDestroyed(QObject *obj))
-};
-Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeAnchors::Anchors)
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QDeclarativeAnchors)
-
-QT_END_HEADER
-
-#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h b/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
deleted file mode 100644
index 2ceb5a4a73..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeanchors_p_p.h
+++ /dev/null
@@ -1,170 +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 QDECLARATIVEANCHORS_P_H
-#define QDECLARATIVEANCHORS_P_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 "private/qdeclarativeanchors_p.h"
-#include "private/qdeclarativeitemchangelistener_p.h"
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeAnchorLine
-{
-public:
- QDeclarativeAnchorLine() : item(0), anchorLine(Invalid) {}
-
- enum AnchorLine {
- Invalid = 0x0,
- Left = 0x01,
- Right = 0x02,
- Top = 0x04,
- Bottom = 0x08,
- HCenter = 0x10,
- VCenter = 0x20,
- Baseline = 0x40,
- Horizontal_Mask = Left | Right | HCenter,
- Vertical_Mask = Top | Bottom | VCenter | Baseline
- };
-
- QGraphicsObject *item;
- AnchorLine anchorLine;
-};
-
-inline bool operator==(const QDeclarativeAnchorLine& a, const QDeclarativeAnchorLine& b)
-{
- return a.item == b.item && a.anchorLine == b.anchorLine;
-}
-
-class QDeclarativeAnchorsPrivate : public QObjectPrivate, public QDeclarativeItemChangeListener
-{
- Q_DECLARE_PUBLIC(QDeclarativeAnchors)
-public:
- QDeclarativeAnchorsPrivate(QGraphicsObject *i)
- : componentComplete(true), updatingMe(false), updatingHorizontalAnchor(0),
- updatingVerticalAnchor(0), updatingFill(0), updatingCenterIn(0), item(i), usedAnchors(0), fill(0),
- centerIn(0), leftMargin(0), rightMargin(0), topMargin(0), bottomMargin(0),
- margins(0), vCenterOffset(0), hCenterOffset(0), baselineOffset(0)
- {
- }
-
- void clearItem(QGraphicsObject *);
-
- void addDepend(QGraphicsObject *);
- void remDepend(QGraphicsObject *);
- bool isItemComplete() const;
-
- bool componentComplete:1;
- bool updatingMe:1;
- uint updatingHorizontalAnchor:2;
- uint updatingVerticalAnchor:2;
- uint updatingFill:2;
- uint updatingCenterIn:2;
-
- void setItemHeight(qreal);
- void setItemWidth(qreal);
- void setItemX(qreal);
- void setItemY(qreal);
- void setItemPos(const QPointF &);
- void setItemSize(const QSizeF &);
-
- void updateOnComplete();
- void updateMe();
-
- // QDeclarativeItemGeometryListener interface
- void itemGeometryChanged(QDeclarativeItem *, const QRectF &, const QRectF &);
- void _q_widgetDestroyed(QObject *);
- void _q_widgetGeometryChanged();
- QDeclarativeAnchorsPrivate *anchorPrivate() { return this; }
-
- bool checkHValid() const;
- bool checkVValid() const;
- bool checkHAnchorValid(QDeclarativeAnchorLine anchor) const;
- bool checkVAnchorValid(QDeclarativeAnchorLine anchor) const;
- bool calcStretch(const QDeclarativeAnchorLine &edge1, const QDeclarativeAnchorLine &edge2, qreal offset1, qreal offset2, QDeclarativeAnchorLine::AnchorLine line, qreal &stretch);
-
- bool isMirrored() const;
- void updateHorizontalAnchors();
- void updateVerticalAnchors();
- void fillChanged();
- void centerInChanged();
-
- QGraphicsObject *item;
- QDeclarativeAnchors::Anchors usedAnchors;
-
- QGraphicsObject *fill;
- QGraphicsObject *centerIn;
-
- QDeclarativeAnchorLine left;
- QDeclarativeAnchorLine right;
- QDeclarativeAnchorLine top;
- QDeclarativeAnchorLine bottom;
- QDeclarativeAnchorLine vCenter;
- QDeclarativeAnchorLine hCenter;
- QDeclarativeAnchorLine baseline;
-
- qreal leftMargin;
- qreal rightMargin;
- qreal topMargin;
- qreal bottomMargin;
- qreal margins;
- qreal vCenterOffset;
- qreal hCenterOffset;
- qreal baselineOffset;
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QDeclarativeAnchorLine)
-
-#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
deleted file mode 100644
index 8787a5ed68..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ /dev/null
@@ -1,404 +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 "private/qdeclarativeanimatedimage_p.h"
-#include "private/qdeclarativeanimatedimage_p_p.h"
-
-#ifndef QT_NO_MOVIE
-
-#include <qdeclarativeinfo.h>
-#include <private/qdeclarativeengine_p.h>
-
-#include <QMovie>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \qmlclass AnimatedImage QDeclarativeAnimatedImage
- \inherits Image
- \since 4.7
- \ingroup basic-visual-elements
-
- The AnimatedImage element extends the features of the \l Image element, providing
- a way to play animations stored as images containing a series of frames,
- such as those stored in GIF files.
-
- Information about the current frame and totla length of the animation can be
- obtained using the \l currentFrame and \l frameCount properties. You can
- start, pause and stop the animation by changing the values of the \l playing
- and \l paused properties.
-
- The full list of supported formats can be determined with QMovie::supportedFormats().
-
- \section1 Example Usage
-
- \beginfloatleft
- \image animatedimageitem.gif
- \endfloat
-
- The following QML shows how to display an animated image and obtain information
- about its state, such as the current frame and total number of frames.
- The result is an animated image with a simple progress indicator underneath it.
-
- \clearfloat
- \snippet doc/src/snippets/declarative/animatedimage.qml document
-
- \sa BorderImage, Image
-*/
-
-/*!
- \qmlproperty url AnimatedImage::source
-
- This property holds the URL that refers to the source image.
-
- AnimatedImage can handle any image format supported by Qt, loaded from any
- URL scheme supported by Qt.
-
- \sa QDeclarativeImageProvider
-*/
-
-/*!
- \qmlproperty bool AnimatedImage::asynchronous
-
- Specifies that images on the local filesystem should be loaded
- asynchronously in a separate thread. The default value is
- false, causing the user interface thread to block while the
- image is loaded. Setting \a asynchronous to true is useful where
- maintaining a responsive user interface is more desirable
- than having images immediately visible.
-
- Note that this property is only valid for images read from the
- local filesystem. Images loaded via a network resource (e.g. HTTP)
- are always loaded asynchonously.
-*/
-
-/*!
- \qmlproperty bool AnimatedImage::cache
- \since Quick 1.1
-
- Specifies whether the image should be cached. The default value is
- true. Setting \a cache to false is useful when dealing with large images,
- to make sure that they aren't cached at the expense of small 'ui element' images.
-*/
-
-/*!
- \qmlproperty bool AnimatedImage::mirror
- \since Quick 1.1
-
- This property holds whether the image should be horizontally inverted
- (effectively displaying a mirrored image).
-
- The default value is false.
-*/
-
-QDeclarativeAnimatedImage::QDeclarativeAnimatedImage(QDeclarativeItem *parent)
- : QDeclarativeImage(*(new QDeclarativeAnimatedImagePrivate), parent)
-{
-}
-
-QDeclarativeAnimatedImage::~QDeclarativeAnimatedImage()
-{
- Q_D(QDeclarativeAnimatedImage);
- delete d->_movie;
-}
-
-/*!
- \qmlproperty bool AnimatedImage::paused
- This property holds whether the animated image is paused.
-
- By default, this property is false. Set it to true when you want to pause
- the animation.
-*/
-bool QDeclarativeAnimatedImage::isPaused() const
-{
- Q_D(const QDeclarativeAnimatedImage);
- if(!d->_movie)
- return false;
- return d->_movie->state()==QMovie::Paused;
-}
-
-void QDeclarativeAnimatedImage::setPaused(bool pause)
-{
- Q_D(QDeclarativeAnimatedImage);
- if(pause == d->paused)
- return;
- d->paused = pause;
- if(!d->_movie)
- return;
- d->_movie->setPaused(pause);
-}
-/*!
- \qmlproperty bool AnimatedImage::playing
- This property holds whether the animated image is playing.
-
- By default, this property is true, meaning that the animation
- will start playing immediately.
-*/
-bool QDeclarativeAnimatedImage::isPlaying() const
-{
- Q_D(const QDeclarativeAnimatedImage);
- if (!d->_movie)
- return false;
- return d->_movie->state()!=QMovie::NotRunning;
-}
-
-void QDeclarativeAnimatedImage::setPlaying(bool play)
-{
- Q_D(QDeclarativeAnimatedImage);
- if(play == d->playing)
- return;
- d->playing = play;
- if (!d->_movie)
- return;
- if (play)
- d->_movie->start();
- else
- d->_movie->stop();
-}
-
-/*!
- \qmlproperty int AnimatedImage::currentFrame
- \qmlproperty int AnimatedImage::frameCount
-
- currentFrame is the frame that is currently visible. By monitoring this property
- for changes, you can animate other items at the same time as the image.
-
- frameCount is the number of frames in the animation. For some animation formats,
- frameCount is unknown and has a value of zero.
-*/
-int QDeclarativeAnimatedImage::currentFrame() const
-{
- Q_D(const QDeclarativeAnimatedImage);
- if (!d->_movie)
- return d->preset_currentframe;
- return d->_movie->currentFrameNumber();
-}
-
-void QDeclarativeAnimatedImage::setCurrentFrame(int frame)
-{
- Q_D(QDeclarativeAnimatedImage);
- if (!d->_movie) {
- d->preset_currentframe = frame;
- return;
- }
- d->_movie->jumpToFrame(frame);
-}
-
-int QDeclarativeAnimatedImage::frameCount() const
-{
- Q_D(const QDeclarativeAnimatedImage);
- if (!d->_movie)
- return 0;
- return d->_movie->frameCount();
-}
-
-void QDeclarativeAnimatedImage::setSource(const QUrl &url)
-{
- Q_D(QDeclarativeAnimatedImage);
- if (url == d->url)
- return;
-
- delete d->_movie;
- d->_movie = 0;
-
- if (d->reply) {
- d->reply->deleteLater();
- d->reply = 0;
- }
-
- d->url = url;
- emit sourceChanged(d->url);
-
- if (isComponentComplete())
- load();
-}
-
-void QDeclarativeAnimatedImage::load()
-{
- Q_D(QDeclarativeAnimatedImage);
-
- QDeclarativeImageBase::Status oldStatus = d->status;
- qreal oldProgress = d->progress;
-
- if (d->url.isEmpty()) {
- delete d->_movie;
- d->setPixmap(QPixmap());
- d->progress = 0;
- d->status = Null;
- if (d->status != oldStatus)
- emit statusChanged(d->status);
- if (d->progress != oldProgress)
- emit progressChanged(d->progress);
- } else {
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
- QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url);
- if (!lf.isEmpty()) {
- //### should be unified with movieRequestFinished
- d->_movie = new QMovie(lf);
- if (!d->_movie->isValid()){
- qmlInfo(this) << "Error Reading Animated Image File " << d->url.toString();
- delete d->_movie;
- d->_movie = 0;
- d->status = Error;
- if (d->status != oldStatus)
- emit statusChanged(d->status);
- return;
- }
- connect(d->_movie, SIGNAL(stateChanged(QMovie::MovieState)),
- this, SLOT(playingStatusChanged()));
- connect(d->_movie, SIGNAL(frameChanged(int)),
- this, SLOT(movieUpdate()));
- d->_movie->setCacheMode(QMovie::CacheAll);
- if(d->playing)
- d->_movie->start();
- else
- d->_movie->jumpToFrame(0);
- if(d->paused)
- d->_movie->setPaused(true);
- d->setPixmap(d->_movie->currentPixmap());
- d->status = Ready;
- d->progress = 1.0;
- if (d->status != oldStatus)
- emit statusChanged(d->status);
- if (d->progress != oldProgress)
- emit progressChanged(d->progress);
- return;
- }
-#endif
- d->status = Loading;
- d->progress = 0;
- emit statusChanged(d->status);
- emit progressChanged(d->progress);
- QNetworkRequest req(d->url);
- req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
- d->reply = qmlEngine(this)->networkAccessManager()->get(req);
- QObject::connect(d->reply, SIGNAL(finished()),
- this, SLOT(movieRequestFinished()));
- QObject::connect(d->reply, SIGNAL(downloadProgress(qint64,qint64)),
- this, SLOT(requestProgress(qint64,qint64)));
- }
-}
-
-#define ANIMATEDIMAGE_MAXIMUM_REDIRECT_RECURSION 16
-
-void QDeclarativeAnimatedImage::movieRequestFinished()
-{
- Q_D(QDeclarativeAnimatedImage);
-
- d->redirectCount++;
- if (d->redirectCount < ANIMATEDIMAGE_MAXIMUM_REDIRECT_RECURSION) {
- QVariant redirect = d->reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
- if (redirect.isValid()) {
- QUrl url = d->reply->url().resolved(redirect.toUrl());
- d->reply->deleteLater();
- d->reply = 0;
- setSource(url);
- return;
- }
- }
- d->redirectCount=0;
-
- d->_movie = new QMovie(d->reply);
- if (!d->_movie->isValid()){
-#ifndef QT_NO_DEBUG_STREAM
- qmlInfo(this) << "Error Reading Animated Image File " << d->url;
-#endif
- delete d->_movie;
- d->_movie = 0;
- d->status = Error;
- emit statusChanged(d->status);
- return;
- }
- connect(d->_movie, SIGNAL(stateChanged(QMovie::MovieState)),
- this, SLOT(playingStatusChanged()));
- connect(d->_movie, SIGNAL(frameChanged(int)),
- this, SLOT(movieUpdate()));
- d->_movie->setCacheMode(QMovie::CacheAll);
- if(d->playing)
- d->_movie->start();
- if (d->paused || !d->playing) {
- d->_movie->jumpToFrame(d->preset_currentframe);
- d->preset_currentframe = 0;
- }
- if(d->paused)
- d->_movie->setPaused(true);
- d->setPixmap(d->_movie->currentPixmap());
- d->status = Ready;
- emit statusChanged(d->status);
-}
-
-void QDeclarativeAnimatedImage::movieUpdate()
-{
- Q_D(QDeclarativeAnimatedImage);
- d->setPixmap(d->_movie->currentPixmap());
- emit frameChanged();
-}
-
-void QDeclarativeAnimatedImage::playingStatusChanged()
-{
- Q_D(QDeclarativeAnimatedImage);
- if((d->_movie->state() != QMovie::NotRunning) != d->playing){
- d->playing = (d->_movie->state() != QMovie::NotRunning);
- emit playingChanged();
- }
- if((d->_movie->state() == QMovie::Paused) != d->paused){
- d->playing = (d->_movie->state() == QMovie::Paused);
- emit pausedChanged();
- }
-}
-
-void QDeclarativeAnimatedImage::componentComplete()
-{
- Q_D(QDeclarativeAnimatedImage);
- QDeclarativeItem::componentComplete(); // NOT QDeclarativeImage
- if (d->url.isValid())
- load();
- if (!d->reply) {
- setCurrentFrame(d->preset_currentframe);
- d->preset_currentframe = 0;
- }
-}
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_MOVIE
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
deleted file mode 100644
index bc3255e808..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
+++ /dev/null
@@ -1,116 +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 QDECLARATIVEANIMATEDIMAGE_H
-#define QDECLARATIVEANIMATEDIMAGE_H
-
-#include "private/qdeclarativeimage_p.h"
-
-#ifndef QT_NO_MOVIE
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QMovie;
-class QDeclarativeAnimatedImagePrivate;
-
-class Q_AUTOTEST_EXPORT QDeclarativeAnimatedImage : public QDeclarativeImage
-{
- Q_OBJECT
-
- Q_PROPERTY(bool playing READ isPlaying WRITE setPlaying NOTIFY playingChanged)
- Q_PROPERTY(bool paused READ isPaused WRITE setPaused NOTIFY pausedChanged)
- Q_PROPERTY(int currentFrame READ currentFrame WRITE setCurrentFrame NOTIFY frameChanged)
- Q_PROPERTY(int frameCount READ frameCount)
-
- // read-only for AnimatedImage
- Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
-
-public:
- QDeclarativeAnimatedImage(QDeclarativeItem *parent=0);
- ~QDeclarativeAnimatedImage();
-
- bool isPlaying() const;
- void setPlaying(bool play);
-
- bool isPaused() const;
- void setPaused(bool pause);
-
- int currentFrame() const;
- void setCurrentFrame(int frame);
-
- int frameCount() const;
-
- // Extends QDeclarativeImage's src property*/
- virtual void setSource(const QUrl&);
-
-Q_SIGNALS:
- void playingChanged();
- void pausedChanged();
- void frameChanged();
- void sourceSizeChanged();
-
-private Q_SLOTS:
- void movieUpdate();
- void movieRequestFinished();
- void playingStatusChanged();
-
-protected:
- virtual void load();
- void componentComplete();
-
-private:
- Q_DISABLE_COPY(QDeclarativeAnimatedImage)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeAnimatedImage)
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QDeclarativeAnimatedImage)
-
-QT_END_HEADER
-
-#endif // QT_NO_MOVIE
-
-#endif
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
deleted file mode 100644
index 0b7614e84b..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
+++ /dev/null
@@ -1,87 +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 QDECLARATIVEANIMATEDIMAGE_P_H
-#define QDECLARATIVEANIMATEDIMAGE_P_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 "private/qdeclarativeimage_p_p.h"
-
-#ifndef QT_NO_MOVIE
-
-QT_BEGIN_NAMESPACE
-
-class QMovie;
-class QNetworkReply;
-
-class QDeclarativeAnimatedImagePrivate : public QDeclarativeImagePrivate
-{
- Q_DECLARE_PUBLIC(QDeclarativeAnimatedImage)
-
-public:
- QDeclarativeAnimatedImagePrivate()
- : playing(true), paused(false), preset_currentframe(0), _movie(0), reply(0), redirectCount(0)
- {
- }
-
- bool playing;
- bool paused;
- int preset_currentframe;
- QMovie *_movie;
- QNetworkReply *reply;
- int redirectCount;
-};
-
-QT_END_NAMESPACE
-
-#endif // QT_NO_MOVIE
-
-#endif // QDECLARATIVEANIMATEDIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
deleted file mode 100644
index 9c274e93fa..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ /dev/null
@@ -1,617 +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 "private/qdeclarativeborderimage_p.h"
-#include "private/qdeclarativeborderimage_p_p.h"
-
-#include <qdeclarativeinfo.h>
-#include <private/qdeclarativeengine_p.h>
-
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QFile>
-
-QT_BEGIN_NAMESPACE
-
-/*!
- \qmlclass BorderImage QDeclarativeBorderImage
- \brief The BorderImage element provides an image that can be used as a border.
- \inherits Item
- \since 4.7
- \ingroup qml-basic-visual-elements
-
- The BorderImage element is used to create borders out of images by scaling or tiling
- parts of each image.
-
- A BorderImage element breaks a source image, specified using the \l url property,
- into 9 regions, as shown below:
-
- \image declarative-scalegrid.png
-
- When the image is scaled, regions of the source image are scaled or tiled to
- create the displayed border image in the following way:
-
- \list
- \i The corners (regions 1, 3, 7, and 9) are not scaled at all.
- \i Regions 2 and 8 are scaled according to
- \l{BorderImage::horizontalTileMode}{horizontalTileMode}.
- \i Regions 4 and 6 are scaled according to
- \l{BorderImage::verticalTileMode}{verticalTileMode}.
- \i The middle (region 5) is scaled according to both
- \l{BorderImage::horizontalTileMode}{horizontalTileMode} and
- \l{BorderImage::verticalTileMode}{verticalTileMode}.
- \endlist
-
- The regions of the image are defined using the \l border property group, which
- describes the distance from each edge of the source image to use as a border.
-
- \section1 Example Usage
-
- The following examples show the effects of the different modes on an image.
- Guide lines are overlaid onto the image to show the different regions of the
- image as described above.
-
- \beginfloatleft
- \image qml-borderimage-normal-image.png
- \endfloat
-
- An unscaled image is displayed using an Image element. The \l border property is
- used to determine the parts of the image that will lie inside the unscaled corner
- areas and the parts that will be stretched horizontally and vertically.
-
- \snippet doc/src/snippets/declarative/borderimage/normal-image.qml normal image
-
- \clearfloat
- \beginfloatleft
- \image qml-borderimage-scaled.png
- \endfloat
-
- A BorderImage element is used to display the image, and it is given a size that is
- larger than the original image. Since the \l horizontalTileMode property is set to
- \l{BorderImage::horizontalTileMode}{BorderImage.Stretch}, the parts of image in
- regions 2 and 8 are stretched horizontally. Since the \l verticalTileMode property
- is set to \l{BorderImage::verticalTileMode}{BorderImage.Stretch}, the parts of image
- in regions 4 and 6 are stretched vertically.
-
- \snippet doc/src/snippets/declarative/borderimage/borderimage-scaled.qml scaled border image
-
- \clearfloat
- \beginfloatleft
- \image qml-borderimage-tiled.png
- \endfloat
-
- Again, a large BorderImage element is used to display the image. With the
- \l horizontalTileMode property set to \l{BorderImage::horizontalTileMode}{BorderImage.Repeat},
- the parts of image in regions 2 and 8 are tiled so that they fill the space at the
- top and bottom of the element. Similarly, the \l verticalTileMode property is set to
- \l{BorderImage::verticalTileMode}{BorderImage.Repeat}, the parts of image in regions
- 4 and 6 are tiled so that they fill the space at the left and right of the element.
-
- \snippet doc/src/snippets/declarative/borderimage/borderimage-tiled.qml tiled border image
-
- \clearfloat
- In some situations, the width of regions 2 and 8 may not be an exact multiple of the width
- of the corresponding regions in the source image. Similarly, the height of regions 4 and 6
- may not be an exact multiple of the height of the corresponding regions. It can be useful
- to use \l{BorderImage::horizontalTileMode}{BorderImage.Round} instead of
- \l{BorderImage::horizontalTileMode}{BorderImage.Repeat} in cases like these.
-
- The \l{declarative/imageelements/borderimage}{BorderImage example} shows how a BorderImage
- can be used to simulate a shadow effect on a rectangular item.
-
- \section1 Quality and Performance
-
- By default, any scaled regions of the image are rendered without smoothing to improve
- rendering speed. Setting the \l smooth property improves rendering quality of scaled
- regions, but may slow down rendering.
-
- The source image may not be loaded instantaneously, depending on its original location.
- Loading progress can be monitored with the \l progress property.
-
- \sa Image, AnimatedImage
- */
-
-/*!
- \qmlproperty bool BorderImage::asynchronous
-
- Specifies that images on the local filesystem should be loaded
- asynchronously in a separate thread. The default value is
- false, causing the user interface thread to block while the
- image is loaded. Setting \a asynchronous to true is useful where
- maintaining a responsive user interface is more desirable
- than having images immediately visible.
-
- Note that this property is only valid for images read from the
- local filesystem. Images loaded via a network resource (e.g. HTTP)
- are always loaded asynchonously.
-*/
-QDeclarativeBorderImage::QDeclarativeBorderImage(QDeclarativeItem *parent)
- : QDeclarativeImageBase(*(new QDeclarativeBorderImagePrivate), parent)
-{
-}
-
-QDeclarativeBorderImage::~QDeclarativeBorderImage()
-{
- Q_D(QDeclarativeBorderImage);
- if (d->sciReply)
- d->sciReply->deleteLater();
-}
-/*!
- \qmlproperty enumeration BorderImage::status
-
- This property describes the status of image loading. It can be one of:
-
- \list
- \o BorderImage.Null - no image has been set
- \o BorderImage.Ready - the image has been loaded
- \o BorderImage.Loading - the image is currently being loaded
- \o BorderImage.Error - an error occurred while loading the image
- \endlist
-
- \sa progress
-*/
-
-/*!
- \qmlproperty real BorderImage::progress
-
- This property holds the progress of image loading, from 0.0 (nothing loaded)
- to 1.0 (finished).
-
- \sa status
-*/
-
-/*!
- \qmlproperty bool BorderImage::smooth
-
- Set this property if you want the image to be smoothly filtered when scaled or
- transformed. Smooth filtering gives better visual quality, but is slower. If
- the image is displayed at its natural size, this property has no visual or
- performance effect.
-
- By default, this property is set to false.
-
- \note Generally scaling artifacts are only visible if the image is stationary on
- the screen. A common pattern when animating an image is to disable smooth
- filtering at the beginning of the animation and enable it at the conclusion.
-*/
-
-/*!
- \qmlproperty bool BorderImage::cache
- \since Quick 1.1
-
- Specifies whether the image should be cached. The default value is
- true. Setting \a cache to false is useful when dealing with large images,
- to make sure that they aren't cached at the expense of small 'ui element' images.
-*/
-
-/*!
- \qmlproperty bool BorderImage::mirror
- \since Quick 1.1
-
- This property holds whether the image should be horizontally inverted
- (effectively displaying a mirrored image).
-
- The default value is false.
-*/
-
-/*!
- \qmlproperty url BorderImage::source
-
- This property holds the URL that refers to the source image.
-
- BorderImage can handle any image format supported by Qt, loaded from any
- URL scheme supported by Qt.
-
- This property can also be used to refer to .sci files, which are
- written in a QML-specific, text-based format that specifies the
- borders, the image file and the tile rules for a given border image.
-
- The following .sci file sets the borders to 10 on each side for the
- image \c picture.png:
-
- \code
- border.left: 10
- border.top: 10
- border.bottom: 10
- border.right: 10
- source: "picture.png"
- \endcode
-
- The URL may be absolute, or relative to the URL of the component.
-
- \sa QDeclarativeImageProvider
-*/
-
-/*!
- \qmlproperty QSize BorderImage::sourceSize
-
- This property holds the actual width and height of the loaded image.
-
- In BorderImage, this property is read-only.
-
- \sa Image::sourceSize
-*/
-void QDeclarativeBorderImage::setSource(const QUrl &url)
-{
- Q_D(QDeclarativeBorderImage);
- //equality is fairly expensive, so we bypass for simple, common case
- if ((d->url.isEmpty() == url.isEmpty()) && url == d->url)
- return;
-
- if (d->sciReply) {
- d->sciReply->deleteLater();
- d->sciReply = 0;
- }
-
- d->url = url;
- d->sciurl = QUrl();
- emit sourceChanged(d->url);
-
- if (isComponentComplete())
- load();
-}
-
-void QDeclarativeBorderImage::load()
-{
- Q_D(QDeclarativeBorderImage);
- if (d->progress != 0.0) {
- d->progress = 0.0;
- emit progressChanged(d->progress);
- }
-
- if (d->url.isEmpty()) {
- d->pix.clear(this);
- d->status = Null;
- setImplicitWidth(0);
- setImplicitHeight(0);
- emit statusChanged(d->status);
- update();
- } else {
- d->status = Loading;
- if (d->url.path().endsWith(QLatin1String("sci"))) {
-#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
- QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url);
- if (!lf.isEmpty()) {
- QFile file(lf);
- file.open(QIODevice::ReadOnly);
- setGridScaledImage(QDeclarativeGridScaledImage(&file));
- } else
-#endif
- {
- QNetworkRequest req(d->url);
- d->sciReply = qmlEngine(this)->networkAccessManager()->get(req);
-
- static int sciReplyFinished = -1;
- static int thisSciRequestFinished = -1;
- if (sciReplyFinished == -1) {
- sciReplyFinished =
- QNetworkReply::staticMetaObject.indexOfSignal("finished()");
- thisSciRequestFinished =
- QDeclarativeBorderImage::staticMetaObject.indexOfSlot("sciRequestFinished()");
- }
-
- QMetaObject::connect(d->sciReply, sciReplyFinished, this,
- thisSciRequestFinished, Qt::DirectConnection);
- }
- } else {
-
- QDeclarativePixmap::Options options;
- if (d->async)
- options |= QDeclarativePixmap::Asynchronous;
- if (d->cache)
- options |= QDeclarativePixmap::Cache;
- d->pix.clear(this);
- d->pix.load(qmlEngine(this), d->url, options);
-
- if (d->pix.isLoading()) {
- d->pix.connectFinished(this, SLOT(requestFinished()));
- d->pix.connectDownloadProgress(this, SLOT(requestProgress(qint64,qint64)));
- } else {
- QSize impsize = d->pix.implicitSize();
- setImplicitWidth(impsize.width());
- setImplicitHeight(impsize.height());
-
- if (d->pix.isReady()) {
- d->status = Ready;
- } else {
- d->status = Error;
- qmlInfo(this) << d->pix.error();
- }
-
- d->progress = 1.0;
- emit statusChanged(d->status);
- emit progressChanged(d->progress);
- requestFinished();
- update();
- }
- }
- }
-
- emit statusChanged(d->status);
-}
-
-/*!
- \qmlproperty int BorderImage::border.left
- \qmlproperty int BorderImage::border.right
- \qmlproperty int BorderImage::border.top
- \qmlproperty int BorderImage::border.bottom
-
- The 4 border lines (2 horizontal and 2 vertical) break the image into 9 sections,
- as shown below:
-
- \image declarative-scalegrid.png
-
- Each border line (left, right, top, and bottom) specifies an offset in pixels
- from the respective edge of the source image. By default, each border line has
- a value of 0.
-
- For example, the following definition sets the bottom line 10 pixels up from
- the bottom of the image:
-
- \qml
- BorderImage {
- border.bottom: 10
- // ...
- }
- \endqml
-
- The border lines can also be specified using a
- \l {BorderImage::source}{.sci file}.
-*/
-
-QDeclarativeScaleGrid *QDeclarativeBorderImage::border()
-{
- Q_D(QDeclarativeBorderImage);
- return d->getScaleGrid();
-}
-
-/*!
- \qmlproperty enumeration BorderImage::horizontalTileMode
- \qmlproperty enumeration BorderImage::verticalTileMode
-
- This property describes how to repeat or stretch the middle parts of the border image.
-
- \list
- \o BorderImage.Stretch - Scales the image to fit to the available area.
- \o BorderImage.Repeat - Tile the image until there is no more space. May crop the last image.
- \o BorderImage.Round - Like Repeat, but scales the images down to ensure that the last image is not cropped.
- \endlist
-
- The default tile mode for each property is BorderImage.Stretch.
-*/
-QDeclarativeBorderImage::TileMode QDeclarativeBorderImage::horizontalTileMode() const
-{
- Q_D(const QDeclarativeBorderImage);
- return d->horizontalTileMode;
-}
-
-void QDeclarativeBorderImage::setHorizontalTileMode(TileMode t)
-{
- Q_D(QDeclarativeBorderImage);
- if (t != d->horizontalTileMode) {
- d->horizontalTileMode = t;
- emit horizontalTileModeChanged();
- update();
- }
-}
-
-QDeclarativeBorderImage::TileMode QDeclarativeBorderImage::verticalTileMode() const
-{
- Q_D(const QDeclarativeBorderImage);
- return d->verticalTileMode;
-}
-
-void QDeclarativeBorderImage::setVerticalTileMode(TileMode t)
-{
- Q_D(QDeclarativeBorderImage);
- if (t != d->verticalTileMode) {
- d->verticalTileMode = t;
- emit verticalTileModeChanged();
- update();
- }
-}
-
-void QDeclarativeBorderImage::setGridScaledImage(const QDeclarativeGridScaledImage& sci)
-{
- Q_D(QDeclarativeBorderImage);
- if (!sci.isValid()) {
- d->status = Error;
- emit statusChanged(d->status);
- } else {
- QDeclarativeScaleGrid *sg = border();
- sg->setTop(sci.gridTop());
- sg->setBottom(sci.gridBottom());
- sg->setLeft(sci.gridLeft());
- sg->setRight(sci.gridRight());
- d->horizontalTileMode = sci.horizontalTileRule();
- d->verticalTileMode = sci.verticalTileRule();
-
- d->sciurl = d->url.resolved(QUrl(sci.pixmapUrl()));
-
- QDeclarativePixmap::Options options;
- if (d->async)
- options |= QDeclarativePixmap::Asynchronous;
- if (d->cache)
- options |= QDeclarativePixmap::Cache;
- d->pix.clear(this);
- d->pix.load(qmlEngine(this), d->sciurl, options);
-
- if (d->pix.isLoading()) {
- static int thisRequestProgress = -1;
- static int thisRequestFinished = -1;
- if (thisRequestProgress == -1) {
- thisRequestProgress =
- QDeclarativeBorderImage::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)");
- thisRequestFinished =
- QDeclarativeBorderImage::staticMetaObject.indexOfSlot("requestFinished()");
- }
-
- d->pix.connectFinished(this, thisRequestFinished);
- d->pix.connectDownloadProgress(this, thisRequestProgress);
-
- } else {
-
- QSize impsize = d->pix.implicitSize();
- setImplicitWidth(impsize.width());
- setImplicitHeight(impsize.height());
-
- if (d->pix.isReady()) {
- d->status = Ready;
- } else {
- d->status = Error;
- qmlInfo(this) << d->pix.error();
- }
-
- d->progress = 1.0;
- emit statusChanged(d->status);
- emit progressChanged(1.0);
- update();
-
- }
- }
-}
-
-void QDeclarativeBorderImage::requestFinished()
-{
- Q_D(QDeclarativeBorderImage);
-
- QSize impsize = d->pix.implicitSize();
- if (d->pix.isError()) {
- d->status = Error;
- qmlInfo(this) << d->pix.error();
- } else {
- d->status = Ready;
- }
-
- setImplicitWidth(impsize.width());
- setImplicitHeight(impsize.height());
-
- if (d->sourcesize.width() != d->pix.width() || d->sourcesize.height() != d->pix.height())
- emit sourceSizeChanged();
-
- d->progress = 1.0;
- emit statusChanged(d->status);
- emit progressChanged(1.0);
- update();
-}
-
-#define BORDERIMAGE_MAX_REDIRECT 16
-
-void QDeclarativeBorderImage::sciRequestFinished()
-{
- Q_D(QDeclarativeBorderImage);
-
- d->redirectCount++;
- if (d->redirectCount < BORDERIMAGE_MAX_REDIRECT) {
- QVariant redirect = d->sciReply->attribute(QNetworkRequest::RedirectionTargetAttribute);
- if (redirect.isValid()) {
- QUrl url = d->sciReply->url().resolved(redirect.toUrl());
- setSource(url);
- return;
- }
- }
- d->redirectCount=0;
-
- if (d->sciReply->error() != QNetworkReply::NoError) {
- d->status = Error;
- d->sciReply->deleteLater();
- d->sciReply = 0;
- emit statusChanged(d->status);
- } else {
- QDeclarativeGridScaledImage sci(d->sciReply);
- d->sciReply->deleteLater();
- d->sciReply = 0;
- setGridScaledImage(sci);
- }
-}
-
-void QDeclarativeBorderImage::doUpdate()
-{
- update();
-}
-
-void QDeclarativeBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
-{
- Q_D(QDeclarativeBorderImage);
- if (d->pix.isNull() || d->width() <= 0.0 || d->height() <= 0.0)
- return;
-
- bool oldAA = p->testRenderHint(QPainter::Antialiasing);
- bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
- QTransform oldTransform;
- if (d->smooth)
- p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
- if (d->mirror) {
- oldTransform = p->transform();
- QTransform mirror;
- mirror.translate(d->width(), 0).scale(-1, 1.0);
- p->setWorldTransform(mirror * oldTransform);
- }
-
- const QDeclarativeScaleGrid *border = d->getScaleGrid();
- int left = border->left();
- int right = border->right();
- qreal borderWidth = left + right;
- if (borderWidth > 0.0 && d->width() < borderWidth) {
- qreal diff = borderWidth - d->width() - 1;
- left -= qRound(diff * qreal(left) / borderWidth);
- right -= qRound(diff * qreal(right) / borderWidth);
- }
- int top = border->top();
- int bottom = border->bottom();
- qreal borderHeight = top + bottom;
- if (borderHeight > 0.0 && d->height() < borderHeight) {
- qreal diff = borderHeight - d->height() - 1;
- top -= qRound(diff * qreal(top) / borderHeight);
- bottom -= qRound(diff * qreal(bottom) / borderHeight);
- }
- QMargins margins(left, top, right, bottom);
- QTileRules rules((Qt::TileRule)d->horizontalTileMode, (Qt::TileRule)d->verticalTileMode);
- qDrawBorderPixmap(p, QRect(0, 0, (int)d->width(), (int)d->height()), margins, d->pix, d->pix.rect(), margins, rules);
- if (d->smooth) {
- p->setRenderHint(QPainter::Antialiasing, oldAA);
- p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
- }
- if (d->mirror)
- p->setWorldTransform(oldTransform);
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
deleted file mode 100644
index 6a50c3cfec..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
+++ /dev/null
@@ -1,111 +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 QDECLARATIVEBORDERIMAGE_H
-#define QDECLARATIVEBORDERIMAGE_H
-
-#include "private/qdeclarativeimagebase_p.h"
-
-#include <QtNetwork/qnetworkreply.h>
-
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QDeclarativeScaleGrid;
-class QDeclarativeGridScaledImage;
-class QDeclarativeBorderImagePrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeBorderImage : public QDeclarativeImageBase
-{
- Q_OBJECT
- Q_ENUMS(TileMode)
-
- Q_PROPERTY(QDeclarativeScaleGrid *border READ border CONSTANT)
- Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY horizontalTileModeChanged)
- Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode NOTIFY verticalTileModeChanged)
-
- // read-only for BorderImage
- Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
-
-public:
- QDeclarativeBorderImage(QDeclarativeItem *parent=0);
- ~QDeclarativeBorderImage();
-
- QDeclarativeScaleGrid *border();
-
- enum TileMode { Stretch = Qt::StretchTile, Repeat = Qt::RepeatTile, Round = Qt::RoundTile };
-
- TileMode horizontalTileMode() const;
- void setHorizontalTileMode(TileMode);
-
- TileMode verticalTileMode() const;
- void setVerticalTileMode(TileMode);
-
- void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
- void setSource(const QUrl &url);
-
-Q_SIGNALS:
- void horizontalTileModeChanged();
- void verticalTileModeChanged();
- void sourceSizeChanged();
-
-protected:
- virtual void load();
-
-private:
- void setGridScaledImage(const QDeclarativeGridScaledImage& sci);
-
-private Q_SLOTS:
- void doUpdate();
- void requestFinished();
- void sciRequestFinished();
-
-private:
- Q_DISABLE_COPY(QDeclarativeBorderImage)
- Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeBorderImage)
-};
-
-QT_END_NAMESPACE
-QML_DECLARE_TYPE(QDeclarativeBorderImage)
-QT_END_HEADER
-
-#endif // QDECLARATIVEBORDERIMAGE_H
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
deleted file mode 100644
index d847e222b7..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p_p.h
+++ /dev/null
@@ -1,106 +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 QDECLARATIVEBORDERIMAGE_P_H
-#define QDECLARATIVEBORDERIMAGE_P_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 "private/qdeclarativeimagebase_p_p.h"
-#include "private/qdeclarativescalegrid_p_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QNetworkReply;
-class QDeclarativeBorderImagePrivate : public QDeclarativeImageBasePrivate
-{
- Q_DECLARE_PUBLIC(QDeclarativeBorderImage)
-
-public:
- QDeclarativeBorderImagePrivate()
- : border(0), sciReply(0),
- horizontalTileMode(QDeclarativeBorderImage::Stretch),
- verticalTileMode(QDeclarativeBorderImage::Stretch),
- redirectCount(0)
- {
- }
-
- ~QDeclarativeBorderImagePrivate()
- {
- }
-
-
- QDeclarativeScaleGrid *getScaleGrid()
- {
- Q_Q(QDeclarativeBorderImage);
- if (!border) {
- border = new QDeclarativeScaleGrid(q);
- static int borderChangedSignalIdx = -1;
- static int doUpdateSlotIdx = -1;
- if (borderChangedSignalIdx < 0)
- borderChangedSignalIdx = QDeclarativeScaleGrid::staticMetaObject.indexOfSignal("borderChanged()");
- if (doUpdateSlotIdx < 0)
- doUpdateSlotIdx = QDeclarativeBorderImage::staticMetaObject.indexOfSlot("doUpdate()");
- QMetaObject::connect(border, borderChangedSignalIdx, q, doUpdateSlotIdx);
- }
- return border;
- }
-
- QDeclarativeScaleGrid *border;
- QUrl sciurl;
- QNetworkReply *sciReply;
- QDeclarativeBorderImage::TileMode horizontalTileMode;
- QDeclarativeBorderImage::TileMode verticalTileMode;
- int redirectCount;
-};
-
-QT_END_NAMESPACE
-
-#endif // QDECLARATIVEBORDERIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeevents.cpp b/src/declarative/graphicsitems/qdeclarativeevents.cpp
deleted file mode 100644
index c0f71d46ee..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeevents.cpp
+++ /dev/null
@@ -1,237 +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 "private/qdeclarativeevents_p_p.h"
-
-QT_BEGIN_NAMESPACE
-/*!
- \qmlclass KeyEvent QDeclarativeKeyEvent
- \since 4.7
- \ingroup qml-event-elements
-
- \brief The KeyEvent object provides information about a key event.
-
- For example, the following changes the Item's state property when the Enter
- key is pressed:
- \qml
-Item {
- focus: true
- Keys.onPressed: { if (event.key == Qt.Key_Enter) state = 'ShowDetails'; }
-}
- \endqml
-*/
-
-/*!
- \qmlproperty int KeyEvent::key
-
- This property holds the code of the key that was pressed or released.
-
- See \l {Qt::Key}{Qt.Key} for the list of keyboard codes. These codes are
- independent of the underlying window system. Note that this
- function does not distinguish between capital and non-capital
- letters, use the text() function (returning the Unicode text the
- key generated) for this purpose.
-
- A value of either 0 or \l {Qt::Key_unknown}{Qt.Key_Unknown} means that the event is not
- the result of a known key; for example, it may be the result of
- a compose sequence, a keyboard macro, or due to key event
- compression.
-*/
-
-/*!
- \qmlproperty string KeyEvent::text
-
- This property holds the Unicode text that the key generated.
- The text returned can be an empty string in cases where modifier keys,
- such as Shift, Control, Alt, and Meta, are being pressed or released.
- In such cases \c key will contain a valid value
-*/
-
-/*!
- \qmlproperty bool KeyEvent::isAutoRepeat
-
- This property holds whether this event comes from an auto-repeating key.
-*/
-
-/*!
- \qmlproperty int KeyEvent::count
-
- This property holds the number of keys involved in this event. If \l KeyEvent::text
- is not empty, this is simply the length of the string.
-*/
-
-/*!
- \qmlproperty bool KeyEvent::accepted
-
- Setting \a accepted to true prevents the key event from being
- propagated to the item's parent.
-
- Generally, if the item acts on the key event then it should be accepted
- so that ancestor items do not also respond to the same event.
-*/
-
-/*!
- \qmlproperty int KeyEvent::modifiers
-
- This property holds the keyboard modifier flags that existed immediately
- before the event occurred.
-
- It contains a bitwise combination of:
- \list
- \o Qt.NoModifier - No modifier key is pressed.
- \o Qt.ShiftModifier - A Shift key on the keyboard is pressed.
- \o Qt.ControlModifier - A Ctrl key on the keyboard is pressed.
- \o Qt.AltModifier - An Alt key on the keyboard is pressed.
- \o Qt.MetaModifier - A Meta key on the keyboard is pressed.
- \o Qt.KeypadModifier - A keypad button is pressed.
- \endlist
-
- For example, to react to a Shift key + Enter key combination:
- \qml
- Item {
- focus: true
- Keys.onPressed: {
- if ((event.key == Qt.Key_Enter) && (event.modifiers & Qt.ShiftModifier))
- doSomething();
- }
- }
- \endqml
-*/
-
-
-/*!
- \qmlclass MouseEvent QDeclarativeMouseEvent
- \since 4.7
- \ingroup qml-event-elements
-
- \brief The MouseEvent object provides information about a mouse event.
-
- The position of the mouse can be found via the \l x and \l y properties.
- The button that caused the event is available via the \l button property.
-
- \sa MouseArea
-*/
-
-/*!
- \internal
- \class QDeclarativeMouseEvent
-*/
-
-/*!
- \qmlproperty int MouseEvent::x
- \qmlproperty int MouseEvent::y
-
- These properties hold the coordinates of the position supplied by the mouse event.
-*/
-
-
-/*!
- \qmlproperty bool MouseEvent::accepted
-
- Setting \a accepted to true prevents the mouse event from being
- propagated to items below this item.
-
- Generally, if the item acts on the mouse event then it should be accepted
- so that items lower in the stacking order do not also respond to the same event.
-*/
-
-/*!
- \qmlproperty enumeration MouseEvent::button
-
- This property holds the button that caused the event. It can be one of:
- \list
- \o Qt.LeftButton
- \o Qt.RightButton
- \o Qt.MiddleButton
- \endlist
-*/
-
-/*!
- \qmlproperty bool MouseEvent::wasHeld
-
- This property is true if the mouse button has been held pressed longer the
- threshold (800ms).
-*/
-
-/*!
- \qmlproperty int MouseEvent::buttons
-
- This property holds the mouse buttons pressed when the event was generated.
- For mouse move events, this is all buttons that are pressed down. For mouse
- press and double click events this includes the button that caused the event.
- For mouse release events this excludes the button that caused the event.
-
- It contains a bitwise combination of:
- \list
- \o Qt.LeftButton
- \o Qt.RightButton
- \o Qt.MiddleButton
- \endlist
-*/
-
-/*!
- \qmlproperty int MouseEvent::modifiers
-
- This property holds the keyboard modifier flags that existed immediately
- before the event occurred.
-
- It contains a bitwise combination of:
- \list
- \o Qt.NoModifier - No modifier key is pressed.
- \o Qt.ShiftModifier - A Shift key on the keyboard is pressed.
- \o Qt.ControlModifier - A Ctrl key on the keyboard is pressed.
- \o Qt.AltModifier - An Alt key on the keyboard is pressed.
- \o Qt.MetaModifier - A Meta key on the keyboard is pressed.
- \o Qt.KeypadModifier - A keypad button is pressed.
- \endlist
-
- For example, to react to a Shift key + Left mouse button click:
- \qml
- MouseArea {
- onClicked: {
- if ((mouse.button == Qt.LeftButton) && (mouse.modifiers & Qt.ShiftModifier))
- doSomething();
- }
- }
- \endqml
-*/
-
-QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h b/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
deleted file mode 100644
index e22f64913a..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeevents_p_p.h
+++ /dev/null
@@ -1,141 +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 QDECLARATIVEEVENTS_P_H
-#define QDECLARATIVEEVENTS_P_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 <qdeclarative.h>
-
-#include <QtCore/qobject.h>
-#include <QtGui/qevent.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeKeyEvent : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(int key READ key)
- Q_PROPERTY(QString text READ text)
- Q_PROPERTY(int modifiers READ modifiers)
- Q_PROPERTY(bool isAutoRepeat READ isAutoRepeat)
- Q_PROPERTY(int count READ count)
- Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
-
-public:
- QDeclarativeKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString &text=QString(), bool autorep=false, ushort count=1)
- : event(type, key, modifiers, text, autorep, count) { event.setAccepted(false); }
- QDeclarativeKeyEvent(const QKeyEvent &ke)
- : event(ke) { event.setAccepted(false); }
-
- int key() const { return event.key(); }
- QString text() const { return event.text(); }
- int modifiers() const { return event.modifiers(); }
- bool isAutoRepeat() const { return event.isAutoRepeat(); }
- int count() const { return event.count(); }
-
- bool isAccepted() { return event.isAccepted(); }
- void setAccepted(bool accepted) { event.setAccepted(accepted); }
-
-private:
- QKeyEvent event;
-};
-
-class QDeclarativeMouseEvent : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(int x READ x)
- Q_PROPERTY(int y READ y)
- Q_PROPERTY(int button READ button)
- Q_PROPERTY(int buttons READ buttons)
- Q_PROPERTY(int modifiers READ modifiers)
- Q_PROPERTY(bool wasHeld READ wasHeld)
- Q_PROPERTY(bool isClick READ isClick)
- Q_PROPERTY(bool accepted READ isAccepted WRITE setAccepted)
-
-public:
- QDeclarativeMouseEvent(int x, int y, Qt::MouseButton button, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers
- , bool isClick=false, bool wasHeld=false)
- : _x(x), _y(y), _button(button), _buttons(buttons), _modifiers(modifiers)
- , _wasHeld(wasHeld), _isClick(isClick), _accepted(true) {}
-
- int x() const { return _x; }
- int y() const { return _y; }
- int button() const { return _button; }
- int buttons() const { return _buttons; }
- int modifiers() const { return _modifiers; }
- bool wasHeld() const { return _wasHeld; }
- bool isClick() const { return _isClick; }
-
- // only for internal usage
- void setX(int x) { _x = x; }
- void setY(int y) { _y = y; }
-
- bool isAccepted() { return _accepted; }
- void setAccepted(bool accepted) { _accepted = accepted; }
-
-private:
- int _x;
- int _y;
- Qt::MouseButton _button;
- Qt::MouseButtons _buttons;
- Qt::KeyboardModifiers _modifiers;
- bool _wasHeld;
- bool _isClick;
- bool _accepted;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QDeclarativeKeyEvent)
-QML_DECLARE_TYPE(QDeclarativeMouseEvent)
-
-#endif // QDECLARATIVEEVENTS_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
deleted file mode 100644
index ce7566b9c1..0000000000
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ /dev/null
@@ -1,1799 +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 "private/qdeclarativeflickable_p.h"
-#include "private/qdeclarativeflickable_p_p.h"
-#include <qdeclarativeinfo.h>
-#include <QGraphicsSceneMouseEvent>
-#include <QPointer>
-#include <QTimer>
-#include "qplatformdefs.h"
-
-QT_BEGIN_NAMESPACE
-
-// The maximum number of pixels a flick can overshoot
-#ifndef QML_FLICK_OVERSHOOT
-#define QML_FLICK_OVERSHOOT 200
-#endif
-
-// The number of samples to use in calculating the velocity of a flick
-#ifndef QML_FLICK_SAMPLEBUFFER
-#define QML_FLICK_SAMPLEBUFFER 3
-#endif
-
-// The number of samples to discard when calculating the flick velocity.
-// Touch panels often produce inaccurate results as the finger is lifted.
-#ifndef QML_FLICK_DISCARDSAMPLES
-#define QML_FLICK_DISCARDSAMPLES 1
-#endif
-
-// The default maximum velocity of a flick.
-#ifndef QML_FLICK_DEFAULTMAXVELOCITY
-#define QML_FLICK_DEFAULTMAXVELOCITY 2500
-#endif
-
-// The default deceleration of a flick.
-#ifndef QML_FLICK_DEFAULTDECELERATION
-#define QML_FLICK_DEFAULTDECELERATION 1750
-#endif
-
-// How much faster to decelerate when overshooting
-#ifndef QML_FLICK_OVERSHOOTFRICTION
-#define QML_FLICK_OVERSHOOTFRICTION 8
-#endif
-
-// FlickThreshold determines how far the "mouse" must have moved
-// before we perform a flick.
-static const int FlickThreshold = 20;
-
-// RetainGrabVelocity is the maxmimum instantaneous velocity that
-// will ensure the Flickable retains the grab on consecutive flicks.
-static const int RetainGrabVelocity = 15;
-
-QDeclarativeFlickableVisibleArea::QDeclarativeFlickableVisibleArea(QDeclarativeFlickable *parent)
- : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.)
- , m_yPosition(0.), m_heightRatio(0.)
-{
-}
-
-qreal QDeclarativeFlickableVisibleArea::widthRatio() const
-{
- return m_widthRatio;
-}
-
-qreal QDeclarativeFlickableVisibleArea::xPosition() const
-{
- return m_xPosition;
-}
-
-qreal QDeclarativeFlickableVisibleArea::heightRatio() const
-{
- return m_heightRatio;
-}
-
-qreal QDeclarativeFlickableVisibleArea::yPosition() const
-{
- return m_yPosition;
-}
-
-void QDeclarativeFlickableVisibleArea::updateVisible()
-{
- QDeclarativeFlickablePrivate *p = static_cast<QDeclarativeFlickablePrivate *>(QGraphicsItemPrivate::get(flickable));
-
- bool changeX = false;
- bool changeY = false;
- bool changeWidth = false;
- bool changeHeight = false;
-
- // Vertical
- const qreal viewheight = flickable->height();
- const qreal maxyextent = -flickable->maxYExtent() + flickable->minYExtent();
- qreal pagePos = (-p->vData.move.value() + flickable->minYExtent()) / (maxyextent + viewheight);
- qreal pageSize = viewheight / (maxyextent + viewheight);
-
- if (pageSize != m_heightRatio) {
- m_heightRatio = pageSize;
- changeHeight = true;
- }
- if (pagePos != m_yPosition) {
- m_yPosition = pagePos;
- changeY = true;
- }
-
- // Horizontal
- const qreal viewwidth = flickable->width();
- const qreal maxxextent = -flickable->maxXExtent() + flickable->minXExtent();
- pagePos = (-p->hData.move.value() + flickable->minXExtent()) / (maxxextent + viewwidth);
- pageSize = viewwidth / (maxxextent + viewwidth);
-
- if (pageSize != m_widthRatio) {
- m_widthRatio = pageSize;
- changeWidth = true;
- }
- if (pagePos != m_xPosition) {
- m_xPosition = pagePos;
- changeX = true;
- }
-
- if (changeX)
- emit xPositionChanged(m_xPosition);
- if (changeY)
- emit yPositionChanged(m_yPosition);
- if (changeWidth)
- emit widthRatioChanged(m_widthRatio);
- if (changeHeight)
- emit heightRatioChanged(m_heightRatio);
-}
-
-
-QDeclarativeFlickablePrivate::QDeclarativeFlickablePrivate()
- : contentItem(new QDeclarativeItem)
- , hData(this, &QDeclarativeFlickablePrivate::setRoundedViewportX)
- , vData(this, &QDeclarativeFlickablePrivate::setRoundedViewportY)
- , flickingHorizontally(false), flickingVertically(false)
- , hMoved(false), vMoved(false)
- , movingHorizontally(false), movingVertically(false)
- , stealMouse(false), pressed(false), interactive(true), calcVelocity(false)
- , deceleration(QML_FLICK_DEFAULTDECELERATION)
- , maxVelocity(QML_FLICK_DEFAULTMAXVELOCITY), reportedVelocitySmoothing(100)
- , delayedPressEvent(0), delayedPressTarget(0), pressDelay(0), fixupDuration(400)
- , fixupMode(Normal), vTime(0), visibleArea(0)
- , flickableDirection(QDeclarativeFlickable::AutoFlickDirection)
- , boundsBehavior(QDeclarativeFlickable::DragAndOvershootBounds)
-{
-}
-
-void QDeclarativeFlickablePrivate::init()
-{
- Q_Q(QDeclarativeFlickable);
- QDeclarative_setParent_noEvent(contentItem, q);
- contentItem->setParentItem(q);
- static int timelineUpdatedIdx = -1;
- static int timelineCompletedIdx = -1;
- static int flickableTickedIdx = -1;
- static int flickableMovementEndingIdx = -1;
- if (timelineUpdatedIdx == -1) {
- timelineUpdatedIdx = QDeclarativeTimeLine::staticMetaObject.indexOfSignal("updated()");
- timelineCompletedIdx = QDeclarativeTimeLine::staticMetaObject.indexOfSignal("completed()");
- flickableTickedIdx = QDeclarativeFlickable::staticMetaObject.indexOfSlot("ticked()");
- flickableMovementEndingIdx = QDeclarativeFlickable::staticMetaObject.indexOfSlot("movementEnding()");
- }
- QMetaObject::connect(&timeline, timelineUpdatedIdx,
- q, flickableTickedIdx, Qt::DirectConnection);
- QMetaObject::connect(&timeline, timelineCompletedIdx,
- q, flickableMovementEndingIdx, Qt::DirectConnection);
- q->setAcceptedMouseButtons(Qt::LeftButton);
- q->setFiltersChildEvents(true);
- QDeclarativeItemPrivate *viewportPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(contentItem));
- viewportPrivate->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
- lastPosTime.invalidate();
-}
-
-/*
- Returns the amount to overshoot by given a view size.
- Will be up to the lesser of 1/3 of the view size or QML_FLICK_OVERSHOOT
-*/
-qreal QDeclarativeFlickablePrivate::overShootDistance(qreal size)
-{
- if (maxVelocity <= 0)
- return 0.0;
-
- return qMin(qreal(QML_FLICK_OVERSHOOT), size/3);
-}
-
-void QDeclarativeFlickablePrivate::AxisData::addVelocitySample(qreal v, qreal maxVelocity)
-{
- if (v > maxVelocity)
- v = maxVelocity;
- else if (v < -maxVelocity)
- v = -maxVelocity;
- velocityBuffer.append(v);
- if (velocityBuffer.count() > QML_FLICK_SAMPLEBUFFER)
- velocityBuffer.remove(0);
-}
-
-void QDeclarativeFlickablePrivate::AxisData::updateVelocity()
-{
- if (velocityBuffer.count() > QML_FLICK_DISCARDSAMPLES) {
- velocity = 0;
- int count = velocityBuffer.count()-QML_FLICK_DISCARDSAMPLES;
- for (int i = 0; i < count; ++i) {
- qreal v = velocityBuffer.at(i);
- velocity += v;
- }
- velocity /= count;
- }
-}
-
-void QDeclarativeFlickablePrivate::itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeom, const QRectF &oldGeom)
-{
- Q_Q(QDeclarativeFlickable);
- if (item == contentItem) {
- if (newGeom.x() != oldGeom.x())
- emit q->contentXChanged();
- if (newGeom.y() != oldGeom.y())
- emit q->contentYChanged();
- }
-}
-
-void QDeclarativeFlickablePrivate::flickX(qreal velocity)
-{
- Q_Q(QDeclarativeFlickable);
- flick(hData, q->minXExtent(), q->maxXExtent(), q->width(), fixupX_callback, velocity);
-}
-
-void QDeclarativeFlickablePrivate::flickY(qreal velocity)
-{
- Q_Q(QDeclarativeFlickable);
- flick(vData, q->minYExtent(), q->maxYExtent(), q->height(), fixupY_callback, velocity);
-}
-
-void QDeclarativeFlickablePrivate::flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal,
- QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity)
-{
- Q_Q(QDeclarativeFlickable);
- qreal maxDistance = -1;
- data.fixingUp = false;
- // -ve velocity means list is moving up
- if (velocity > 0) {
- maxDistance = qAbs(minExtent - data.move.value());
- data.flickTarget = minExtent;
- } else {
- maxDistance = qAbs(maxExtent - data.move.value());
- data.flickTarget = maxExtent;
- }
- if (maxDistance > 0) {
- qreal v = velocity;
- if (maxVelocity != -1 && maxVelocity < qAbs(v)) {
- if (v < 0)
- v = -maxVelocity;
- else
- v = maxVelocity;
- }
- timeline.reset(data.move);
- if (boundsBehavior == QDeclarativeFlickable::DragAndOvershootBounds)
- timeline.accel(data.move, v, deceleration);
- else
- timeline.accel(data.move, v, deceleration, maxDistance);
- timeline.callback(QDeclarativeTimeLineCallback(&data.move, fixupCallback, this));
- if (!flickingHorizontally && q->xflick()) {
- flickingHorizontally = true;
- emit q->flickingChanged();
- emit q->flickingHorizontallyChanged();
- if (!flickingVertically)
- emit q->flickStarted();
- }
- if (!flickingVertically && q->yflick()) {
- flickingVertically = true;
- emit q->flickingChanged();
- emit q->flickingVerticallyChanged();
- if (!flickingHorizontally)
- emit q->flickStarted();
- }
- } else {
- timeline.reset(data.move);
- fixup(data, minExtent, maxExtent);
- }
-}
-
-void QDeclarativeFlickablePrivate::fixupY_callback(void *data)
-{
- ((QDeclarativeFlickablePrivate *)data)->fixupY();
-}
-
-void QDeclarativeFlickablePrivate::fixupX_callback(void *data)
-{
- ((QDeclarativeFlickablePrivate *)data)->fixupX();
-}
-
-void QDeclarativeFlickablePrivate::fixupX()
-{
- Q_Q(QDeclarativeFlickable);
- fixup(hData, q->minXExtent(), q->maxXExtent());
-}
-
-void QDeclarativeFlickablePrivate::fixupY()
-{
- Q_Q(QDeclarativeFlickable);
- fixup(vData, q->minYExtent(), q->maxYExtent());
-}
-
-void QDeclarativeFlickablePrivate::fixup(AxisData &data, qreal minExtent, qreal maxExtent)
-{
- if (data.move.value() > minExtent || maxExtent > minExtent) {
- timeline.reset(data.move);
- if (data.move.value() != minExtent) {
- switch (fixupMode) {
- case Immediate:
- timeline.set(data.move, minExtent);
- break;
- case ExtentChanged:
- // The target has changed. Don't start from the beginning; just complete the
- // second half of the animation using the new extent.
- timeline.move(data.move, minExtent, QEasingCurve(QEasingCurve::OutExpo), 3*fixupDuration/4);
- data.fixingUp = true;
- break;
- default: {
- qreal dist = minExtent - data.move;
- timeline.move(data.move, minExtent - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4);
- timeline.move(data.move, minExtent, QEasingCurve(QEasingCurve::OutExpo), 3*fixupDuration/4);
- data.fixingUp = true;
- }
- }
- }
- } else if (data.move.value() < maxExtent) {
- timeline.reset(data.move);
- switch (fixupMode) {
- case Immediate:
- timeline.set(data.move, maxExtent);
- break;
- case ExtentChanged:
- // The target has changed. Don't start from the beginning; just complete the
- // second half of the animation using the new extent.
- timeline.move(data.move, maxExtent, QEasingCurve(QEasingCurve::OutExpo), 3*fixupDuration/4);
- data.fixingUp = true;
- break;
- default: {
- qreal dist = maxExtent - data.move;
- timeline.move(data.move, maxExtent - dist/2, QEasingCurve(QEasingCurve::InQuad), fixupDuration/4);
- timeline.move(data.move, maxExtent, QEasingCurve(QEasingCurve::OutExpo), 3*fixupDuration/4);
- data.fixingUp = true;
- }
- }
- }
- data.inOvershoot = false;
- fixupMode = Normal;
- vTime = timeline.time();
-}
-
-void QDeclarativeFlickablePrivate::updateBeginningEnd()
-{
- Q_Q(QDeclarativeFlickable);
- bool atBoundaryChange = false;
-
- // Vertical
- const int maxyextent = int(-q->maxYExtent());
- const qreal ypos = -vData.move.value();
- bool atBeginning = (ypos <= -q->minYExtent());