diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/auto.pro | 1 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/declarative.pro | 52 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp | 3 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro | 6 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro | 14 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro | 6 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp | 6 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp | 3 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp | 4 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro | 6 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qmlmin/tst_qmlmin.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qquickanimatedimage/qquickanimatedimage.pro | 13 | ||||
-rw-r--r-- | tests/auto/declarative/qquickborderimage/qquickborderimage.pro | 14 | ||||
-rw-r--r-- | tests/auto/declarative/qquickimage/qquickimage.pro | 13 | ||||
-rw-r--r-- | tests/auto/declarative/qquickmousearea/qquickmousearea.pro | 14 | ||||
-rw-r--r-- | tests/auto/declarative/qquicktext/qquicktext.pro | 17 | ||||
-rw-r--r-- | tests/auto/declarative/qquicktextedit/qquicktextedit.pro | 12 | ||||
-rw-r--r-- | tests/auto/declarative/v4/tst_v4.cpp | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickage/qquickage.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickangleddirection/qquickangleddirection.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickfriction/qquickfriction.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickgravity/qquickgravity.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickimageparticle/qquickimageparticle.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickitemparticle/qquickitemparticle.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquicklineextruder/qquicklineextruder.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickpointattractor/qquickpointattractor.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickpointdirection/qquickpointdirection.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickturbulence/qquickturbulence.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/qquickwander/qquickwander.pro | 2 | ||||
-rw-r--r-- | tests/auto/particles/shared/particlestestsshared.h | 2 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro | 6 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro | 6 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/examples/data/dummytest.qml (renamed from tests/auto/declarative/examples/data/dummytest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/examples/data/webbrowser/webbrowser.qml (renamed from tests/auto/declarative/examples/data/webbrowser/webbrowser.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/examples/examples.pro (renamed from tests/auto/declarative/examples/examples.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/examples/tst_examples.cpp (renamed from tests/auto/declarative/examples/tst_examples.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/geometry/geometry.pro (renamed from tests/auto/declarative/geometry/geometry.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/geometry/tst_geometry.cpp (renamed from tests/auto/declarative/geometry/tst_geometry.cpp) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/nodes/nodes.pro (renamed from tests/auto/declarative/nodes/nodes.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/nodes/tst_nodestest.cpp (renamed from tests/auto/declarative/nodes/tst_nodestest.cpp) | 8 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/Double.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/Double.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/attached.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/attached.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/badproperty1.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/badproperty2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/badtype1.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/badtype2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/badtype3.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/badtype4.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/disabledTransition.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/disabledTransition.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/dontAutoStart.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/dontStart.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/dontStart2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/dotproperty.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/doubleRegistrationBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype1.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/nonTransitionBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathAnimation.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathAnimation2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimationNoStart.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathAnimationNoStart.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolator.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathInterpolator.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolatorBack.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathInterpolatorBack.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/pathTransition.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pathTransition.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/pauseBindingBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pauseBindingBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/pauseBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/pauseBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/properties.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/properties2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/properties3.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/properties4.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/properties5.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/properties5.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition3.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition4.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition5.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition6.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition7.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/registrationBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/rotation.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/rotation.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/runningTrueBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/transitionAssignmentBug.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/valuesource.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/data/valuesource2.qml (renamed from tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro (renamed from tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp (renamed from tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp) | 16 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeapplication/qdeclarativeapplication.pro (renamed from tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp (renamed from tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/binding.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/binding.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/color.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/color.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/cpptrigger.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/delayedRegistration.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/delayedRegistration.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/disabled.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/dontStart.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/empty.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/empty.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/explicit.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty2.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/groupedPropertyCrash.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/loop.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/loop.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/nonSelecting2.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/parent.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/parent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/qtbug12295.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/reassignedAnimation.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/runningTrue.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/scripttrigger.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/simple.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/simple.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/startOnCompleted.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/startOnCompleted.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/startup.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/startup.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/startup2.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/data/valueType.qml (renamed from tests/auto/declarative/qdeclarativebehaviors/data/valueType.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro (renamed from tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp (renamed from tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp) | 12 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativefontloader/data/daniel.ttf (renamed from tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf) | bin | 51984 -> 51984 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativefontloader/data/dummy.ttf (renamed from tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativefontloader/data/qtbug-20268.qml (renamed from tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativefontloader/data/tarzeau_ocr_a.ttf (renamed from tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf) | bin | 24544 -> 24544 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro | 14 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp (renamed from tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp) | 10 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepath/data/arc.qml (renamed from tests/auto/declarative/qdeclarativepath/data/arc.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepath/data/curve.qml (renamed from tests/auto/declarative/qdeclarativepath/data/curve.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepath/data/svg.qml (renamed from tests/auto/declarative/qdeclarativepath/data/svg.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro (renamed from tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp (renamed from tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/exists.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/exists.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/exists1.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/exists2.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists1.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists1.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists2.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists2.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists3.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists3.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists4.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists4.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists5.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists5.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists6.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists6.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists7.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists7.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists8.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/http/exists8.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/data/massive.png (renamed from tests/auto/declarative/qdeclarativepixmapcache/data/massive.png) | bin | 31834 -> 31834 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro (renamed from tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro) | 8 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp (renamed from tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp (renamed from tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation1.qml (renamed from tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation2.qml (renamed from tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation3.qml (renamed from tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro (renamed from tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp (renamed from tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/ExtendedRectangle.qml (renamed from tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/Implementation/MyType.qml (renamed from tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/Implementation/images/qt-logo.png (renamed from tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png) | bin | 5149 -> 5149 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/QTBUG-14830.qml (renamed from tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/anchorChanges1.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/anchorChanges2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/anchorChanges3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/anchorChanges4.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/anchorChanges5.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/anchorChangesCrash.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/attachedPropertyChanges.qml (renamed from tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml (renamed from tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/avoidFastForward.qml (renamed from tests/auto/declarative/qdeclarativestates/data/avoidFastForward.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicBinding.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicBinding.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicBinding2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicBinding3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicBinding4.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicChanges.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicChanges.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicChanges2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicChanges3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicChanges4.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/basicExtension.qml (renamed from tests/auto/declarative/qdeclarativestates/data/basicExtension.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/deleting.qml (renamed from tests/auto/declarative/qdeclarativestates/data/deleting.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/deletingState.qml (renamed from tests/auto/declarative/qdeclarativestates/data/deletingState.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/editProperties.qml (renamed from tests/auto/declarative/qdeclarativestates/data/editProperties.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/explicit.qml (renamed from tests/auto/declarative/qdeclarativestates/data/explicit.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/extendsBug.qml (renamed from tests/auto/declarative/qdeclarativestates/data/extendsBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/fakeExtension.qml (renamed from tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/illegalObj.qml (renamed from tests/auto/declarative/qdeclarativestates/data/illegalObj.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/illegalTempState.qml (renamed from tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/image.png (renamed from tests/auto/declarative/qdeclarativestates/data/image.png) | bin | 173 -> 173 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/legalTempState.qml (renamed from tests/auto/declarative/qdeclarativestates/data/legalTempState.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/nonExistantProp.qml (renamed from tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/parentChange1.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/parentChange2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/parentChange3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/parentChange4.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/parentChange5.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange5.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/parentChange6.qml (renamed from tests/auto/declarative/qdeclarativestates/data/parentChange6.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/propertyErrors.qml (renamed from tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/reset.qml (renamed from tests/auto/declarative/qdeclarativestates/data/reset.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/restoreEntryValues.qml (renamed from tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/returnToBase.qml (renamed from tests/auto/declarative/qdeclarativestates/data/returnToBase.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/revertListBug.qml (renamed from tests/auto/declarative/qdeclarativestates/data/revertListBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/script.qml (renamed from tests/auto/declarative/qdeclarativestates/data/script.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/signalOverride.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverride.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/signalOverride2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash2.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash3.qml (renamed from tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/unnamedWhen.qml (renamed from tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/urlResolution.qml (renamed from tests/auto/declarative/qdeclarativestates/data/urlResolution.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/data/whenOrdering.qml (renamed from tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro (renamed from tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp (renamed from tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp) | 10 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestyledtext/qdeclarativestyledtext.pro (renamed from tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp (renamed from tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesystempalette/qdeclarativesystempalette.pro (renamed from tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp (renamed from tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativetimer/qdeclarativetimer.pro (renamed from tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativetimer/tst_qdeclarativetimer.cpp (renamed from tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/empty.xml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/empty.xml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/get.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/get.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.xml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/model2.xml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/propertychanges.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.xml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleCrash.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/roleCrash.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleErrors.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleKeys.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/testtypes.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/data/unique.qml (renamed from tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro (renamed from tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp (renamed from tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/anchors.qml (renamed from tests/auto/declarative/qquickanchors/data/anchors.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/centerin.qml (renamed from tests/auto/declarative/qquickanchors/data/centerin.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/centerinRotation.qml (renamed from tests/auto/declarative/qquickanchors/data/centerinRotation.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/crash1.qml (renamed from tests/auto/declarative/qquickanchors/data/crash1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/fill.qml (renamed from tests/auto/declarative/qquickanchors/data/fill.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/hvCenter.qml (renamed from tests/auto/declarative/qquickanchors/data/hvCenter.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/loop1.qml (renamed from tests/auto/declarative/qquickanchors/data/loop1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/loop2.qml (renamed from tests/auto/declarative/qquickanchors/data/loop2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/data/margins.qml (renamed from tests/auto/declarative/qquickanchors/data/margins.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/qquickanchors.pro (renamed from tests/auto/declarative/qquickanchors/qquickanchors.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp (renamed from tests/auto/declarative/qquickanchors/tst_qquickanchors.cpp) | 12 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/colors.gif (renamed from tests/auto/declarative/qquickanimatedimage/data/colors.gif) | bin | 505 -> 505 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/colors.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/colors.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/hearts.gif (renamed from tests/auto/declarative/qquickanimatedimage/data/hearts.gif) | bin | 6524 -> 6524 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/hearts.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/hearts.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/qmldir (renamed from tests/auto/declarative/qquickanimatedimage/data/qmldir) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/qtbug-16520.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/qtbug-16520.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/stickman.gif (renamed from tests/auto/declarative/qquickanimatedimage/data/stickman.gif) | bin | 164923 -> 164923 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/stickman.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickman.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/stickmanerror1.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickmanerror1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/stickmanpause.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickmanpause.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/stickmanscaled.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickmanscaled.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/data/stickmanstopped.qml (renamed from tests/auto/declarative/qquickanimatedimage/data/stickmanstopped.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro | 13 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp (renamed from tests/auto/declarative/qquickanimatedimage/tst_qquickanimatedimage.cpp) | 8 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/data/colors-mirror.png (renamed from tests/auto/declarative/qquickborderimage/data/colors-mirror.png) | bin | 5554 -> 5554 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/data/colors-round-quotes.sci (renamed from tests/auto/declarative/qquickborderimage/data/colors-round-quotes.sci) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/data/colors-round-remote.sci (renamed from tests/auto/declarative/qquickborderimage/data/colors-round-remote.sci) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/data/colors-round.sci (renamed from tests/auto/declarative/qquickborderimage/data/colors-round.sci) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/data/colors.png (renamed from tests/auto/declarative/qquickborderimage/data/colors.png) | bin | 1655 -> 1655 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/data/heart200.png (renamed from tests/auto/declarative/qquickborderimage/data/heart200.png) | bin | 7943 -> 7943 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/data/invalid.sci (renamed from tests/auto/declarative/qquickborderimage/data/invalid.sci) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/data/mirror.qml (renamed from tests/auto/declarative/qquickborderimage/data/mirror.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro | 14 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp (renamed from tests/auto/declarative/qquickborderimage/tst_qquickborderimage.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvas/data/window.qml (renamed from tests/auto/declarative/qquickcanvas/data/window.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro (renamed from tests/auto/declarative/qquickcanvas/qquickcanvas.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp (renamed from tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp) | 8 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.gif (renamed from tests/auto/declarative/qquickcanvasitem/data/anim-gr.gif) | bin | 241 -> 241 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.png (renamed from tests/auto/declarative/qquickcanvasitem/data/anim-gr.png) | bin | 460 -> 460 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/anim-poster-gr.png (renamed from tests/auto/declarative/qquickcanvasitem/data/anim-poster-gr.png) | bin | 422 -> 422 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/background.png (renamed from tests/auto/declarative/qquickcanvasitem/data/background.png) | bin | 86 -> 86 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/broken.png (renamed from tests/auto/declarative/qquickcanvasitem/data/broken.png) | bin | 87 -> 87 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/ggrr-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/ggrr-256x256.png) | bin | 120 -> 120 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/green-16x16.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green-16x16.png) | bin | 92 -> 92 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/green-1x1.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green-1x1.png) | bin | 82 -> 82 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/green-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green-256x256.png) | bin | 103 -> 103 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/green-2x2.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green-2x2.png) | bin | 118 -> 118 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/green.png (renamed from tests/auto/declarative/qquickcanvasitem/data/green.png) | bin | 87 -> 87 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/grgr-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/grgr-256x256.png) | bin | 130 -> 130 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/red-16x16.png (renamed from tests/auto/declarative/qquickcanvasitem/data/red-16x16.png) | bin | 130 -> 130 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/red.png (renamed from tests/auto/declarative/qquickcanvasitem/data/red.png) | bin | 87 -> 87 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/redtransparent.png (renamed from tests/auto/declarative/qquickcanvasitem/data/redtransparent.png) | bin | 109 -> 109 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/rgrg-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/rgrg-256x256.png) | bin | 131 -> 131 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/rrgg-256x256.png (renamed from tests/auto/declarative/qquickcanvasitem/data/rrgg-256x256.png) | bin | 120 -> 120 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/testhelper.js (renamed from tests/auto/declarative/qquickcanvasitem/data/testhelper.js) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/transparent.png (renamed from tests/auto/declarative/qquickcanvasitem/data/transparent.png) | bin | 100 -> 100 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/transparent50.png (renamed from tests/auto/declarative/qquickcanvasitem/data/transparent50.png) | bin | 155 -> 155 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_arc.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_arc.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_arcto.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_arcto.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_canvas.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_canvas.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_composite.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_composite.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_drawimage.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_fillStyle.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_fillStyle.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_fillrect.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_gradient.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_gradient.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_line.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_line.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_path.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_path.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_pattern.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_pattern.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_pixel.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_pixel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_shadow.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_shadow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_state.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_state.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_strokeStyle.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_strokeStyle.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_text.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_text.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_transform.qml (renamed from tests/auto/declarative/qquickcanvasitem/data/tst_transform.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/yellow.png (renamed from tests/auto/declarative/qquickcanvasitem/data/yellow.png) | bin | 95 -> 95 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/yellow75.png (renamed from tests/auto/declarative/qquickcanvasitem/data/yellow75.png) | bin | 150 -> 150 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/qquickcanvasitem.pro (renamed from tests/auto/declarative/qquickcanvasitem/qquickcanvasitem.pro) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/tst_qquickcanvasitem.cpp (renamed from tests/auto/declarative/qquickcanvasitem/tst_qquickcanvasitem.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickdrag/qquickdrag.pro (renamed from tests/auto/declarative/qquickdrag/qquickdrag.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickdrag/tst_qquickdrag.cpp (renamed from tests/auto/declarative/qquickdrag/tst_qquickdrag.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickdroparea/qquickdroparea.pro (renamed from tests/auto/declarative/qquickdroparea/qquickdroparea.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickdroparea/tst_qquickdroparea.cpp (renamed from tests/auto/declarative/qquickdroparea/tst_qquickdroparea.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/disabled.qml (renamed from tests/auto/declarative/qquickflickable/data/disabled.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/flickable01.qml (renamed from tests/auto/declarative/qquickflickable/data/flickable01.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/flickable02.qml (renamed from tests/auto/declarative/qquickflickable/data/flickable02.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/flickable03.qml (renamed from tests/auto/declarative/qquickflickable/data/flickable03.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/flickable04.qml (renamed from tests/auto/declarative/qquickflickable/data/flickable04.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/flickableqgraphicswidget.qml (renamed from tests/auto/declarative/qquickflickable/data/flickableqgraphicswidget.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/margins.qml (renamed from tests/auto/declarative/qquickflickable/data/margins.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/nestedPressDelay.qml (renamed from tests/auto/declarative/qquickflickable/data/nestedPressDelay.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/resize.qml (renamed from tests/auto/declarative/qquickflickable/data/resize.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/data/wheel.qml (renamed from tests/auto/declarative/qquickflickable/data/wheel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/qquickflickable.pro (renamed from tests/auto/declarative/qquickflickable/qquickflickable.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp (renamed from tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflipable/data/crash.qml (renamed from tests/auto/declarative/qquickflipable/data/crash.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml (renamed from tests/auto/declarative/qquickflipable/data/flipable-abort.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflipable/data/test-flipable.qml (renamed from tests/auto/declarative/qquickflipable/data/test-flipable.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflipable/qquickflipable.pro (renamed from tests/auto/declarative/qquickflipable/qquickflipable.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp (renamed from tests/auto/declarative/qquickflipable/tst_qquickflipable.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/canvasFocus.qml (renamed from tests/auto/declarative/qquickfocusscope/data/canvasFocus.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/chain.qml (renamed from tests/auto/declarative/qquickfocusscope/data/chain.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/forceActiveFocus.qml (renamed from tests/auto/declarative/qquickfocusscope/data/forceActiveFocus.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/forcefocus.qml (renamed from tests/auto/declarative/qquickfocusscope/data/forcefocus.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/qtBug13380.qml (renamed from tests/auto/declarative/qquickfocusscope/data/qtBug13380.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/signalEmission.qml (renamed from tests/auto/declarative/qquickfocusscope/data/signalEmission.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/test.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/test2.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/test3.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/test4.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/data/test5.qml (renamed from tests/auto/declarative/qquickfocusscope/data/test5.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro (renamed from tests/auto/declarative/qquickfocusscope/qquickfocusscope.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp (renamed from tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp) | 10 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/ComponentView.qml (renamed from tests/auto/declarative/qquickgridview/data/ComponentView.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/asyncloader.qml (renamed from tests/auto/declarative/qquickgridview/data/asyncloader.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/attachedSignals.qml (renamed from tests/auto/declarative/qquickgridview/data/attachedSignals.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/creationContext.qml (renamed from tests/auto/declarative/qquickgridview/data/creationContext.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/displaygrid.qml (renamed from tests/auto/declarative/qquickgridview/data/displaygrid.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/footer.qml (renamed from tests/auto/declarative/qquickgridview/data/footer.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/gridview-enforcerange.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview-enforcerange.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/gridview-initCurrent.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview-initCurrent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/gridview-noCurrent.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview-noCurrent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/gridview1.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/gridview2.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/gridview3.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/gridview4.qml (renamed from tests/auto/declarative/qquickgridview/data/gridview4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/header.qml (renamed from tests/auto/declarative/qquickgridview/data/header.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/manual-highlight.qml (renamed from tests/auto/declarative/qquickgridview/data/manual-highlight.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/margins.qml (renamed from tests/auto/declarative/qquickgridview/data/margins.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/mirroring.qml (renamed from tests/auto/declarative/qquickgridview/data/mirroring.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/propertychangestest.qml (renamed from tests/auto/declarative/qquickgridview/data/propertychangestest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/resizeview.qml (renamed from tests/auto/declarative/qquickgridview/data/resizeview.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/setindex.qml (renamed from tests/auto/declarative/qquickgridview/data/setindex.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/snapToRow.qml (renamed from tests/auto/declarative/qquickgridview/data/snapToRow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/data/unaligned.qml (renamed from tests/auto/declarative/qquickgridview/data/unaligned.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/qquickgridview.pro (renamed from tests/auto/declarative/qquickgridview/qquickgridview.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp (renamed from tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp) | 10 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/aspectratio.qml (renamed from tests/auto/declarative/qquickimage/data/aspectratio.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/big.jpeg (renamed from tests/auto/declarative/qquickimage/data/big.jpeg) | bin | 1700081 -> 1700081 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/big256.png (renamed from tests/auto/declarative/qquickimage/data/big256.png) | bin | 3566 -> 3566 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/colors.png (renamed from tests/auto/declarative/qquickimage/data/colors.png) | bin | 1655 -> 1655 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/colors1.png (renamed from tests/auto/declarative/qquickimage/data/colors1.png) | bin | 1655 -> 1655 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/green.png (renamed from tests/auto/declarative/qquickimage/data/green.png) | bin | 314 -> 314 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/heart-win32.png (renamed from tests/auto/declarative/qquickimage/data/heart-win32.png) | bin | 12621 -> 12621 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/heart.png (renamed from tests/auto/declarative/qquickimage/data/heart.png) | bin | 12577 -> 12577 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/heart.svg (renamed from tests/auto/declarative/qquickimage/data/heart.svg) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/heart200-win32.png (renamed from tests/auto/declarative/qquickimage/data/heart200-win32.png) | bin | 8062 -> 8062 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/heart200.png (renamed from tests/auto/declarative/qquickimage/data/heart200.png) | bin | 8063 -> 8063 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/htiling.qml (renamed from tests/auto/declarative/qquickimage/data/htiling.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/mirror.qml (renamed from tests/auto/declarative/qquickimage/data/mirror.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/nullpixmap.qml (renamed from tests/auto/declarative/qquickimage/data/nullpixmap.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/pattern.png (renamed from tests/auto/declarative/qquickimage/data/pattern.png) | bin | 1371 -> 1371 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/qtbug_16389.qml (renamed from tests/auto/declarative/qquickimage/data/qtbug_16389.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/qtbug_22125.qml (renamed from tests/auto/declarative/qquickimage/data/qtbug_22125.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/rect.png (renamed from tests/auto/declarative/qquickimage/data/rect.png) | bin | 171 -> 171 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/data/vtiling.qml (renamed from tests/auto/declarative/qquickimage/data/vtiling.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/qquickimage.pro | 13 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp (renamed from tests/auto/declarative/qquickimage/tst_qquickimage.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem/data/order.1.qml (renamed from tests/auto/declarative/qquickitem/data/order.1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem/data/order.2.qml (renamed from tests/auto/declarative/qquickitem/data/order.2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem/qquickitem.pro (renamed from tests/auto/declarative/qquickitem/qquickitem.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp (renamed from tests/auto/declarative/qquickitem/tst_qquickitem.cpp) | 8 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/childrenProperty.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenProperty.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/childrenRect.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenRect.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/childrenRectBug.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenRectBug.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/childrenRectBug2.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenRectBug2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/childrenRectBug3.qml (renamed from tests/auto/declarative/qquickitem2/data/childrenRectBug3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/implicitsize.qml (renamed from tests/auto/declarative/qquickitem2/data/implicitsize.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/keynavigationtest.qml (renamed from tests/auto/declarative/qquickitem2/data/keynavigationtest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/keynavigationtest_implicit.qml (renamed from tests/auto/declarative/qquickitem2/data/keynavigationtest_implicit.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/keyspriority.qml (renamed from tests/auto/declarative/qquickitem2/data/keyspriority.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/keystest.qml (renamed from tests/auto/declarative/qquickitem2/data/keystest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/layoutmirroring.qml (renamed from tests/auto/declarative/qquickitem2/data/layoutmirroring.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/mapCoordinates.qml (renamed from tests/auto/declarative/qquickitem2/data/mapCoordinates.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/propertychanges.qml (renamed from tests/auto/declarative/qquickitem2/data/propertychanges.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/qtbug_16871.qml (renamed from tests/auto/declarative/qquickitem2/data/qtbug_16871.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/resourcesProperty.qml (renamed from tests/auto/declarative/qquickitem2/data/resourcesProperty.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/data/transformCrash.qml (renamed from tests/auto/declarative/qquickitem2/data/transformCrash.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/qquickitem2.pro (renamed from tests/auto/declarative/qquickitem2/qquickitem2.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp (renamed from tests/auto/declarative/qquickitem2/tst_qquickitem.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/ComponentView.qml (renamed from tests/auto/declarative/qquicklistview/data/ComponentView.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/asyncloader.qml (renamed from tests/auto/declarative/qquicklistview/data/asyncloader.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/attachedSignals.qml (renamed from tests/auto/declarative/qquicklistview/data/attachedSignals.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/creationContext.qml (renamed from tests/auto/declarative/qquicklistview/data/creationContext.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/displaylist.qml (renamed from tests/auto/declarative/qquicklistview/data/displaylist.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/fillModelOnComponentCompleted.qml (renamed from tests/auto/declarative/qquicklistview/data/fillModelOnComponentCompleted.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/footer.qml (renamed from tests/auto/declarative/qquicklistview/data/footer.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/header.qml (renamed from tests/auto/declarative/qquicklistview/data/header.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/headerfooter.qml (renamed from tests/auto/declarative/qquicklistview/data/headerfooter.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/itemlist.qml (renamed from tests/auto/declarative/qquicklistview/data/itemlist.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/listview-enforcerange-nohighlight.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-enforcerange-nohighlight.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/listview-enforcerange.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-enforcerange.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/listview-initCurrent.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-initCurrent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/listview-noCurrent.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-noCurrent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/listview-sections.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-sections.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/listview-sections_delegate.qml (renamed from tests/auto/declarative/qquicklistview/data/listview-sections_delegate.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/listviewtest.qml (renamed from tests/auto/declarative/qquicklistview/data/listviewtest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/manual-highlight.qml (renamed from tests/auto/declarative/qquicklistview/data/manual-highlight.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/margins.qml (renamed from tests/auto/declarative/qquicklistview/data/margins.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/propertychangestest.qml (renamed from tests/auto/declarative/qquicklistview/data/propertychangestest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/qtbug-21742.qml (renamed from tests/auto/declarative/qquicklistview/data/qtbug-21742.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/qtbug14821.qml (renamed from tests/auto/declarative/qquicklistview/data/qtbug14821.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/qtbug16037.qml (renamed from tests/auto/declarative/qquicklistview/data/qtbug16037.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/resizeview.qml (renamed from tests/auto/declarative/qquicklistview/data/resizeview.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/rightToLeft.qml (renamed from tests/auto/declarative/qquicklistview/data/rightToLeft.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/sizelessthan1.qml (renamed from tests/auto/declarative/qquicklistview/data/sizelessthan1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/snapToItem.qml (renamed from tests/auto/declarative/qquicklistview/data/snapToItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/data/strictlyenforcerange.qml (renamed from tests/auto/declarative/qquicklistview/data/strictlyenforcerange.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/incrementalmodel.cpp (renamed from tests/auto/declarative/qquicklistview/incrementalmodel.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/incrementalmodel.h (renamed from tests/auto/declarative/qquicklistview/incrementalmodel.h) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/qquicklistview.pro (renamed from tests/auto/declarative/qquicklistview/qquicklistview.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp (renamed from tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp) | 14 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/ActiveComponent.qml (renamed from tests/auto/declarative/qquickloader/data/ActiveComponent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/AnchoredLoader.qml (renamed from tests/auto/declarative/qquickloader/data/AnchoredLoader.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/BigComponent.qml (renamed from tests/auto/declarative/qquickloader/data/BigComponent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/BlueRect.qml (renamed from tests/auto/declarative/qquickloader/data/BlueRect.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/CreationContextLoader.qml (renamed from tests/auto/declarative/qquickloader/data/CreationContextLoader.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/GraphicsWidget250x250.qml (renamed from tests/auto/declarative/qquickloader/data/GraphicsWidget250x250.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/GreenRect.qml (renamed from tests/auto/declarative/qquickloader/data/GreenRect.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/InitialPropertyValuesComponent.qml (renamed from tests/auto/declarative/qquickloader/data/InitialPropertyValuesComponent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/InvalidSourceComponent.qml (renamed from tests/auto/declarative/qquickloader/data/InvalidSourceComponent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/NoResize.qml (renamed from tests/auto/declarative/qquickloader/data/NoResize.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/NoResizeGraphicsWidget.qml (renamed from tests/auto/declarative/qquickloader/data/NoResizeGraphicsWidget.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/QTBUG_16928.qml (renamed from tests/auto/declarative/qquickloader/data/QTBUG_16928.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/QTBUG_17114.qml (renamed from tests/auto/declarative/qquickloader/data/QTBUG_17114.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/Rect120x60.qml (renamed from tests/auto/declarative/qquickloader/data/Rect120x60.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/SetSourceComponent.qml (renamed from tests/auto/declarative/qquickloader/data/SetSourceComponent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/SizeGraphicsWidgetToLoader.qml (renamed from tests/auto/declarative/qquickloader/data/SizeGraphicsWidgetToLoader.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/SizeLoaderToGraphicsWidget.qml (renamed from tests/auto/declarative/qquickloader/data/SizeLoaderToGraphicsWidget.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/SizeToItem.qml (renamed from tests/auto/declarative/qquickloader/data/SizeToItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/SizeToLoader.qml (renamed from tests/auto/declarative/qquickloader/data/SizeToLoader.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/VmeError.qml (renamed from tests/auto/declarative/qquickloader/data/VmeError.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/active.1.qml (renamed from tests/auto/declarative/qquickloader/data/active.1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/active.2.qml (renamed from tests/auto/declarative/qquickloader/data/active.2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/active.3.qml (renamed from tests/auto/declarative/qquickloader/data/active.3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/active.4.qml (renamed from tests/auto/declarative/qquickloader/data/active.4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/active.5.qml (renamed from tests/auto/declarative/qquickloader/data/active.5.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/active.6.qml (renamed from tests/auto/declarative/qquickloader/data/active.6.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/active.7.qml (renamed from tests/auto/declarative/qquickloader/data/active.7.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/active.8.qml (renamed from tests/auto/declarative/qquickloader/data/active.8.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/asynchronous.qml (renamed from tests/auto/declarative/qquickloader/data/asynchronous.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/crash.qml (renamed from tests/auto/declarative/qquickloader/data/crash.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/creationContext.qml (renamed from tests/auto/declarative/qquickloader/data/creationContext.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/differentorigin.qml (renamed from tests/auto/declarative/qquickloader/data/differentorigin.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/implicitSize.qml (renamed from tests/auto/declarative/qquickloader/data/implicitSize.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.1.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.2.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.3.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.4.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.5.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.5.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.6.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.6.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.7.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.7.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.8.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.8.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.binding.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.binding.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.1.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.2.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.3.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.4.qml (renamed from tests/auto/declarative/qquickloader/data/initialPropertyValues.error.4.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/nonItem.qml (renamed from tests/auto/declarative/qquickloader/data/nonItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/parented.qml (renamed from tests/auto/declarative/qquickloader/data/parented.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/qmldir (renamed from tests/auto/declarative/qquickloader/data/qmldir) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/sameorigin-load.qml (renamed from tests/auto/declarative/qquickloader/data/sameorigin-load.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/sameorigin.qml (renamed from tests/auto/declarative/qquickloader/data/sameorigin.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/data/vmeErrors.qml (renamed from tests/auto/declarative/qquickloader/data/vmeErrors.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/qquickloader.pro (renamed from tests/auto/declarative/qquickloader/qquickloader.pro) | 8 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp (renamed from tests/auto/declarative/qquickloader/tst_qquickloader.cpp) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/clickThrough.qml (renamed from tests/auto/declarative/qquickmousearea/data/clickThrough.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/clickThrough2.qml (renamed from tests/auto/declarative/qquickmousearea/data/clickThrough2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/clickandhold.qml (renamed from tests/auto/declarative/qquickmousearea/data/clickandhold.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/clicktwice.qml (renamed from tests/auto/declarative/qquickmousearea/data/clicktwice.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/doubleclick.qml (renamed from tests/auto/declarative/qquickmousearea/data/doubleclick.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/dragging.qml (renamed from tests/auto/declarative/qquickmousearea/data/dragging.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/dragproperties.qml (renamed from tests/auto/declarative/qquickmousearea/data/dragproperties.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/dragreset.qml (renamed from tests/auto/declarative/qquickmousearea/data/dragreset.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/hoverPosition.qml (renamed from tests/auto/declarative/qquickmousearea/data/hoverPosition.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/hoverPropagation.qml (renamed from tests/auto/declarative/qquickmousearea/data/hoverPropagation.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/noclickandhold.qml (renamed from tests/auto/declarative/qquickmousearea/data/noclickandhold.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/pressedCanceled.qml (renamed from tests/auto/declarative/qquickmousearea/data/pressedCanceled.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/pressedOrdering.qml (renamed from tests/auto/declarative/qquickmousearea/data/pressedOrdering.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/preventstealing.qml (renamed from tests/auto/declarative/qquickmousearea/data/preventstealing.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/rejectEvent.qml (renamed from tests/auto/declarative/qquickmousearea/data/rejectEvent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnClick.qml (renamed from tests/auto/declarative/qquickmousearea/data/updateMousePosOnClick.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnResize.qml (renamed from tests/auto/declarative/qquickmousearea/data/updateMousePosOnResize.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro | 14 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp (renamed from tests/auto/declarative/qquickmousearea/tst_qquickmousearea.cpp) | 8 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/inFlickable.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmultipointtoucharea/data/nested.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/nested.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmultipointtoucharea/data/nonOverlapping.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/nonOverlapping.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmultipointtoucharea/data/properties.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/properties.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml (renamed from tests/auto/declarative/qquickmultipointtoucharea/data/signalTest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmultipointtoucharea/qquickmultipointtoucharea.pro (renamed from tests/auto/declarative/qquickmultipointtoucharea/qquickmultipointtoucharea.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp (renamed from tests/auto/declarative/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/ComponentView.qml (renamed from tests/auto/declarative/qquickpathview/data/ComponentView.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/asyncloader.qml (renamed from tests/auto/declarative/qquickpathview/data/asyncloader.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/closedPath.qml (renamed from tests/auto/declarative/qquickpathview/data/closedPath.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/creationContext.qml (renamed from tests/auto/declarative/qquickpathview/data/creationContext.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/datamodel.qml (renamed from tests/auto/declarative/qquickpathview/data/datamodel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/displaypath.qml (renamed from tests/auto/declarative/qquickpathview/data/displaypath.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/dragpath.qml (renamed from tests/auto/declarative/qquickpathview/data/dragpath.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/emptymodel.qml (renamed from tests/auto/declarative/qquickpathview/data/emptymodel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/missingPercent.qml (renamed from tests/auto/declarative/qquickpathview/data/missingPercent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/openPath.qml (renamed from tests/auto/declarative/qquickpathview/data/openPath.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathUpdate.qml (renamed from tests/auto/declarative/qquickpathview/data/pathUpdate.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathUpdateOnStartChanged.qml (renamed from tests/auto/declarative/qquickpathview/data/pathUpdateOnStartChanged.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathline.qml (renamed from tests/auto/declarative/qquickpathview/data/pathline.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathtest.qml (renamed from tests/auto/declarative/qquickpathview/data/pathtest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathview0.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview0.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathview1.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathview2.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathview3.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview3.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/pathview_package.qml (renamed from tests/auto/declarative/qquickpathview/data/pathview_package.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/propertychanges.qml (renamed from tests/auto/declarative/qquickpathview/data/propertychanges.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/treemodel.qml (renamed from tests/auto/declarative/qquickpathview/data/treemodel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/undefinedpath.qml (renamed from tests/auto/declarative/qquickpathview/data/undefinedpath.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/data/vdm.qml (renamed from tests/auto/declarative/qquickpathview/data/vdm.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/qquickpathview.pro (renamed from tests/auto/declarative/qquickpathview/qquickpathview.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp (renamed from tests/auto/declarative/qquickpathview/tst_qquickpathview.cpp) | 12 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpincharea/data/pinchproperties.qml (renamed from tests/auto/declarative/qquickpincharea/data/pinchproperties.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro (renamed from tests/auto/declarative/qquickpincharea/qquickpincharea.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp (renamed from tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/allInvisible.qml (renamed from tests/auto/declarative/qquickpositioners/data/allInvisible.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/attachedproperties-column.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-column.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/attachedproperties-dynamic.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-dynamic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/attachedproperties-flow.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-flow.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/attachedproperties-grid.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-grid.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/attachedproperties-row.qml (renamed from tests/auto/declarative/qquickpositioners/data/attachedproperties-row.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/flow-testimplicitsize.qml (renamed from tests/auto/declarative/qquickpositioners/data/flow-testimplicitsize.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/flowtest-toptobottom.qml (renamed from tests/auto/declarative/qquickpositioners/data/flowtest-toptobottom.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/flowtest.qml (renamed from tests/auto/declarative/qquickpositioners/data/flowtest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/grid-animated.qml (renamed from tests/auto/declarative/qquickpositioners/data/grid-animated.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/grid-row-column-spacing.qml (renamed from tests/auto/declarative/qquickpositioners/data/grid-row-column-spacing.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/grid-spacing.qml (renamed from tests/auto/declarative/qquickpositioners/data/grid-spacing.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/grid-toptobottom.qml (renamed from tests/auto/declarative/qquickpositioners/data/grid-toptobottom.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/gridtest.qml (renamed from tests/auto/declarative/qquickpositioners/data/gridtest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/gridzerocolumns.qml (renamed from tests/auto/declarative/qquickpositioners/data/gridzerocolumns.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/horizontal-animated-disabled.qml (renamed from tests/auto/declarative/qquickpositioners/data/horizontal-animated-disabled.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/horizontal-animated.qml (renamed from tests/auto/declarative/qquickpositioners/data/horizontal-animated.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/horizontal-spacing.qml (renamed from tests/auto/declarative/qquickpositioners/data/horizontal-spacing.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/horizontal.qml (renamed from tests/auto/declarative/qquickpositioners/data/horizontal.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/propertychangestest.qml (renamed from tests/auto/declarative/qquickpositioners/data/propertychangestest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/rectangleComponent.qml (renamed from tests/auto/declarative/qquickpositioners/data/rectangleComponent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/repeatertest.qml (renamed from tests/auto/declarative/qquickpositioners/data/repeatertest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/vertical-animated.qml (renamed from tests/auto/declarative/qquickpositioners/data/vertical-animated.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/vertical-spacing.qml (renamed from tests/auto/declarative/qquickpositioners/data/vertical-spacing.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/data/vertical.qml (renamed from tests/auto/declarative/qquickpositioners/data/vertical.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro (renamed from tests/auto/declarative/qquickpositioners/qquickpositioners.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp (renamed from tests/auto/declarative/qquickpositioners/tst_qquickpositioners.cpp) | 10 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/asyncloader.qml (renamed from tests/auto/declarative/qquickrepeater/data/asyncloader.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/initparent.qml (renamed from tests/auto/declarative/qquickrepeater/data/initparent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/intmodel.qml (renamed from tests/auto/declarative/qquickrepeater/data/intmodel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/itemlist.qml (renamed from tests/auto/declarative/qquickrepeater/data/itemlist.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/modelChanged.qml (renamed from tests/auto/declarative/qquickrepeater/data/modelChanged.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/objlist.qml (renamed from tests/auto/declarative/qquickrepeater/data/objlist.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/properties.qml (renamed from tests/auto/declarative/qquickrepeater/data/properties.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/repeater1.qml (renamed from tests/auto/declarative/qquickrepeater/data/repeater1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/data/repeater2.qml (renamed from tests/auto/declarative/qquickrepeater/data/repeater2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro (renamed from tests/auto/declarative/qquickrepeater/qquickrepeater.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp (renamed from tests/auto/declarative/qquickrepeater/tst_qquickrepeater.cpp) | 7 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickshadereffect/qquickshadereffect.pro (renamed from tests/auto/declarative/qquickshadereffect/qquickshadereffect.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickshadereffect/tst_qquickshadereffect.cpp (renamed from tests/auto/declarative/qquickshadereffect/tst_qquickshadereffect.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickspriteimage/data/basic.qml (renamed from tests/auto/declarative/qquickspriteimage/data/basic.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickspriteimage/data/squarefacesprite.png (renamed from tests/auto/declarative/qquickspriteimage/data/squarefacesprite.png) | bin | 496 -> 496 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro (renamed from tests/auto/declarative/qquickspriteimage/qquickspriteimage.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp (renamed from tests/auto/declarative/qquickspriteimage/tst_qquickspriteimage.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments.qml (renamed from tests/auto/declarative/qquicktext/data/alignments.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_cb.png (renamed from tests/auto/declarative/qquicktext/data/alignments_cb.png) | bin | 496 -> 496 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_cc.png (renamed from tests/auto/declarative/qquicktext/data/alignments_cc.png) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_ct.png (renamed from tests/auto/declarative/qquicktext/data/alignments_ct.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_lb.png (renamed from tests/auto/declarative/qquicktext/data/alignments_lb.png) | bin | 496 -> 496 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_lc.png (renamed from tests/auto/declarative/qquicktext/data/alignments_lc.png) | bin | 535 -> 535 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_lt.png (renamed from tests/auto/declarative/qquicktext/data/alignments_lt.png) | bin | 514 -> 514 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_rb.png (renamed from tests/auto/declarative/qquicktext/data/alignments_rb.png) | bin | 505 -> 505 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_rc.png (renamed from tests/auto/declarative/qquicktext/data/alignments_rc.png) | bin | 559 -> 559 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/alignments_rt.png (renamed from tests/auto/declarative/qquicktext/data/alignments_rt.png) | bin | 539 -> 539 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/embeddedImagesLocal.qml (renamed from tests/auto/declarative/qquicktext/data/embeddedImagesLocal.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/embeddedImagesLocalError.qml (renamed from tests/auto/declarative/qquicktext/data/embeddedImagesLocalError.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/embeddedImagesRemote.qml (renamed from tests/auto/declarative/qquicktext/data/embeddedImagesRemote.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/embeddedImagesRemoteError.qml (renamed from tests/auto/declarative/qquicktext/data/embeddedImagesRemoteError.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qquicktext/data/horizontalAlignment_RightToLeft.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/http/exists.png (renamed from tests/auto/declarative/qquicktext/data/http/exists.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/lineCount.qml (renamed from tests/auto/declarative/qquicktext/data/lineCount.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/lineHeight.qml (renamed from tests/auto/declarative/qquicktext/data/lineHeight.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/lineLayout.qml (renamed from tests/auto/declarative/qquicktext/data/lineLayout.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/multilineelide.qml (renamed from tests/auto/declarative/qquicktext/data/multilineelide.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/qtbug_14734.qml (renamed from tests/auto/declarative/qquicktext/data/qtbug_14734.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/data/rotated.qml (renamed from tests/auto/declarative/qquicktext/data/rotated.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/qquicktext.pro | 17 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp (renamed from tests/auto/declarative/qquicktext/tst_qquicktext.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/CursorRect.qml (renamed from tests/auto/declarative/qquicktextedit/data/CursorRect.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments.qml (renamed from tests/auto/declarative/qquicktextedit/data/alignments.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_cb.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_cb.png) | bin | 496 -> 496 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_cc.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_cc.png) | bin | 556 -> 556 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_ct.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_ct.png) | bin | 533 -> 533 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_lb.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_lb.png) | bin | 496 -> 496 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_lc.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_lc.png) | bin | 535 -> 535 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_lt.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_lt.png) | bin | 514 -> 514 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_rb.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_rb.png) | bin | 505 -> 505 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_rc.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_rc.png) | bin | 559 -> 559 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/alignments_rt.png (renamed from tests/auto/declarative/qquicktextedit/data/alignments_rt.png) | bin | 539 -> 539 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/cursorTest.qml (renamed from tests/auto/declarative/qquicktextedit/data/cursorTest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/cursorVisible.qml (renamed from tests/auto/declarative/qquicktextedit/data/cursorVisible.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/geometrySignals.qml (renamed from tests/auto/declarative/qquicktextedit/data/geometrySignals.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qquicktextedit/data/horizontalAlignment_RightToLeft.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/http/ErrItem.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/ErrItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/http/NormItem.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/NormItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTest.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail1.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail2.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestPass.qml (renamed from tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestPass.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/http/qmldir (renamed from tests/auto/declarative/qquicktextedit/data/http/qmldir) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/httpfail/FailItem.qml (renamed from tests/auto/declarative/qquicktextedit/data/httpfail/FailItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/httpslow/WaitItem.qml (renamed from tests/auto/declarative/qquicktextedit/data/httpslow/WaitItem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/inputContext.qml (renamed from tests/auto/declarative/qquicktextedit/data/inputContext.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/inputMethodEvent.qml (renamed from tests/auto/declarative/qquicktextedit/data/inputMethodEvent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/inputmethodhints.qml (renamed from tests/auto/declarative/qquicktextedit/data/inputmethodhints.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/mouseselection_default.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_default.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/mouseselection_false.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_false.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/mouseselection_false_words.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_false_words.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/mouseselection_true.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_true.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/mouseselection_true_words.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselection_true_words.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_characters.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_characters.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_default.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_default.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_words.qml (renamed from tests/auto/declarative/qquicktextedit/data/mouseselectionmode_words.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/navigation.qml (renamed from tests/auto/declarative/qquicktextedit/data/navigation.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/openInputPanel.qml (renamed from tests/auto/declarative/qquicktextedit/data/openInputPanel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/positionAt.qml (renamed from tests/auto/declarative/qquicktextedit/data/positionAt.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/qtbug-22058.qml (renamed from tests/auto/declarative/qquicktextedit/data/qtbug-22058.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/data/readOnly.qml (renamed from tests/auto/declarative/qquicktextedit/data/readOnly.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro | 12 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp (renamed from tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/cursorTest.qml (renamed from tests/auto/declarative/qquicktextinput/data/cursorTest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/cursorVisible.qml (renamed from tests/auto/declarative/qquicktextinput/data/cursorVisible.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/echoMode.qml (renamed from tests/auto/declarative/qquicktextinput/data/echoMode.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/geometrySignals.qml (renamed from tests/auto/declarative/qquicktextinput/data/geometrySignals.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/halign_center.png (renamed from tests/auto/declarative/qquicktextinput/data/halign_center.png) | bin | 293 -> 293 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/halign_left.png (renamed from tests/auto/declarative/qquicktextinput/data/halign_left.png) | bin | 291 -> 291 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/halign_right.png (renamed from tests/auto/declarative/qquicktextinput/data/halign_right.png) | bin | 292 -> 292 bytes | |||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment.qml (renamed from tests/auto/declarative/qquicktextinput/data/horizontalAlignment.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment_RightToLeft.qml (renamed from tests/auto/declarative/qquicktextinput/data/horizontalAlignment_RightToLeft.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/inputContext.qml (renamed from tests/auto/declarative/qquicktextinput/data/inputContext.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/inputMethodEvent.qml (renamed from tests/auto/declarative/qquicktextinput/data/inputMethodEvent.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/inputmethods.qml (renamed from tests/auto/declarative/qquicktextinput/data/inputmethods.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/masks.qml (renamed from tests/auto/declarative/qquicktextinput/data/masks.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/maxLength.qml (renamed from tests/auto/declarative/qquicktextinput/data/maxLength.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/mouseselection_true.qml (renamed from tests/auto/declarative/qquicktextinput/data/mouseselection_true.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_characters.qml (renamed from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_characters.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_default.qml (renamed from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_default.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_words.qml (renamed from tests/auto/declarative/qquicktextinput/data/mouseselectionmode_words.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/navigation.qml (renamed from tests/auto/declarative/qquicktextinput/data/navigation.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/openInputPanel.qml (renamed from tests/auto/declarative/qquicktextinput/data/openInputPanel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/positionAt.qml (renamed from tests/auto/declarative/qquicktextinput/data/positionAt.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/preeditAutoScroll.qml (renamed from tests/auto/declarative/qquicktextinput/data/preeditAutoScroll.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/qtbug-19956double.qml (renamed from tests/auto/declarative/qquicktextinput/data/qtbug-19956double.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/qtbug-19956int.qml (renamed from tests/auto/declarative/qquicktextinput/data/qtbug-19956int.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/qtbug-19956regexp.qml (renamed from tests/auto/declarative/qquicktextinput/data/qtbug-19956regexp.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/readOnly.qml (renamed from tests/auto/declarative/qquicktextinput/data/readOnly.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/data/validators.qml (renamed from tests/auto/declarative/qquicktextinput/data/validators.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro (renamed from tests/auto/declarative/qquicktextinput/qquicktextinput.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp (renamed from tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp) | 4 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickview/data/error1.qml (renamed from tests/auto/declarative/qquickview/data/error1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickview/data/resizemodeitem.qml (renamed from tests/auto/declarative/qquickview/data/resizemodeitem.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickview/qquickview.pro (renamed from tests/auto/declarative/qquickview/qquickview.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickview/tst_qquickview.cpp (renamed from tests/auto/declarative/qquickview/tst_qquickview.cpp) | 6 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/create.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/create.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/datalist-package.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/datalist-package.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/datalist.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/datalist.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/groups-invalid.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/groups-invalid.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/groups-package.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/groups-package.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/groups.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/groups.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_listView.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_listView.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_package.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_package.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/modelproperties.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties2.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/modelproperties2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/objectlist.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/objectlist.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/onChanged.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/onChanged.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole1.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/singlerole1.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole2.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/singlerole2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/data/visualdatamodel.qml (renamed from tests/auto/declarative/qquickvisualdatamodel/data/visualdatamodel.qml) | 0 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro (renamed from tests/auto/declarative/qquickvisualdatamodel/qquickvisualdatamodel.pro) | 2 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp (renamed from tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp) | 8 | ||||
-rw-r--r-- | tests/auto/qtquick2/qtquick2.pro | 63 | ||||
-rw-r--r-- | tests/auto/shared/testhttpserver.cpp (renamed from tests/auto/declarative/shared/testhttpserver.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/shared/testhttpserver.h (renamed from tests/auto/declarative/shared/testhttpserver.h) | 0 | ||||
-rw-r--r-- | tests/auto/shared/util.h (renamed from tests/auto/declarative/shared/util.h) | 0 | ||||
-rw-r--r-- | tests/benchmarks/particles/affectors/affectors.pro | 2 | ||||
-rw-r--r-- | tests/benchmarks/particles/emission/emission.pro | 2 |
774 files changed, 447 insertions, 438 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c3ec7231cc..c4ed5aeee8 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,6 +1,7 @@ TEMPLATE=subdirs SUBDIRS=\ declarative \ + qtquick2 \ particles # ### refactor: port properly diff --git a/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp index 105700eedc..8967b844df 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -51,7 +51,7 @@ //QDeclarativeDebugTest #include "../shared/debugutil_p.h" -#include "../../shared/util.h" +#include "../../../shared/util.h" const char *SEQ = "seq"; const char *TYPE = "type"; diff --git a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 21aeca9040..6754503de9 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -50,7 +50,7 @@ #include <private/qdeclarativedebugclient_p.h> #include <private/qdeclarativedebugservice_p.h> -#include "../../shared/util.h" +#include "../../../shared/util.h" #include "../shared/debugutil_p.h" #define PORT 13769 diff --git a/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp b/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp index fc2f0d6626..3b5311e617 100644 --- a/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp @@ -44,7 +44,7 @@ #include "QtDeclarative/private/qdeclarativedebugtrace_p.h" #include "../shared/debugutil_p.h" -#include "../../shared/util.h" +#include "../../../shared/util.h" #define PORT 13773 #define STR_PORT "13773" diff --git a/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro b/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro index 4805f37e55..6b414d3c32 100644 --- a/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro +++ b/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro @@ -8,4 +8,4 @@ SOURCES += tst_qdeclarativeenginedebug.cpp \ CONFIG += parallel_test declarative_debug -QT += core-private declarative-private v8-private testlib +QT += core-private declarative-private quick-private v8-private testlib diff --git a/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp index f48b281d3a..d5e4696936 100644 --- a/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp +++ b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp @@ -50,7 +50,7 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtDeclarative/qdeclarativeproperty.h> -#include <QtDeclarative/qquickitem.h> +#include <QtQuick/qquickitem.h> #include <private/qdeclarativebinding_p.h> #include <private/qdeclarativeboundsignal_p.h> diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro b/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro index 7b6783b112..90595df881 100644 --- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro +++ b/tests/auto/declarative/debugger/qdeclarativeinspector/app/app.pro @@ -1,5 +1,5 @@ TARGET = app -QT += declarative widgets qtquick1 +QT += declarative quick widgets qtquick1 CONFIG += declarative_debug macx:CONFIG -= app_bundle diff --git a/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp b/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp index c851222461..67d0a4499e 100644 --- a/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp +++ b/tests/auto/declarative/debugger/qdeclarativeinspector/app/main.cpp @@ -41,7 +41,7 @@ #include <QtCore/QDebug> #include <QtCore/QStringList> -#include <QtDeclarative/QQuickView> +#include <QtQuick/QQuickView> #include <QtGui/QGuiApplication> #include <QtQuick1/QDeclarativeView> diff --git a/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp b/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp index 00ed1317a0..0739c746b9 100644 --- a/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp +++ b/tests/auto/declarative/debugger/qv8profilerservice/tst_qv8profilerservice.cpp @@ -44,7 +44,7 @@ #include "QtDeclarative/private/qv8profilerservice_p.h" #include "../shared/debugutil_p.h" -#include "../../shared/util.h" +#include "../../../shared/util.h" #define PORT 13774 #define STR_PORT "13774" diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 708127289b..8e52392941 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -4,9 +4,6 @@ METATYPETESTS += \ qdeclarativemetatype PUBLICTESTS += \ - examples \ - geometry \ - nodes \ parserstress \ qdeclarativecomponent \ qdeclarativeconsole \ @@ -19,7 +16,6 @@ PUBLICTESTS += \ qdeclarativelistreference \ qdeclarativelocale \ qdeclarativemoduleplugin \ - qdeclarativepixmapcache \ qdeclarativeqt \ qdeclarativetranslation \ qdeclarativexmlhttprequest \ @@ -30,76 +26,28 @@ PUBLICTESTS += \ qmlplugindump PRIVATETESTS += \ - qdeclarativeanimations \ - qdeclarativeapplication \ - qdeclarativebehaviors \ qdeclarativebinding \ qdeclarativechangeset \ qdeclarativeconnection \ qdeclarativecpputils \ qdeclarativeecmascript \ qdeclarativeexpression \ - qdeclarativefontloader \ qdeclarativeimageprovider \ qdeclarativeinstruction \ qdeclarativelanguage \ qdeclarativelistcompositor \ qdeclarativelistmodel \ - qdeclarativepath \ qdeclarativeproperty \ qdeclarativepropertymap \ - qdeclarativesmoothedanimation \ - qdeclarativespringanimation \ qdeclarativesqldatabase \ - qdeclarativestates \ - qdeclarativestyledtext \ - qdeclarativesystempalette \ - qdeclarativetimer \ qdeclarativevaluetypes \ qdeclarativeworkerscript \ - qdeclarativexmllistmodel \ v4 -# This test requires the xmlpatterns module -!contains(QT_CONFIG,xmlpatterns):PRIVATETESTS -= qdeclarativexmllistmodel - -QUICKTESTS = \ - qquickanchors \ - qquickanimatedimage \ - qquickborderimage \ - qquickcanvas \ - qquickcanvasitem \ - qquickdrag \ - qquickdroparea \ - qquickflickable \ - qquickflipable \ - qquickfocusscope \ - qquickgridview \ - qquickimage \ - qquickitem \ - qquickitem2 \ - qquicklistview \ - qquickloader \ - qquickmousearea \ - qquickmultipointtoucharea \ - qquickpathview \ - qquickpincharea \ - qquickpositioners \ - qquickrepeater \ - qquickshadereffect \ - qquickspriteimage \ - qquicktext \ - qquicktextedit \ - qquicktextinput \ - qquickview \ - qquickvisualdatamodel \ - - SUBDIRS += $$PUBLICTESTS SUBDIRS += $$METATYPETESTS SUBDIRS += debugger contains(QT_CONFIG, private_tests) { SUBDIRS += $$PRIVATETESTS - SUBDIRS += $$QUICKTESTS } diff --git a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro index d0bbfe6faa..5f8ee634f4 100644 --- a/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro +++ b/tests/auto/declarative/qdeclarativebinding/qdeclarativebinding.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp index 091a87b5a8..80ed10cd25 100644 --- a/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp +++ b/tests/auto/declarative/qdeclarativebinding/tst_qdeclarativebinding.cpp @@ -42,8 +42,8 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativebind_p.h> -#include <private/qquickrectangle_p.h> -#include "../shared/util.h" +#include <QtQuick/private/qquickrectangle_p.h> +#include "../../shared/util.h" class tst_qdeclarativebinding : public QObject { diff --git a/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro b/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro index b2f88b630b..7c52ef5dfd 100644 --- a/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro +++ b/tests/auto/declarative/qdeclarativechangeset/qdeclarativechangeset.pro @@ -6,4 +6,4 @@ SOURCES += tst_qdeclarativechangeset.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp index 1dcaaa1b06..da15458d27 100644 --- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp +++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp @@ -43,11 +43,10 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickitem.h> #include <QtDeclarative/qdeclarativeproperty.h> #include <QtDeclarative/qdeclarativeincubator.h> #include <qcolor.h> -#include "../shared/util.h" +#include "../../shared/util.h" class MyIC : public QObject, public QDeclarativeIncubationController { diff --git a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro index ef3ef536f0..702f3fc542 100644 --- a/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro +++ b/tests/auto/declarative/qdeclarativeconnection/qdeclarativeconnection.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp index 450f16c036..cd8f7b7b0c 100644 --- a/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp +++ b/tests/auto/declarative/qdeclarativeconnection/tst_qdeclarativeconnection.cpp @@ -43,7 +43,7 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativeconnections_p.h> #include <private/qquickitem_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" #include <QtDeclarative/qdeclarativescriptstring.h> class tst_qdeclarativeconnection : public QObject diff --git a/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp b/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp index 24095e3c35..0025798854 100644 --- a/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp +++ b/tests/auto/declarative/qdeclarativeconsole/tst_qdeclarativeconsole.cpp @@ -42,7 +42,7 @@ #include <QDebug> #include <QDeclarativeEngine> #include <QDeclarativeComponent> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeconsole : public QObject { diff --git a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp index ba9db4f875..c57cbeceba 100644 --- a/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp +++ b/tests/auto/declarative/qdeclarativecontext/tst_qdeclarativecontext.cpp @@ -46,7 +46,7 @@ #include <QDeclarativeComponent> #include <QDeclarativeExpression> #include <private/qdeclarativecontext_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro index d6d17c5869..1908e6bae1 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro +++ b/tests/auto/declarative/qdeclarativeecmascript/qdeclarativeecmascript.pro @@ -4,10 +4,10 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeecmascript.cpp \ testtypes.cpp \ - ../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp HEADERS += testtypes.h \ - ../shared/testhttpserver.h -INCLUDEPATH += ../shared + ../../shared/testhttpserver.h +INCLUDEPATH += ../../shared # QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage # LIBS += -lgcov diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 4891e5088e..3d50d6ee3d 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -54,7 +54,7 @@ #include <private/qv4compiler_p.h> #include "testtypes.h" #include "testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/util.h" /* This test covers evaluation of ECMAScript expressions and bindings from within diff --git a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp index ab97d04d4c..8fab5e5e50 100644 --- a/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp +++ b/tests/auto/declarative/qdeclarativeerror/tst_qdeclarativeerror.cpp @@ -42,7 +42,7 @@ #include <qtest.h> #include <QDeclarativeError> #include <QDebug> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeerror : public QObject { diff --git a/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp b/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp index a65045b48f..f7699e2bac 100644 --- a/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp +++ b/tests/auto/declarative/qdeclarativeexpression/tst_qdeclarativeexpression.cpp @@ -44,7 +44,7 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtDeclarative/qdeclarativescriptstring.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeexpression : public QObject { diff --git a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp index f8c91e6000..f85a6f14b6 100644 --- a/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp +++ b/tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp @@ -46,7 +46,7 @@ #include <QtCore/qfile.h> #include <QtCore/qabstractitemmodel.h> #include <QDebug> -#include "../shared/util.h" +#include "../../shared/util.h" // From qdeclarastivefolderlistmodel.h const int FileNameRole = Qt::UserRole+1; diff --git a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro deleted file mode 100644 index 3efde621b2..0000000000 --- a/tests/auto/declarative/qdeclarativefontloader/qdeclarativefontloader.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qdeclarativefontloader -macx:CONFIG -= app_bundle - -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativefontloader.cpp ../../declarative/shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro index dda2595956..70b9a406b3 100644 --- a/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro +++ b/tests/auto/declarative/qdeclarativeimageprovider/qdeclarativeimageprovider.pro @@ -6,4 +6,4 @@ SOURCES += tst_qdeclarativeimageprovider.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp index fe618b87e8..599b5d21b1 100644 --- a/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp +++ b/tests/auto/declarative/qdeclarativeincubator/tst_qdeclarativeincubator.cpp @@ -51,7 +51,7 @@ #include <QDeclarativeProperty> #include <QDeclarativeComponent> #include <QDeclarativeIncubator> -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp index ec04a83102..d4e3df2ffb 100644 --- a/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp +++ b/tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp @@ -45,7 +45,7 @@ #include <QTimer> #include <QDeclarativeContext> #include <qdeclarativeinfo.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeinfo : public QObject { diff --git a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro index 105e2b44d6..f79d1c99c9 100644 --- a/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro +++ b/tests/auto/declarative/qdeclarativelanguage/qdeclarativelanguage.pro @@ -6,9 +6,9 @@ SOURCES += tst_qdeclarativelanguage.cpp \ testtypes.cpp HEADERS += testtypes.h -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h -SOURCES += ../shared/testhttpserver.cpp +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp importFiles.files = data importFiles.path = . diff --git a/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro b/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro index e8dd7dd83a..3936f4beff 100644 --- a/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro +++ b/tests/auto/declarative/qdeclarativelistcompositor/qdeclarativelistcompositor.pro @@ -6,4 +6,4 @@ SOURCES += tst_qdeclarativelistcompositor.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro index fc8a3178ae..ae3aa9d287 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro +++ b/tests/auto/declarative/qdeclarativelistmodel/qdeclarativelistmodel.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp index 661b086fd1..1de2a2868e 100644 --- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp +++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <qtest.h> -#include <QtDeclarative/private/qquickitem_p.h> -#include <QtDeclarative/private/qquicktext_p.h> +#include <QtQuick/private/qquickitem_p.h> +#include <QtQuick/private/qquicktext_p.h> #include <QtDeclarative/private/qdeclarativeengine_p.h> #include <QtDeclarative/private/qdeclarativelistmodel_p.h> #include <QtDeclarative/private/qdeclarativeexpression_p.h> @@ -51,7 +51,7 @@ #include <QtCore/qtranslator.h> #include <QSignalSpy> -#include "../shared/util.h" +#include "../../shared/util.h" Q_DECLARE_METATYPE(QList<int>) Q_DECLARE_METATYPE(QList<QVariantHash>) diff --git a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp index a86e66de45..e09db2c9c7 100644 --- a/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp +++ b/tests/auto/declarative/qdeclarativelistreference/tst_qdeclarativelistreference.cpp @@ -49,7 +49,7 @@ #include <QtDeclarative/qdeclarativeprivate.h> #include <QtDeclarative/qdeclarativeproperty.h> #include <QDebug> -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp b/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp index 54139a2671..b2f35fd8b3 100644 --- a/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp +++ b/tests/auto/declarative/qdeclarativelocale/tst_qdeclarativelocale.cpp @@ -43,10 +43,9 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickitem.h> #include <QtCore/QDateTime> #include <qcolor.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativelocale : public QObject { diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index d8b7cf4e5b..1530eb9d36 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -44,8 +44,8 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <QDebug> -#include "../shared/testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/testhttpserver.h" +#include "../../shared/util.h" #define SERVER_ADDR "http://127.0.0.1:14450" #define SERVER_PORT 14450 diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro index 94c0f9dde1..bec727f05f 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro @@ -1,9 +1,9 @@ CONFIG += testcase TARGET = tst_qdeclarativemoduleplugin -HEADERS = ../shared/testhttpserver.h +HEADERS = ../../shared/testhttpserver.h SOURCES = tst_qdeclarativemoduleplugin.cpp \ - ../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp CONFIG -= app_bundle testDataFiles.files = data diff --git a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp index 411eeeacc7..b1aad3a34b 100644 --- a/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp +++ b/tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp @@ -47,7 +47,7 @@ #include <QtWidgets/QLineEdit> #include <QtCore/qfileinfo.h> #include <QtCore/qdir.h> -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro index a6332161a0..f94405c770 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro +++ b/tests/auto/declarative/qdeclarativepropertymap/qdeclarativepropertymap.pro @@ -6,4 +6,4 @@ SOURCES += tst_qdeclarativepropertymap.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp index cb2db47800..59a7fe7931 100644 --- a/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp +++ b/tests/auto/declarative/qdeclarativepropertymap/tst_qdeclarativepropertymap.cpp @@ -43,7 +43,7 @@ #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativepropertymap.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <private/qquicktext_p.h> +#include <QtQuick/private/qquicktext_p.h> #include <QSignalSpy> class tst_QDeclarativePropertyMap : public QObject diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro index 18fb8b2027..9428746dc1 100644 --- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro +++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp index 293fcd382f..5b3ea5e169 100644 --- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp +++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp @@ -50,9 +50,9 @@ #include <QDir> #include <QVector3D> #include <QCryptographicHash> -#include <QQuickItem> +#include <QtQuick/QQuickItem> #include <QSignalSpy> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeqt : public QObject { diff --git a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro index 2d0efec9a5..8b8c19c44c 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro +++ b/tests/auto/declarative/qdeclarativesqldatabase/qdeclarativesqldatabase.pro @@ -10,4 +10,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private sql testlib +QT += core-private gui-private v8-private declarative-private quick-private sql testlib diff --git a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp index f7c520d283..1a6b08cb79 100644 --- a/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp +++ b/tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp @@ -41,7 +41,7 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <private/qquicktext_p.h> +#include <QtQuick/private/qquicktext_p.h> #include <private/qdeclarativeengine_p.h> #include <QtCore/qcryptographichash.h> /* @@ -53,7 +53,7 @@ #include <QtSql/qsqldatabase.h> #include <QtCore/qdir.h> #include <QtCore/qfile.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativesqldatabase : public QObject { diff --git a/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp b/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp index be257fdc41..da84167148 100644 --- a/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp +++ b/tests/auto/declarative/qdeclarativetranslation/tst_qdeclarativetranslation.cpp @@ -43,7 +43,7 @@ #include <QDeclarativeEngine> #include <QDeclarativeComponent> #include <QTranslator> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativetranslation : public QObject { diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp index db0e05bcf2..c6880b96ce 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp +++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp @@ -44,7 +44,7 @@ #include <QDeclarativeComponent> #include <QDebug> #include <private/qdeclarativevaluetype_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" #include "testtypes.h" QT_BEGIN_NAMESPACE diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp index eb3413ec10..7dccbb35a0 100644 --- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp +++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp @@ -50,7 +50,7 @@ #include <private/qdeclarativeworkerscript_p.h> #include <private/qdeclarativeengine_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro index 0e6073b503..5715f3c114 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/qdeclarativexmlhttprequest.pro @@ -2,11 +2,11 @@ CONFIG += testcase TARGET = tst_qdeclarativexmlhttprequest macx:CONFIG -= app_bundle -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qdeclarativexmlhttprequest.cpp \ - ../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp testDataFiles.files = data testDataFiles.path = . diff --git a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp index 1caec581cc..da5431c50b 100644 --- a/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp +++ b/tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp @@ -45,7 +45,7 @@ #include <QDebug> #include <QNetworkCookieJar> #include "testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/util.h" #define SERVER_PORT 14445 diff --git a/tests/auto/declarative/qmlmin/tst_qmlmin.cpp b/tests/auto/declarative/qmlmin/tst_qmlmin.cpp index 53b0e3772a..1c4f72191b 100644 --- a/tests/auto/declarative/qmlmin/tst_qmlmin.cpp +++ b/tests/auto/declarative/qmlmin/tst_qmlmin.cpp @@ -94,7 +94,7 @@ void tst_qmlmin::initTestCase() excludedDirs << "doc/src/snippets/qtquick1/imports"; // Add invalid files (i.e. files with syntax errors) - invalidFiles << "tests/auto/declarative/qquickloader/data/InvalidSourceComponent.qml"; + invalidFiles << "tests/auto/qtquick2/qquickloader/data/InvalidSourceComponent.qml"; invalidFiles << "tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml"; invalidFiles << "tests/auto/declarative/qdeclarativelanguage/data/signal.3.qml"; invalidFiles << "tests/auto/declarative/qdeclarativelanguage/data/property.4.qml"; diff --git a/tests/auto/declarative/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/declarative/qquickanimatedimage/qquickanimatedimage.pro deleted file mode 100644 index d6a40e11ce..0000000000 --- a/tests/auto/declarative/qquickanimatedimage/qquickanimatedimage.pro +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickanimatedimage -HEADERS += ../shared/testhttpserver.h -SOURCES += tst_qquickanimatedimage.cpp ../shared/testhttpserver.cpp -macx:CONFIG -= app_bundle - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qquickborderimage/qquickborderimage.pro b/tests/auto/declarative/qquickborderimage/qquickborderimage.pro deleted file mode 100644 index b1ccf4a939..0000000000 --- a/tests/auto/declarative/qquickborderimage/qquickborderimage.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickborderimage -macx:CONFIG -= app_bundle - -HEADERS += ../shared/testhttpserver.h -SOURCES += tst_qquickborderimage.cpp ../shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private network widgets testlib diff --git a/tests/auto/declarative/qquickimage/qquickimage.pro b/tests/auto/declarative/qquickimage/qquickimage.pro deleted file mode 100644 index 46cbdb49aa..0000000000 --- a/tests/auto/declarative/qquickimage/qquickimage.pro +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickimage -macx:CONFIG -= app_bundle - -HEADERS += ../shared/testhttpserver.h -SOURCES += tst_qquickimage.cpp ../shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qquickmousearea/qquickmousearea.pro b/tests/auto/declarative/qquickmousearea/qquickmousearea.pro deleted file mode 100644 index 3581a7b9c9..0000000000 --- a/tests/auto/declarative/qquickmousearea/qquickmousearea.pro +++ /dev/null @@ -1,14 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquickmousearea -macx:CONFIG -= app_bundle - -HEADERS += ../shared/testhttpserver.h -SOURCES += tst_qquickmousearea.cpp ../shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private declarative-private network testlib diff --git a/tests/auto/declarative/qquicktext/qquicktext.pro b/tests/auto/declarative/qquicktext/qquicktext.pro deleted file mode 100644 index fe69f75746..0000000000 --- a/tests/auto/declarative/qquicktext/qquicktext.pro +++ /dev/null @@ -1,17 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquicktext -macx:CONFIG -= app_bundle - -SOURCES += tst_qquicktext.cpp - -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h -SOURCES += ../shared/testhttpserver.cpp - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -CONFIG += parallel_test - -QT += core-private gui-private v8-private declarative-private widgets-private opengl-private network testlib diff --git a/tests/auto/declarative/qquicktextedit/qquicktextedit.pro b/tests/auto/declarative/qquicktextedit/qquicktextedit.pro deleted file mode 100644 index ae2233dafc..0000000000 --- a/tests/auto/declarative/qquicktextedit/qquicktextedit.pro +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG += testcase -TARGET = tst_qquicktextedit -macx:CONFIG -= app_bundle - -SOURCES += tst_qquicktextedit.cpp ../shared/testhttpserver.cpp -HEADERS += ../shared/testhttpserver.h - -testDataFiles.files = data -testDataFiles.path = . -DEPLOYMENT += testDataFiles - -QT += core-private gui-private v8-private declarative-private opengl-private network widgets-private testlib diff --git a/tests/auto/declarative/v4/tst_v4.cpp b/tests/auto/declarative/v4/tst_v4.cpp index 69fa4bbf0c..791610d541 100644 --- a/tests/auto/declarative/v4/tst_v4.cpp +++ b/tests/auto/declarative/v4/tst_v4.cpp @@ -48,7 +48,7 @@ #include <private/qv4compiler_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" #include "testtypes.h" inline QUrl TEST_FILE(const QString &filename) diff --git a/tests/auto/particles/qquickage/qquickage.pro b/tests/auto/particles/qquickage/qquickage.pro index 980d390953..e03e3d47d1 100644 --- a/tests/auto/particles/qquickage/qquickage.pro +++ b/tests/auto/particles/qquickage/qquickage.pro @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles CONFIG += insignificant_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro index 2a4ee5237a..235f0d81b0 100644 --- a/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro +++ b/tests/auto/particles/qquickangleddirection/qquickangleddirection.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro index 160f63f3bc..09fe1aa06a 100644 --- a/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro +++ b/tests/auto/particles/qquickcumulativedirection/qquickcumulativedirection.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro index e1293312b1..6d3ecaa6f4 100644 --- a/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro +++ b/tests/auto/particles/qquickcustomaffector/qquickcustomaffector.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro index 3476a66ca2..e9bcc1e373 100644 --- a/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro +++ b/tests/auto/particles/qquickcustomparticle/qquickcustomparticle.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro index 9f5147be33..803a366429 100644 --- a/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro +++ b/tests/auto/particles/qquickellipseextruder/qquickellipseextruder.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickfriction/qquickfriction.pro b/tests/auto/particles/qquickfriction/qquickfriction.pro index d6726724ff..889b2d9505 100644 --- a/tests/auto/particles/qquickfriction/qquickfriction.pro +++ b/tests/auto/particles/qquickfriction/qquickfriction.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickgravity/qquickgravity.pro b/tests/auto/particles/qquickgravity/qquickgravity.pro index bc503d932a..3bdd8c1efa 100644 --- a/tests/auto/particles/qquickgravity/qquickgravity.pro +++ b/tests/auto/particles/qquickgravity/qquickgravity.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro index 14d28fd43d..fa43b28407 100644 --- a/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro +++ b/tests/auto/particles/qquickimageparticle/qquickimageparticle.pro @@ -7,4 +7,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro index 8e8eadd463..9d78c2b49d 100644 --- a/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro +++ b/tests/auto/particles/qquickitemparticle/qquickitemparticle.pro @@ -9,5 +9,5 @@ DEPLOYMENT += testDataFiles CONFIG += insignificant_test #temporary -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro index 255c9a4104..fae5203961 100644 --- a/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro +++ b/tests/auto/particles/qquicklineextruder/qquicklineextruder.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro index b53d3610fa..d82adf8b4a 100644 --- a/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro +++ b/tests/auto/particles/qquickmaskextruder/qquickmaskextruder.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro index b100ffaf75..27547c16b1 100644 --- a/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro +++ b/tests/auto/particles/qquickparticlegroup/qquickparticlegroup.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro index 65472e23f9..6fd13ec01e 100644 --- a/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro +++ b/tests/auto/particles/qquickparticlesystem/qquickparticlesystem.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro index 13b512791a..a9d390aab8 100644 --- a/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro +++ b/tests/auto/particles/qquickpointattractor/qquickpointattractor.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro index 6adab3d75d..04fe1617de 100644 --- a/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro +++ b/tests/auto/particles/qquickpointdirection/qquickpointdirection.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro index fee29efcf3..e45c43a587 100644 --- a/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro +++ b/tests/auto/particles/qquickrectangleextruder/qquickrectangleextruder.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro index 0de6007283..0a887d1fb3 100644 --- a/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro +++ b/tests/auto/particles/qquicktargetdirection/qquicktargetdirection.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro index 7b8075d625..9139dd39fb 100644 --- a/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro +++ b/tests/auto/particles/qquicktrailemitter/qquicktrailemitter.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickturbulence/qquickturbulence.pro b/tests/auto/particles/qquickturbulence/qquickturbulence.pro index 405e8a6f2a..16d85445f5 100644 --- a/tests/auto/particles/qquickturbulence/qquickturbulence.pro +++ b/tests/auto/particles/qquickturbulence/qquickturbulence.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/qquickwander/qquickwander.pro b/tests/auto/particles/qquickwander/qquickwander.pro index cf6f08e2dc..a9c48ece78 100644 --- a/tests/auto/particles/qquickwander/qquickwander.pro +++ b/tests/auto/particles/qquickwander/qquickwander.pro @@ -7,5 +7,5 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/particles/shared/particlestestsshared.h b/tests/auto/particles/shared/particlestestsshared.h index ab6b5f16af..5989efe937 100644 --- a/tests/auto/particles/shared/particlestestsshared.h +++ b/tests/auto/particles/shared/particlestestsshared.h @@ -41,7 +41,7 @@ #ifndef PARTICLES_TESTS_SHARED #define PARTICLES_TESTS_SHARED -#include <QQuickView> +#include <QtQuick/QQuickView> #include <QtTest> #include <QAbstractAnimation> const qreal EPSILON = 0.0001; diff --git a/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro b/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro index c5ec23e17e..21c846b4eb 100644 --- a/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro +++ b/tests/auto/qtquick1/qdeclarativeanimatedimage/qdeclarativeanimatedimage.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativeanimatedimage -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativeanimatedimage.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativeanimatedimage.cpp ../../shared/testhttpserver.cpp macx:CONFIG -= app_bundle DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp index 275b8d0fb4..3d81d669f4 100644 --- a/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp +++ b/tests/auto/qtquick1/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp @@ -48,7 +48,7 @@ #include <QSignalSpy> #include <QtDeclarative/qdeclarativecontext.h> -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" class tst_qdeclarativeanimatedimage : public QObject { diff --git a/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro index 83319faf8a..a8c8b18a37 100644 --- a/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/qtquick1/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeborderimage macx:CONFIG -= app_bundle -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativeborderimage.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativeborderimage.cpp ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp index 4b82fe0a4e..4346c75850 100644 --- a/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp +++ b/tests/auto/qtquick1/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp @@ -54,7 +54,7 @@ #include <private/qdeclarativeloader_p.h> #include <QtDeclarative/qdeclarativecontext.h> -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #define SERVER_PORT 14446 #define SERVER_ADDR "http://127.0.0.1:14446" diff --git a/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro index fc48544fa0..fbe72b072c 100644 --- a/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro +++ b/tests/auto/qtquick1/qdeclarativefontloader/qdeclarativefontloader.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativefontloader macx:CONFIG -= app_bundle -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativefontloader.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativefontloader.cpp ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 3bcbe1b67c..addd6516f5 100644 --- a/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/qtquick1/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -44,7 +44,7 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtQuick1/private/qdeclarativefontloader_p.h> -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #define SERVER_PORT 14448 diff --git a/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro b/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro index 5c9b9db5c8..28570ab093 100644 --- a/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro +++ b/tests/auto/qtquick1/qdeclarativeimage/qdeclarativeimage.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativeimage macx:CONFIG -= app_bundle -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativeimage.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativeimage.cpp ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp index e93c373bf1..107ba89c77 100644 --- a/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp +++ b/tests/auto/qtquick1/qdeclarativeimage/tst_qdeclarativeimage.cpp @@ -54,7 +54,7 @@ #include <QtDeclarative/qdeclarativeexpression.h> #include <QtTest/QSignalSpy> -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #define SERVER_PORT 14451 #define SERVER_ADDR "http://127.0.0.1:14451" diff --git a/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro b/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro index 7f3cfb20b1..0e4df8d3da 100644 --- a/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro +++ b/tests/auto/qtquick1/qdeclarativeloader/qdeclarativeloader.pro @@ -2,10 +2,10 @@ CONFIG += testcase TARGET = tst_qdeclarativeloader macx:CONFIG -= app_bundle -INCLUDEPATH += ../../declarative/shared/ -HEADERS += ../../declarative/shared/testhttpserver.h +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qdeclarativeloader.cpp \ - ../../declarative/shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro b/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro index f7e6a5b292..6f426c50c5 100644 --- a/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro +++ b/tests/auto/qtquick1/qdeclarativemousearea/qdeclarativemousearea.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativemousearea macx:CONFIG -= app_bundle -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += tst_qdeclarativemousearea.cpp ../../declarative/shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativemousearea.cpp ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro b/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro index 0989aab14f..1957bdd9fd 100644 --- a/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/qtquick1/qdeclarativetext/qdeclarativetext.pro @@ -4,9 +4,9 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetext.cpp -INCLUDEPATH += ../../declarative/shared/ -HEADERS += ../../declarative/shared/testhttpserver.h -SOURCES += ../../declarative/shared/testhttpserver.cpp +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro index 74c4215579..5c86e111e8 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/qtquick1/qdeclarativetextedit/qdeclarativetextedit.pro @@ -2,8 +2,8 @@ CONFIG += testcase TARGET = tst_qdeclarativetextedit macx:CONFIG -= app_bundle -SOURCES += tst_qdeclarativetextedit.cpp ../../declarative/shared/testhttpserver.cpp -HEADERS += ../../declarative/shared/testhttpserver.h +SOURCES += tst_qdeclarativetextedit.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h DEFINES += SRCDIR=\\\"$$PWD\\\" diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 621c1753b2..54b8567161 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include "../../declarative/shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #include <math.h> #include <QFile> #include <QTextDocument> diff --git a/tests/auto/declarative/examples/data/dummytest.qml b/tests/auto/qtquick2/examples/data/dummytest.qml index b20e907f27..b20e907f27 100644 --- a/tests/auto/declarative/examples/data/dummytest.qml +++ b/tests/auto/qtquick2/examples/data/dummytest.qml diff --git a/tests/auto/declarative/examples/data/webbrowser/webbrowser.qml b/tests/auto/qtquick2/examples/data/webbrowser/webbrowser.qml index d31787b939..d31787b939 100644 --- a/tests/auto/declarative/examples/data/webbrowser/webbrowser.qml +++ b/tests/auto/qtquick2/examples/data/webbrowser/webbrowser.qml diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/qtquick2/examples/examples.pro index d70040d6ec..ca169242e1 100644 --- a/tests/auto/declarative/examples/examples.pro +++ b/tests/auto/qtquick2/examples/examples.pro @@ -7,4 +7,4 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test #temporary -QT += core-private gui-private declarative-private qtquick1-private widgets-private v8-private testlib +QT += core-private gui-private declarative-private quick-private qtquick1-private widgets-private v8-private testlib diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/qtquick2/examples/tst_examples.cpp index bacd25d0da..050ae49cfc 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/qtquick2/examples/tst_examples.cpp @@ -44,8 +44,8 @@ #include <QDir> #include <QProcess> #include <QDebug> -#include <QQuickItem> -#include <QQuickView> +#include <QtQuick/QQuickItem> +#include <QtQuick/QQuickView> #include <QDeclarativeComponent> #include <QDeclarativeEngine> #include <QDeclarativeError> diff --git a/tests/auto/declarative/geometry/geometry.pro b/tests/auto/qtquick2/geometry/geometry.pro index a66399a6e0..04d529cfb8 100644 --- a/tests/auto/declarative/geometry/geometry.pro +++ b/tests/auto/qtquick2/geometry/geometry.pro @@ -6,4 +6,4 @@ SOURCES += tst_geometry.cpp CONFIG+=parallel_test -QT += core-private gui-private declarative-private opengl testlib +QT += core-private gui-private declarative-private quick-private opengl testlib diff --git a/tests/auto/declarative/geometry/tst_geometry.cpp b/tests/auto/qtquick2/geometry/tst_geometry.cpp index 2915902fa4..23e37dae2f 100644 --- a/tests/auto/declarative/geometry/tst_geometry.cpp +++ b/tests/auto/qtquick2/geometry/tst_geometry.cpp @@ -42,7 +42,7 @@ #include <QtCore/QString> #include <QtTest/QtTest> -#include <qsggeometry.h> +#include <QtQuick/qsggeometry.h> class GeometryTest : public QObject { diff --git a/tests/auto/declarative/nodes/nodes.pro b/tests/auto/qtquick2/nodes/nodes.pro index b622c6a4b3..40eeb2ab78 100644 --- a/tests/auto/declarative/nodes/nodes.pro +++ b/tests/auto/qtquick2/nodes/nodes.pro @@ -6,4 +6,4 @@ SOURCES += tst_nodestest.cpp CONFIG+=parallel_test -QT += core-private gui-private declarative-private opengl widgets testlib +QT += core-private gui-private declarative-private quick-private opengl widgets testlib diff --git a/tests/auto/declarative/nodes/tst_nodestest.cpp b/tests/auto/qtquick2/nodes/tst_nodestest.cpp index d4782f93f4..3036bbf2dd 100644 --- a/tests/auto/declarative/nodes/tst_nodestest.cpp +++ b/tests/auto/qtquick2/nodes/tst_nodestest.cpp @@ -42,11 +42,11 @@ #include <QtCore/QString> #include <QtTest/QtTest> -#include <qsgnode.h> -#include <private/qsgrenderer_p.h> -#include <private/qsgnodeupdater_p.h> +#include <QtQuick/qsgnode.h> +#include <QtQuick/private/qsgrenderer_p.h> +#include <QtQuick/private/qsgnodeupdater_p.h> -#include <qsgsimplerectnode.h> +#include <QtQuick/qsgsimplerectnode.h> #include <QtOpenGL/QGLWidget> class NodesTest : public QObject { diff --git a/tests/auto/declarative/qdeclarativeanimations/data/Double.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/Double.qml index 99ffca1d62..99ffca1d62 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/Double.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/Double.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/attached.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/attached.qml index 9dcfcd8752..9dcfcd8752 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/attached.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/attached.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badproperty1.qml index 9634c2c169..9634c2c169 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/badproperty1.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/badproperty1.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badproperty2.qml index c121172a99..c121172a99 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/badproperty2.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/badproperty2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype1.qml index 43e1ec8572..43e1ec8572 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/badtype1.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype1.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype2.qml index 5341cb3d1c..5341cb3d1c 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/badtype2.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype3.qml index 182efa0840..182efa0840 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/badtype3.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype3.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype4.qml index f091e2430f..f091e2430f 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/badtype4.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/badtype4.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/disabledTransition.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/disabledTransition.qml index 0fbafead8b..0fbafead8b 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/disabledTransition.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/disabledTransition.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/dontAutoStart.qml index c0c0c65e3f..c0c0c65e3f 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/dontAutoStart.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/dontAutoStart.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/dontStart.qml index 3eee0cfd35..3eee0cfd35 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/dontStart.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/dontStart.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/dontStart2.qml index e7b4164e4e..e7b4164e4e 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/dontStart2.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/dontStart2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/dotproperty.qml index e0e46dcef5..e0e46dcef5 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/dotproperty.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/dotproperty.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/doubleRegistrationBug.qml index 9ef3da20c0..9ef3da20c0 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/doubleRegistrationBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype1.qml index 76129dd15e..76129dd15e 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype1.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype1.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype2.qml index 1a7166e3f3..1a7166e3f3 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/mixedtype2.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/mixedtype2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/nonTransitionBug.qml index 909c533e7b..909c533e7b 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/nonTransitionBug.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/nonTransitionBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimation.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation.qml index d2006a1c6a..d2006a1c6a 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimation.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimation2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation2.qml index 951c5b2e57..951c5b2e57 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimation2.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimation2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimationNoStart.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimationNoStart.qml index be3501fabb..be3501fabb 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/pathAnimationNoStart.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/pathAnimationNoStart.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathInterpolator.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolator.qml index 0104412d7c..0104412d7c 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/pathInterpolator.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolator.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathInterpolatorBack.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolatorBack.qml index 41366ef798..41366ef798 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/pathInterpolatorBack.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/pathInterpolatorBack.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pathTransition.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pathTransition.qml index 55ffc33f95..55ffc33f95 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/pathTransition.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/pathTransition.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pauseBindingBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pauseBindingBug.qml index 359cda166f..359cda166f 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/pauseBindingBug.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/pauseBindingBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/pauseBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/pauseBug.qml index fa2c4be4ba..fa2c4be4ba 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/pauseBug.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/pauseBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties.qml index f0f730967c..f0f730967c 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/properties.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/properties.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties2.qml index 6b7f026e0b..6b7f026e0b 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/properties2.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/properties2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties3.qml index 5eb65496d4..5eb65496d4 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/properties3.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/properties3.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties4.qml index dfe8ad17e7..dfe8ad17e7 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/properties4.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/properties4.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/properties5.qml index 075fc9bc5a..075fc9bc5a 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/properties5.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/properties5.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition.qml index 968c5f6285..968c5f6285 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition2.qml index f06165604a..f06165604a 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition2.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition3.qml index 7d3b3b9c6d..7d3b3b9c6d 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition3.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition3.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition4.qml index 1c31a79634..1c31a79634 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition4.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition4.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition5.qml index a2ff746900..a2ff746900 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition5.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition5.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition6.qml index d3db01efb0..d3db01efb0 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition6.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition6.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition7.qml index 98898de8ef..98898de8ef 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/propertiesTransition7.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/propertiesTransition7.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/registrationBug.qml index 633da4e17f..633da4e17f 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/registrationBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/rotation.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/rotation.qml index 4dc42a1bd2..4dc42a1bd2 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/rotation.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/rotation.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/runningTrueBug.qml index bec6fab368..bec6fab368 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/runningTrueBug.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/runningTrueBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/transitionAssignmentBug.qml index 508693e0fc..508693e0fc 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/transitionAssignmentBug.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/transitionAssignmentBug.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/valuesource.qml index 7a636b4003..7a636b4003 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/valuesource.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/valuesource.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml b/tests/auto/qtquick2/qdeclarativeanimations/data/valuesource2.qml index 9788761ee8..9788761ee8 100644 --- a/tests/auto/declarative/qdeclarativeanimations/data/valuesource2.qml +++ b/tests/auto/qtquick2/qdeclarativeanimations/data/valuesource2.qml diff --git a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro index 5870d74ab2..fd35266f66 100644 --- a/tests/auto/declarative/qdeclarativeanimations/qdeclarativeanimations.pro +++ b/tests/auto/qtquick2/qdeclarativeanimations/qdeclarativeanimations.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp index 515c8fa918..ca329263e9 100644 --- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp +++ b/tests/auto/qtquick2/qdeclarativeanimations/tst_qdeclarativeanimations.cpp @@ -41,20 +41,20 @@ #include <QtTest/QtTest> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> -#include <QtDeclarative/private/qquickrectangle_p.h> -#include <QtDeclarative/private/qdeclarativeanimation_p.h> -#include <QtDeclarative/private/qdeclarativetransition_p.h> -#include <QtDeclarative/private/qquickanimation_p.h> -#include <QtDeclarative/private/qdeclarativepathinterpolator_p.h> -#include <QtDeclarative/private/qquickitem_p.h> +#include <QtQuick/qquickview.h> +#include <QtQuick/private/qquickrectangle_p.h> +#include <QtQuick/private/qdeclarativeanimation_p.h> +#include <QtQuick/private/qdeclarativetransition_p.h> +#include <QtQuick/private/qquickanimation_p.h> +#include <QtQuick/private/qdeclarativepathinterpolator_p.h> +#include <QtQuick/private/qquickitem_p.h> #include <QVariantAnimation> #include <QEasingCurve> #include <limits.h> #include <math.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativeanimations : public QObject { diff --git a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/qtquick2/qdeclarativeapplication/qdeclarativeapplication.pro index 3b01fcf9e3..b86f431d31 100644 --- a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro +++ b/tests/auto/qtquick2/qdeclarativeapplication/qdeclarativeapplication.pro @@ -3,5 +3,5 @@ TARGET = tst_qdeclarativeapplication macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativeapplication.cpp -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index 72313ab054..be822d8f7f 100644 --- a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -42,8 +42,8 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qquickitem.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickview.h> #include <QtGui/qinputpanel.h> class tst_qdeclarativeapplication : public QObject diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/binding.qml index 5aceefa743..5aceefa743 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/binding.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/binding.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/color.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/color.qml index a318578a9b..a318578a9b 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/color.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/color.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/cpptrigger.qml index f033ec5aeb..f033ec5aeb 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/cpptrigger.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/cpptrigger.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/delayedRegistration.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/delayedRegistration.qml index ed35a308f7..ed35a308f7 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/delayedRegistration.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/delayedRegistration.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/disabled.qml index 20860d8dde..20860d8dde 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/disabled.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/disabled.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/dontStart.qml index 38e1ea9d9e..38e1ea9d9e 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/dontStart.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/dontStart.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/empty.qml index d8f115390a..d8f115390a 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/empty.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/empty.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/explicit.qml index 20875c30e3..20875c30e3 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/explicit.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/explicit.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty.qml index a05ab7d54b..a05ab7d54b 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty2.qml index 2f3de5131c..2f3de5131c 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/groupProperty2.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupProperty2.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupedPropertyCrash.qml index 6835902bc5..6835902bc5 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/groupedPropertyCrash.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/groupedPropertyCrash.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/loop.qml index 3e8d88734d..3e8d88734d 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/loop.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/loop.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/nonSelecting2.qml index 6357094cfe..6357094cfe 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/nonSelecting2.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/nonSelecting2.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/parent.qml index f8c2731d86..f8c2731d86 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/parent.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/parent.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/qtbug12295.qml index c6bef581a4..c6bef581a4 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/qtbug12295.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/qtbug12295.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/reassignedAnimation.qml index 5731cb3efd..5731cb3efd 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/reassignedAnimation.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/reassignedAnimation.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/runningTrue.qml index 4fd1136f3a..4fd1136f3a 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/runningTrue.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/runningTrue.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/scripttrigger.qml index ff71f2b1b0..ff71f2b1b0 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/scripttrigger.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/scripttrigger.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/simple.qml index c64a6e1928..c64a6e1928 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/simple.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/simple.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/startOnCompleted.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/startOnCompleted.qml index fdc3779a5c..fdc3779a5c 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/startOnCompleted.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/startOnCompleted.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/startup.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/startup.qml index 9fa74ca39e..9fa74ca39e 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/startup.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/startup.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/startup2.qml index 0654ef3644..0654ef3644 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/startup2.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/startup2.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/data/valueType.qml b/tests/auto/qtquick2/qdeclarativebehaviors/data/valueType.qml index 7bc8297dc7..7bc8297dc7 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/data/valueType.qml +++ b/tests/auto/qtquick2/qdeclarativebehaviors/data/valueType.qml diff --git a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro b/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro index 0e7c73ab90..3ac9446a4c 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/qdeclarativebehaviors.pro +++ b/tests/auto/qtquick2/qdeclarativebehaviors/qdeclarativebehaviors.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp b/tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp index d1c1ca7d9c..526a23f262 100644 --- a/tests/auto/declarative/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp +++ b/tests/auto/qtquick2/qdeclarativebehaviors/tst_qdeclarativebehaviors.cpp @@ -42,13 +42,13 @@ #include <qsignalspy.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> -#include <private/qquickrectangle_p.h> -#include <private/qquicktext_p.h> -#include <private/qdeclarativebehavior_p.h> -#include <private/qdeclarativeanimation_p.h> +#include <QtQuick/qquickview.h> +#include <QtQuick/private/qquickrectangle_p.h> +#include <QtQuick/private/qquicktext_p.h> +#include <QtQuick/private/qdeclarativebehavior_p.h> +#include <QtQuick/private/qdeclarativeanimation_p.h> #include <private/qquickitem_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativebehaviors : public QObject { diff --git a/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf b/tests/auto/qtquick2/qdeclarativefontloader/data/daniel.ttf Binary files differindex aae50d5035..aae50d5035 100644 --- a/tests/auto/declarative/qdeclarativefontloader/data/daniel.ttf +++ b/tests/auto/qtquick2/qdeclarativefontloader/data/daniel.ttf diff --git a/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf b/tests/auto/qtquick2/qdeclarativefontloader/data/dummy.ttf index e69de29bb2..e69de29bb2 100644 --- a/tests/auto/declarative/qdeclarativefontloader/data/dummy.ttf +++ b/tests/auto/qtquick2/qdeclarativefontloader/data/dummy.ttf diff --git a/tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml b/tests/auto/qtquick2/qdeclarativefontloader/data/qtbug-20268.qml index 0eafdfa17b..0eafdfa17b 100644 --- a/tests/auto/declarative/qdeclarativefontloader/data/qtbug-20268.qml +++ b/tests/auto/qtquick2/qdeclarativefontloader/data/qtbug-20268.qml diff --git a/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf b/tests/auto/qtquick2/qdeclarativefontloader/data/tarzeau_ocr_a.ttf Binary files differindex cf93f9651f..cf93f9651f 100644 --- a/tests/auto/declarative/qdeclarativefontloader/data/tarzeau_ocr_a.ttf +++ b/tests/auto/qtquick2/qdeclarativefontloader/data/tarzeau_ocr_a.ttf diff --git a/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro b/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro new file mode 100644 index 0000000000..de9461f7ac --- /dev/null +++ b/tests/auto/qtquick2/qdeclarativefontloader/qdeclarativefontloader.pro @@ -0,0 +1,14 @@ +CONFIG += testcase +TARGET = tst_qdeclarativefontloader +macx:CONFIG -= app_bundle + +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qdeclarativefontloader.cpp ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp b/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp index 6e81befad8..86789068ad 100644 --- a/tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp +++ b/tests/auto/qtquick2/qdeclarativefontloader/tst_qdeclarativefontloader.cpp @@ -43,11 +43,11 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativecontext.h> -#include <QtDeclarative/private/qdeclarativefontloader_p.h> -#include "../shared/util.h" -#include "../../declarative/shared/testhttpserver.h" -#include <QQuickView> -#include <QQuickItem> +#include <QtQuick/private/qdeclarativefontloader_p.h> +#include "../../shared/util.h" +#include "../../shared/testhttpserver.h" +#include <QtQuick/QQuickView> +#include <QtQuick/QQuickItem> #define SERVER_PORT 14448 diff --git a/tests/auto/declarative/qdeclarativepath/data/arc.qml b/tests/auto/qtquick2/qdeclarativepath/data/arc.qml index 000221c784..000221c784 100644 --- a/tests/auto/declarative/qdeclarativepath/data/arc.qml +++ b/tests/auto/qtquick2/qdeclarativepath/data/arc.qml diff --git a/tests/auto/declarative/qdeclarativepath/data/curve.qml b/tests/auto/qtquick2/qdeclarativepath/data/curve.qml index c571186496..c571186496 100644 --- a/tests/auto/declarative/qdeclarativepath/data/curve.qml +++ b/tests/auto/qtquick2/qdeclarativepath/data/curve.qml diff --git a/tests/auto/declarative/qdeclarativepath/data/svg.qml b/tests/auto/qtquick2/qdeclarativepath/data/svg.qml index cec0f75061..cec0f75061 100644 --- a/tests/auto/declarative/qdeclarativepath/data/svg.qml +++ b/tests/auto/qtquick2/qdeclarativepath/data/svg.qml diff --git a/tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro b/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro index 212117165d..9f4204efa3 100644 --- a/tests/auto/declarative/qdeclarativepath/qdeclarativepath.pro +++ b/tests/auto/qtquick2/qdeclarativepath/qdeclarativepath.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp b/tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp index 91513fc8a5..bf4f70b292 100644 --- a/tests/auto/declarative/qdeclarativepath/tst_qdeclarativepath.cpp +++ b/tests/auto/qtquick2/qdeclarativepath/tst_qdeclarativepath.cpp @@ -42,9 +42,9 @@ #include <QtTest/QtTest> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/private/qdeclarativepath_p.h> +#include <QtQuick/private/qdeclarativepath_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_QDeclarativePath : public QObject { diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/exists.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists1.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/exists1.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists1.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists2.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/exists2.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/exists2.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists1.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists1.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists1.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists1.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists2.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists2.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists2.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists2.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists3.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists3.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists3.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists3.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists4.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists4.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists4.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists4.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists5.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists5.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists5.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists5.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists6.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists6.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists6.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists6.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists7.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists7.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists7.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists7.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists8.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists8.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/http/exists8.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/http/exists8.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/data/massive.png b/tests/auto/qtquick2/qdeclarativepixmapcache/data/massive.png Binary files differindex bc6cc9e6ca..bc6cc9e6ca 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/data/massive.png +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/data/massive.png diff --git a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro b/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro index 79d411c62c..391c28c10a 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/qdeclarativepixmapcache.pro +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/qdeclarativepixmapcache.pro @@ -4,9 +4,9 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativepixmapcache.cpp -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h -SOURCES += ../shared/testhttpserver.cpp +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp importFiles.files = data importFiles.path = . @@ -17,4 +17,4 @@ DEPLOYMENT += importFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp index 7a1c9e6bfd..2e326263c0 100644 --- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp +++ b/tests/auto/qtquick2/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QtTest> -#include <private/qdeclarativepixmapcache_p.h> +#include <QtQuick/private/qdeclarativepixmapcache_p.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativeimageprovider.h> #include <QNetworkReply> -#include "../shared/util.h" +#include "../../shared/util.h" #include "testhttpserver.h" #ifndef QT_NO_CONCURRENT @@ -406,7 +406,7 @@ void tst_qdeclarativepixmapcache::lockingCrash() } } -#include <QQuickView> +#include <QtQuick/QQuickView> class DataLeakView : public QQuickView { Q_OBJECT diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml index 3631f971f0..3631f971f0 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation1.qml +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation1.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml index b07120234a..b07120234a 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation2.qml +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation2.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml index 8d5dc4a92b..8d5dc4a92b 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimation3.qml +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimation3.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml index 81d36bf015..81d36bf015 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationBehavior.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml index e136df84f6..e136df84f6 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/data/smoothedanimationValueSource.qml diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro index 05d31be39d..1e8a7d5ba6 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/qdeclarativesmoothedanimation.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp index 735af520fe..632bcda091 100644 --- a/tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp +++ b/tests/auto/qtquick2/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp @@ -42,9 +42,9 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativesmoothedanimation_p.h> -#include <private/qquickrectangle_p.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <private/qdeclarativevaluetype_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativesmoothedanimation : public QObject { diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation1.qml index 9f52aa56c1..9f52aa56c1 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation1.qml +++ b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation1.qml diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation2.qml index 172cc57ca8..172cc57ca8 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation2.qml +++ b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation2.qml diff --git a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation3.qml index f4dc121eb8..f4dc121eb8 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/data/springanimation3.qml +++ b/tests/auto/qtquick2/qdeclarativespringanimation/data/springanimation3.qml diff --git a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro b/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro index 7153327829..3ac2551380 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/qdeclarativespringanimation.pro +++ b/tests/auto/qtquick2/qdeclarativespringanimation/qdeclarativespringanimation.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp b/tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp index d7edcee386..f7acc2a3e0 100644 --- a/tests/auto/declarative/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp +++ b/tests/auto/qtquick2/qdeclarativespringanimation/tst_qdeclarativespringanimation.cpp @@ -43,7 +43,7 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <private/qdeclarativespringanimation_p.h> #include <private/qdeclarativevaluetype_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qdeclarativespringanimation : public QObject { diff --git a/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml b/tests/auto/qtquick2/qdeclarativestates/data/ExtendedRectangle.qml index 1ea346b841..1ea346b841 100644 --- a/tests/auto/declarative/qdeclarativestates/data/ExtendedRectangle.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/ExtendedRectangle.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml b/tests/auto/qtquick2/qdeclarativestates/data/Implementation/MyType.qml index 01eb32cd4d..01eb32cd4d 100644 --- a/tests/auto/declarative/qdeclarativestates/data/Implementation/MyType.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/Implementation/MyType.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png b/tests/auto/qtquick2/qdeclarativestates/data/Implementation/images/qt-logo.png Binary files differindex 14ddf2a028..14ddf2a028 100644 --- a/tests/auto/declarative/qdeclarativestates/data/Implementation/images/qt-logo.png +++ b/tests/auto/qtquick2/qdeclarativestates/data/Implementation/images/qt-logo.png diff --git a/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml b/tests/auto/qtquick2/qdeclarativestates/data/QTBUG-14830.qml index 5ba7c3ad6f..5ba7c3ad6f 100644 --- a/tests/auto/declarative/qdeclarativestates/data/QTBUG-14830.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/QTBUG-14830.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges1.qml index 378f5390f9..378f5390f9 100644 --- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges1.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges1.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges2.qml index dc7f8ef0d1..dc7f8ef0d1 100644 --- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges2.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges3.qml index af49575854..af49575854 100644 --- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges3.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges4.qml index 28b55818bd..28b55818bd 100644 --- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges4.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges4.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges5.qml index b1ca968fb9..b1ca968fb9 100644 --- a/tests/auto/declarative/qdeclarativestates/data/anchorChanges5.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/anchorChanges5.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorChangesCrash.qml index 9af0e4645a..9af0e4645a 100644 --- a/tests/auto/declarative/qdeclarativestates/data/anchorChangesCrash.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/anchorChangesCrash.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug.qml index 60c537b1ed..60c537b1ed 100644 --- a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml b/tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug2.qml index 574ef473ce..574ef473ce 100644 --- a/tests/auto/declarative/qdeclarativestates/data/anchorRewindBug2.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/anchorRewindBug2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml b/tests/auto/qtquick2/qdeclarativestates/data/attachedPropertyChanges.qml index 413af2ee42..413af2ee42 100644 --- a/tests/auto/declarative/qdeclarativestates/data/attachedPropertyChanges.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/attachedPropertyChanges.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml b/tests/auto/qtquick2/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml index 6cbf524ec2..6cbf524ec2 100644 --- a/tests/auto/declarative/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/autoStateAtStartupRestoreBug.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/avoidFastForward.qml b/tests/auto/qtquick2/qdeclarativestates/data/avoidFastForward.qml index 519befc31e..519befc31e 100644 --- a/tests/auto/declarative/qdeclarativestates/data/avoidFastForward.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/avoidFastForward.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding.qml index 59b67d0863..59b67d0863 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicBinding.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding2.qml index 55f88120aa..55f88120aa 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicBinding2.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding3.qml index 361ab0b091..361ab0b091 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicBinding3.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding4.qml index b29f0fcf22..b29f0fcf22 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicBinding4.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicBinding4.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges.qml index 3e2b73acde..3e2b73acde 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicChanges.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges2.qml index 5ff46cc60c..5ff46cc60c 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicChanges2.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges3.qml index e46e98f75e..e46e98f75e 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicChanges3.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges4.qml index 7da1e0fb2e..7da1e0fb2e 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicChanges4.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicChanges4.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml b/tests/auto/qtquick2/qdeclarativestates/data/basicExtension.qml index 00f5fee287..00f5fee287 100644 --- a/tests/auto/declarative/qdeclarativestates/data/basicExtension.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/basicExtension.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/deleting.qml b/tests/auto/qtquick2/qdeclarativestates/data/deleting.qml index b8e8d33c17..b8e8d33c17 100644 --- a/tests/auto/declarative/qdeclarativestates/data/deleting.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/deleting.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/deletingState.qml b/tests/auto/qtquick2/qdeclarativestates/data/deletingState.qml index 68a9c2a24d..68a9c2a24d 100644 --- a/tests/auto/declarative/qdeclarativestates/data/deletingState.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/deletingState.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/editProperties.qml b/tests/auto/qtquick2/qdeclarativestates/data/editProperties.qml index 9bff3657ba..9bff3657ba 100644 --- a/tests/auto/declarative/qdeclarativestates/data/editProperties.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/editProperties.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/explicit.qml b/tests/auto/qtquick2/qdeclarativestates/data/explicit.qml index d09893a1db..d09893a1db 100644 --- a/tests/auto/declarative/qdeclarativestates/data/explicit.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/explicit.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/extendsBug.qml b/tests/auto/qtquick2/qdeclarativestates/data/extendsBug.qml index 573341520d..573341520d 100644 --- a/tests/auto/declarative/qdeclarativestates/data/extendsBug.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/extendsBug.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml b/tests/auto/qtquick2/qdeclarativestates/data/fakeExtension.qml index 6a5c7003f6..6a5c7003f6 100644 --- a/tests/auto/declarative/qdeclarativestates/data/fakeExtension.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/fakeExtension.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/illegalObj.qml b/tests/auto/qtquick2/qdeclarativestates/data/illegalObj.qml index a2bbd5d32b..a2bbd5d32b 100644 --- a/tests/auto/declarative/qdeclarativestates/data/illegalObj.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/illegalObj.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml b/tests/auto/qtquick2/qdeclarativestates/data/illegalTempState.qml index 9cb39c0728..9cb39c0728 100644 --- a/tests/auto/declarative/qdeclarativestates/data/illegalTempState.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/illegalTempState.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/image.png b/tests/auto/qtquick2/qdeclarativestates/data/image.png Binary files differindex ed1833c95b..ed1833c95b 100644 --- a/tests/auto/declarative/qdeclarativestates/data/image.png +++ b/tests/auto/qtquick2/qdeclarativestates/data/image.png diff --git a/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml b/tests/auto/qtquick2/qdeclarativestates/data/legalTempState.qml index a93860f5cc..a93860f5cc 100644 --- a/tests/auto/declarative/qdeclarativestates/data/legalTempState.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/legalTempState.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml b/tests/auto/qtquick2/qdeclarativestates/data/nonExistantProp.qml index ce502699bb..ce502699bb 100644 --- a/tests/auto/declarative/qdeclarativestates/data/nonExistantProp.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/nonExistantProp.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange1.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange1.qml index 663ad1a264..663ad1a264 100644 --- a/tests/auto/declarative/qdeclarativestates/data/parentChange1.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/parentChange1.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange2.qml index ae290e961e..ae290e961e 100644 --- a/tests/auto/declarative/qdeclarativestates/data/parentChange2.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/parentChange2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange3.qml index 46665cb4c8..46665cb4c8 100644 --- a/tests/auto/declarative/qdeclarativestates/data/parentChange3.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/parentChange3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange4.qml index 22de72f8c9..22de72f8c9 100644 --- a/tests/auto/declarative/qdeclarativestates/data/parentChange4.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/parentChange4.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange5.qml index c353d2637f..c353d2637f 100644 --- a/tests/auto/declarative/qdeclarativestates/data/parentChange5.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/parentChange5.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/parentChange6.qml b/tests/auto/qtquick2/qdeclarativestates/data/parentChange6.qml index b373dbba20..b373dbba20 100644 --- a/tests/auto/declarative/qdeclarativestates/data/parentChange6.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/parentChange6.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml b/tests/auto/qtquick2/qdeclarativestates/data/propertyErrors.qml index ddd636493d..ddd636493d 100644 --- a/tests/auto/declarative/qdeclarativestates/data/propertyErrors.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/propertyErrors.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/reset.qml b/tests/auto/qtquick2/qdeclarativestates/data/reset.qml index f0ecab0950..f0ecab0950 100644 --- a/tests/auto/declarative/qdeclarativestates/data/reset.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/reset.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml b/tests/auto/qtquick2/qdeclarativestates/data/restoreEntryValues.qml index 950a522841..950a522841 100644 --- a/tests/auto/declarative/qdeclarativestates/data/restoreEntryValues.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/restoreEntryValues.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/returnToBase.qml b/tests/auto/qtquick2/qdeclarativestates/data/returnToBase.qml index 9a0ee82397..9a0ee82397 100644 --- a/tests/auto/declarative/qdeclarativestates/data/returnToBase.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/returnToBase.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/revertListBug.qml b/tests/auto/qtquick2/qdeclarativestates/data/revertListBug.qml index fbc4bc5ecc..fbc4bc5ecc 100644 --- a/tests/auto/declarative/qdeclarativestates/data/revertListBug.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/revertListBug.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/script.qml b/tests/auto/qtquick2/qdeclarativestates/data/script.qml index 218f0fae74..218f0fae74 100644 --- a/tests/auto/declarative/qdeclarativestates/data/script.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/script.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverride.qml index 9ab8037e51..9ab8037e51 100644 --- a/tests/auto/declarative/qdeclarativestates/data/signalOverride.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/signalOverride.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverride2.qml index 4e5e335b8b..4e5e335b8b 100644 --- a/tests/auto/declarative/qdeclarativestates/data/signalOverride2.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/signalOverride2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash.qml index 3e2ae1e93d..3e2ae1e93d 100644 --- a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash2.qml index 3937874aa2..3937874aa2 100644 --- a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash2.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash2.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash3.qml b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash3.qml index 98d4c57219..98d4c57219 100644 --- a/tests/auto/declarative/qdeclarativestates/data/signalOverrideCrash3.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/signalOverrideCrash3.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml b/tests/auto/qtquick2/qdeclarativestates/data/unnamedWhen.qml index 35eacff07b..35eacff07b 100644 --- a/tests/auto/declarative/qdeclarativestates/data/unnamedWhen.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/unnamedWhen.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml b/tests/auto/qtquick2/qdeclarativestates/data/urlResolution.qml index 516ac034d6..516ac034d6 100644 --- a/tests/auto/declarative/qdeclarativestates/data/urlResolution.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/urlResolution.qml diff --git a/tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml b/tests/auto/qtquick2/qdeclarativestates/data/whenOrdering.qml index 92025a2054..92025a2054 100644 --- a/tests/auto/declarative/qdeclarativestates/data/whenOrdering.qml +++ b/tests/auto/qtquick2/qdeclarativestates/data/whenOrdering.qml diff --git a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro b/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro index c0ffda7828..f799f7066b 100644 --- a/tests/auto/declarative/qdeclarativestates/qdeclarativestates.pro +++ b/tests/auto/qtquick2/qdeclarativestates/qdeclarativestates.pro @@ -9,4 +9,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp b/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp index 2535f89030..663d78d402 100644 --- a/tests/auto/declarative/qdeclarativestates/tst_qdeclarativestates.cpp +++ b/tests/auto/qtquick2/qdeclarativestates/tst_qdeclarativestates.cpp @@ -41,16 +41,16 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <private/qquickstateoperations_p.h> #include <private/qquickanchors_p_p.h> -#include <private/qquickrectangle_p.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <private/qquickimage_p.h> -#include <private/qdeclarativepropertychanges_p.h> -#include <private/qdeclarativestategroup_p.h> +#include <QtQuick/private/qdeclarativepropertychanges_p.h> +#include <QtQuick/private/qdeclarativestategroup_p.h> #include <private/qquickitem_p.h> #include <private/qdeclarativeproperty_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" class MyAttached : public QObject { diff --git a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro b/tests/auto/qtquick2/qdeclarativestyledtext/qdeclarativestyledtext.pro index 70e6fafe59..84532f611e 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/qdeclarativestyledtext.pro +++ b/tests/auto/qtquick2/qdeclarativestyledtext/qdeclarativestyledtext.pro @@ -5,4 +5,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativestyledtext.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp b/tests/auto/qtquick2/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp index b09c33302e..b09c33302e 100644 --- a/tests/auto/declarative/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp +++ b/tests/auto/qtquick2/qdeclarativestyledtext/tst_qdeclarativestyledtext.cpp diff --git a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro b/tests/auto/qtquick2/qdeclarativesystempalette/qdeclarativesystempalette.pro index 4eee37678f..87c2af2190 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/qdeclarativesystempalette.pro +++ b/tests/auto/qtquick2/qdeclarativesystempalette/qdeclarativesystempalette.pro @@ -5,4 +5,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativesystempalette.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private widgets testlib +QT += core-private gui-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp b/tests/auto/qtquick2/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp index 8c9543273c..4cb09f90f5 100644 --- a/tests/auto/declarative/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp +++ b/tests/auto/qtquick2/qdeclarativesystempalette/tst_qdeclarativesystempalette.cpp @@ -43,7 +43,7 @@ #include <QDebug> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/private/qdeclarativesystempalette_p.h> +#include <QtQuick/private/qdeclarativesystempalette_p.h> #include <qpalette.h> class tst_qdeclarativesystempalette : public QObject diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/qtquick2/qdeclarativetimer/qdeclarativetimer.pro index 60e59f01f6..d990dc449f 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/qtquick2/qdeclarativetimer/qdeclarativetimer.pro @@ -5,4 +5,4 @@ macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetimer.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private gui testlib +QT += core-private gui-private declarative-private quick-private gui testlib diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/qtquick2/qdeclarativetimer/tst_qdeclarativetimer.cpp index 1e795099e8..ac32585365 100644 --- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp +++ b/tests/auto/qtquick2/qdeclarativetimer/tst_qdeclarativetimer.cpp @@ -42,8 +42,8 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <private/qdeclarativetimer_p.h> -#include <QtDeclarative/qquickitem.h> +#include <QtQuick/private/qdeclarativetimer_p.h> +#include <QtQuick/qquickitem.h> #include <QDebug> class tst_qdeclarativetimer : public QObject diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/empty.xml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/empty.xml index e69de29bb2..e69de29bb2 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/empty.xml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/empty.xml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/get.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/get.qml index 509da7174b..509da7174b 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/get.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/get.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.qml index 2df3927479..2df3927479 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.xml index 40cd6d0432..40cd6d0432 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/model.xml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model.xml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model2.xml index dab2ec6dc0..dab2ec6dc0 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.xml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/model2.xml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/propertychanges.qml index f8a97bffc3..f8a97bffc3 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/propertychanges.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/propertychanges.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.qml index dc609e95e3..dc609e95e3 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.xml index d71de60710..d71de60710 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/recipes.xml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/recipes.xml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleCrash.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleCrash.qml index 6a7059bb45..6a7059bb45 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleCrash.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleCrash.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleErrors.qml index 91664b6d4a..91664b6d4a 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleErrors.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleErrors.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleKeys.qml index 9f667d86e5..9f667d86e5 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/roleKeys.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/roleKeys.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/testtypes.qml index 5ec1ffa35f..5ec1ffa35f 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/testtypes.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/unique.qml index 322a2e4e5c..322a2e4e5c 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/data/unique.qml +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/data/unique.qml diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro b/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro index 10944bcb41..10944bcb41 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/qdeclarativexmllistmodel.pro diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index c2cf4a69f6..316ac50c5e 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/qtquick2/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -51,7 +51,7 @@ #include <QtCore/qtimer.h> #include <QtCore/qfile.h> #include <QtCore/qtemporaryfile.h> -#include "../shared/util.h" +#include "../../shared/util.h" #include <private/qdeclarativeengine_p.h> #include <QtDeclarative/qdeclarativeengine.h> diff --git a/tests/auto/declarative/qquickanchors/data/anchors.qml b/tests/auto/qtquick2/qquickanchors/data/anchors.qml index 4be49a3468..4be49a3468 100644 --- a/tests/auto/declarative/qquickanchors/data/anchors.qml +++ b/tests/auto/qtquick2/qquickanchors/data/anchors.qml diff --git a/tests/auto/declarative/qquickanchors/data/centerin.qml b/tests/auto/qtquick2/qquickanchors/data/centerin.qml index e5f64f1e47..e5f64f1e47 100644 --- a/tests/auto/declarative/qquickanchors/data/centerin.qml +++ b/tests/auto/qtquick2/qquickanchors/data/centerin.qml diff --git a/tests/auto/declarative/qquickanchors/data/centerinRotation.qml b/tests/auto/qtquick2/qquickanchors/data/centerinRotation.qml index 933a25c100..933a25c100 100644 --- a/tests/auto/declarative/qquickanchors/data/centerinRotation.qml +++ b/tests/auto/qtquick2/qquickanchors/data/centerinRotation.qml diff --git a/tests/auto/declarative/qquickanchors/data/crash1.qml b/tests/auto/qtquick2/qquickanchors/data/crash1.qml index 98dd6cfa41..98dd6cfa41 100644 --- a/tests/auto/declarative/qquickanchors/data/crash1.qml +++ b/tests/auto/qtquick2/qquickanchors/data/crash1.qml diff --git a/tests/auto/declarative/qquickanchors/data/fill.qml b/tests/auto/qtquick2/qquickanchors/data/fill.qml index 08db199d7b..08db199d7b 100644 --- a/tests/auto/declarative/qquickanchors/data/fill.qml +++ b/tests/auto/qtquick2/qquickanchors/data/fill.qml diff --git a/tests/auto/declarative/qquickanchors/data/hvCenter.qml b/tests/auto/qtquick2/qquickanchors/data/hvCenter.qml index 6763f8eb75..6763f8eb75 100644 --- a/tests/auto/declarative/qquickanchors/data/hvCenter.qml +++ b/tests/auto/qtquick2/qquickanchors/data/hvCenter.qml diff --git a/tests/auto/declarative/qquickanchors/data/loop1.qml b/tests/auto/qtquick2/qquickanchors/data/loop1.qml index 342b2af052..342b2af052 100644 --- a/tests/auto/declarative/qquickanchors/data/loop1.qml +++ b/tests/auto/qtquick2/qquickanchors/data/loop1.qml diff --git a/tests/auto/declarative/qquickanchors/data/loop2.qml b/tests/auto/qtquick2/qquickanchors/data/loop2.qml index e1875be025..e1875be025 100644 --- a/tests/auto/declarative/qquickanchors/data/loop2.qml +++ b/tests/auto/qtquick2/qquickanchors/data/loop2.qml diff --git a/tests/auto/declarative/qquickanchors/data/margins.qml b/tests/auto/qtquick2/qquickanchors/data/margins.qml index 9403f65a61..9403f65a61 100644 --- a/tests/auto/declarative/qquickanchors/data/margins.qml +++ b/tests/auto/qtquick2/qquickanchors/data/margins.qml diff --git a/tests/auto/declarative/qquickanchors/qquickanchors.pro b/tests/auto/qtquick2/qquickanchors/qquickanchors.pro index 0d085d367d..92f24cff07 100644 --- a/tests/auto/declarative/qquickanchors/qquickanchors.pro +++ b/tests/auto/qtquick2/qquickanchors/qquickanchors.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private v8-private testlib +QT += core-private gui-private declarative-private quick-private v8-private testlib diff --git a/tests/auto/declarative/qquickanchors/tst_qquickanchors.cpp b/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp index 00b52ebc50..cae1421573 100644 --- a/tests/auto/declarative/qquickanchors/tst_qquickanchors.cpp +++ b/tests/auto/qtquick2/qquickanchors/tst_qquickanchors.cpp @@ -43,12 +43,12 @@ #include <private/qquickitem_p.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> -#include <QtDeclarative/private/qquickrectangle_p.h> -#include <QtDeclarative/private/qquicktext_p.h> -#include <QtDeclarative/private/qquickanchors_p_p.h> -#include <QtDeclarative/private/qquickitem_p.h> -#include "../shared/util.h" +#include <QtQuick/qquickview.h> +#include <QtQuick/private/qquickrectangle_p.h> +#include <QtQuick/private/qquicktext_p.h> +#include <QtQuick/private/qquickanchors_p_p.h> +#include <QtQuick/private/qquickitem_p.h> +#include "../../shared/util.h" Q_DECLARE_METATYPE(QQuickAnchors::Anchor) Q_DECLARE_METATYPE(QQuickAnchorLine::AnchorLine) diff --git a/tests/auto/declarative/qquickanimatedimage/data/colors.gif b/tests/auto/qtquick2/qquickanimatedimage/data/colors.gif Binary files differindex 1270bfaa79..1270bfaa79 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/colors.gif +++ b/tests/auto/qtquick2/qquickanimatedimage/data/colors.gif diff --git a/tests/auto/declarative/qquickanimatedimage/data/colors.qml b/tests/auto/qtquick2/qquickanimatedimage/data/colors.qml index 5ccc0148dd..5ccc0148dd 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/colors.qml +++ b/tests/auto/qtquick2/qquickanimatedimage/data/colors.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/hearts.gif b/tests/auto/qtquick2/qquickanimatedimage/data/hearts.gif Binary files differindex cfb55f27f5..cfb55f27f5 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/hearts.gif +++ b/tests/auto/qtquick2/qquickanimatedimage/data/hearts.gif diff --git a/tests/auto/declarative/qquickanimatedimage/data/hearts.qml b/tests/auto/qtquick2/qquickanimatedimage/data/hearts.qml index 717bab430b..717bab430b 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/hearts.qml +++ b/tests/auto/qtquick2/qquickanimatedimage/data/hearts.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/qmldir b/tests/auto/qtquick2/qquickanimatedimage/data/qmldir index ef7c1f44f3..ef7c1f44f3 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/qmldir +++ b/tests/auto/qtquick2/qquickanimatedimage/data/qmldir diff --git a/tests/auto/declarative/qquickanimatedimage/data/qtbug-16520.qml b/tests/auto/qtquick2/qquickanimatedimage/data/qtbug-16520.qml index da77a4063b..da77a4063b 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/qtbug-16520.qml +++ b/tests/auto/qtquick2/qquickanimatedimage/data/qtbug-16520.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickman.gif b/tests/auto/qtquick2/qquickanimatedimage/data/stickman.gif Binary files differindex 7c4cd18687..7c4cd18687 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/stickman.gif +++ b/tests/auto/qtquick2/qquickanimatedimage/data/stickman.gif diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickman.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickman.qml index a47924de21..a47924de21 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/stickman.qml +++ b/tests/auto/qtquick2/qquickanimatedimage/data/stickman.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickmanerror1.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanerror1.qml index 4f823b3d70..4f823b3d70 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/stickmanerror1.qml +++ b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanerror1.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickmanpause.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanpause.qml index ef771ed56f..ef771ed56f 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/stickmanpause.qml +++ b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanpause.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickmanscaled.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanscaled.qml index 1ef1f95165..1ef1f95165 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/stickmanscaled.qml +++ b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanscaled.qml diff --git a/tests/auto/declarative/qquickanimatedimage/data/stickmanstopped.qml b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanstopped.qml index 0bf80b8972..0bf80b8972 100644 --- a/tests/auto/declarative/qquickanimatedimage/data/stickmanstopped.qml +++ b/tests/auto/qtquick2/qquickanimatedimage/data/stickmanstopped.qml diff --git a/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro b/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro new file mode 100644 index 0000000000..56394592b8 --- /dev/null +++ b/tests/auto/qtquick2/qquickanimatedimage/qquickanimatedimage.pro @@ -0,0 +1,13 @@ +CONFIG += testcase +TARGET = tst_qquickanimatedimage +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquickanimatedimage.cpp ../../shared/testhttpserver.cpp +macx:CONFIG -= app_bundle + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickanimatedimage/tst_qquickanimatedimage.cpp b/tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp index 542811efc1..bf1017fe21 100644 --- a/tests/auto/declarative/qquickanimatedimage/tst_qquickanimatedimage.cpp +++ b/tests/auto/qtquick2/qquickanimatedimage/tst_qquickanimatedimage.cpp @@ -41,15 +41,15 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> -#include <private/qquickrectangle_p.h> +#include <QtQuick/qquickview.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <private/qquickimage_p.h> #include <private/qquickanimatedimage_p.h> #include <QSignalSpy> #include <QtDeclarative/qdeclarativecontext.h> -#include "../shared/testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/testhttpserver.h" +#include "../../shared/util.h" Q_DECLARE_METATYPE(QQuickImageBase::Status) diff --git a/tests/auto/declarative/qquickborderimage/data/colors-mirror.png b/tests/auto/qtquick2/qquickborderimage/data/colors-mirror.png Binary files differindex e30870dd1e..e30870dd1e 100644 --- a/tests/auto/declarative/qquickborderimage/data/colors-mirror.png +++ b/tests/auto/qtquick2/qquickborderimage/data/colors-mirror.png diff --git a/tests/auto/declarative/qquickborderimage/data/colors-round-quotes.sci b/tests/auto/qtquick2/qquickborderimage/data/colors-round-quotes.sci index 294f3cfe48..294f3cfe48 100644 --- a/tests/auto/declarative/qquickborderimage/data/colors-round-quotes.sci +++ b/tests/auto/qtquick2/qquickborderimage/data/colors-round-quotes.sci diff --git a/tests/auto/declarative/qquickborderimage/data/colors-round-remote.sci b/tests/auto/qtquick2/qquickborderimage/data/colors-round-remote.sci index c673bed598..c673bed598 100644 --- a/tests/auto/declarative/qquickborderimage/data/colors-round-remote.sci +++ b/tests/auto/qtquick2/qquickborderimage/data/colors-round-remote.sci diff --git a/tests/auto/declarative/qquickborderimage/data/colors-round.sci b/tests/auto/qtquick2/qquickborderimage/data/colors-round.sci index 5d2f49f0e1..5d2f49f0e1 100644 --- a/tests/auto/declarative/qquickborderimage/data/colors-round.sci +++ b/tests/auto/qtquick2/qquickborderimage/data/colors-round.sci diff --git a/tests/auto/declarative/qquickborderimage/data/colors.png b/tests/auto/qtquick2/qquickborderimage/data/colors.png Binary files differindex dfb62f3d64..dfb62f3d64 100644 --- a/tests/auto/declarative/qquickborderimage/data/colors.png +++ b/tests/auto/qtquick2/qquickborderimage/data/colors.png diff --git a/tests/auto/declarative/qquickborderimage/data/heart200.png b/tests/auto/qtquick2/qquickborderimage/data/heart200.png Binary files differindex 5a31ae8f4d..5a31ae8f4d 100644 --- a/tests/auto/declarative/qquickborderimage/data/heart200.png +++ b/tests/auto/qtquick2/qquickborderimage/data/heart200.png diff --git a/tests/auto/declarative/qquickborderimage/data/invalid.sci b/tests/auto/qtquick2/qquickborderimage/data/invalid.sci index 98c72c9bf1..98c72c9bf1 100644 --- a/tests/auto/declarative/qquickborderimage/data/invalid.sci +++ b/tests/auto/qtquick2/qquickborderimage/data/invalid.sci diff --git a/tests/auto/declarative/qquickborderimage/data/mirror.qml b/tests/auto/qtquick2/qquickborderimage/data/mirror.qml index abab076e08..abab076e08 100644 --- a/tests/auto/declarative/qquickborderimage/data/mirror.qml +++ b/tests/auto/qtquick2/qquickborderimage/data/mirror.qml diff --git a/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro b/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro new file mode 100644 index 0000000000..34d08aa37f --- /dev/null +++ b/tests/auto/qtquick2/qquickborderimage/qquickborderimage.pro @@ -0,0 +1,14 @@ +CONFIG += testcase +TARGET = tst_qquickborderimage +macx:CONFIG -= app_bundle + +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquickborderimage.cpp ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private quick-private network widgets testlib diff --git a/tests/auto/declarative/qquickborderimage/tst_qquickborderimage.cpp b/tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp index 4fb6ed7057..b9fd91d7fb 100644 --- a/tests/auto/declarative/qquickborderimage/tst_qquickborderimage.cpp +++ b/tests/auto/qtquick2/qquickborderimage/tst_qquickborderimage.cpp @@ -52,11 +52,11 @@ #include <private/qquickimagebase_p.h> #include <private/qquickscalegrid_p_p.h> #include <private/qquickloader_p.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativecontext.h> -#include "../shared/testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/testhttpserver.h" +#include "../../shared/util.h" #define SERVER_PORT 14446 #define SERVER_ADDR "http://127.0.0.1:14446" diff --git a/tests/auto/declarative/qquickcanvas/data/window.qml b/tests/auto/qtquick2/qquickcanvas/data/window.qml index d79d5161b5..d79d5161b5 100644 --- a/tests/auto/declarative/qquickcanvas/data/window.qml +++ b/tests/auto/qtquick2/qquickcanvas/data/window.qml diff --git a/tests/auto/declarative/qquickcanvas/qquickcanvas.pro b/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro index b45a3597d4..c95d474a21 100644 --- a/tests/auto/declarative/qquickcanvas/qquickcanvas.pro +++ b/tests/auto/qtquick2/qquickcanvas/qquickcanvas.pro @@ -5,4 +5,4 @@ SOURCES += tst_qquickcanvas.cpp macx:CONFIG -= app_bundle CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp index 829d666b7e..f894ff3d39 100644 --- a/tests/auto/declarative/qquickcanvas/tst_qquickcanvas.cpp +++ b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp @@ -42,13 +42,13 @@ #include <qtest.h> #include <QDebug> #include <QTouchEvent> -#include <QtDeclarative/QQuickItem> -#include <QtDeclarative/QQuickCanvas> +#include <QtQuick/QQuickItem> +#include <QtQuick/QQuickCanvas> #include <QtDeclarative/QDeclarativeEngine> #include <QtDeclarative/QDeclarativeComponent> -#include <QtDeclarative/private/qquickrectangle_p.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <QtGui/QWindowSystemInterface> -#include "../shared/util.h" +#include "../../shared/util.h" struct TouchEventData { QEvent::Type type; diff --git a/tests/auto/declarative/qquickcanvasitem/data/anim-gr.gif b/tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.gif Binary files differindex 45263e0afb..45263e0afb 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/anim-gr.gif +++ b/tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.gif diff --git a/tests/auto/declarative/qquickcanvasitem/data/anim-gr.png b/tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.png Binary files differindex 925e2efc9a..925e2efc9a 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/anim-gr.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/anim-gr.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/anim-poster-gr.png b/tests/auto/qtquick2/qquickcanvasitem/data/anim-poster-gr.png Binary files differindex 6941207373..6941207373 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/anim-poster-gr.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/anim-poster-gr.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/background.png b/tests/auto/qtquick2/qquickcanvasitem/data/background.png Binary files differindex 6db6c6b1b9..6db6c6b1b9 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/background.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/background.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/broken.png b/tests/auto/qtquick2/qquickcanvasitem/data/broken.png Binary files differindex f2581017b4..f2581017b4 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/broken.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/broken.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/ggrr-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/ggrr-256x256.png Binary files differindex 0342e4a384..0342e4a384 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/ggrr-256x256.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/ggrr-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green-16x16.png b/tests/auto/qtquick2/qquickcanvasitem/data/green-16x16.png Binary files differindex e19a3ffddd..e19a3ffddd 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/green-16x16.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/green-16x16.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green-1x1.png b/tests/auto/qtquick2/qquickcanvasitem/data/green-1x1.png Binary files differindex 862d1dd10c..862d1dd10c 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/green-1x1.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/green-1x1.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/green-256x256.png Binary files differindex b06945c310..b06945c310 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/green-256x256.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/green-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green-2x2.png b/tests/auto/qtquick2/qquickcanvasitem/data/green-2x2.png Binary files differindex adc059449c..adc059449c 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/green-2x2.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/green-2x2.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/green.png b/tests/auto/qtquick2/qquickcanvasitem/data/green.png Binary files differindex 28a1faab37..28a1faab37 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/green.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/green.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/grgr-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/grgr-256x256.png Binary files differindex b8c7189d62..b8c7189d62 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/grgr-256x256.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/grgr-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/red-16x16.png b/tests/auto/qtquick2/qquickcanvasitem/data/red-16x16.png Binary files differindex 9038fef784..9038fef784 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/red-16x16.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/red-16x16.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/red.png b/tests/auto/qtquick2/qquickcanvasitem/data/red.png Binary files differindex a6e195d59c..a6e195d59c 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/red.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/red.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/redtransparent.png b/tests/auto/qtquick2/qquickcanvasitem/data/redtransparent.png Binary files differindex 75da08c3d6..75da08c3d6 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/redtransparent.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/redtransparent.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/rgrg-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/rgrg-256x256.png Binary files differindex e6fba3daa5..e6fba3daa5 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/rgrg-256x256.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/rgrg-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/rrgg-256x256.png b/tests/auto/qtquick2/qquickcanvasitem/data/rrgg-256x256.png Binary files differindex 7f63515654..7f63515654 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/rrgg-256x256.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/rrgg-256x256.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/testhelper.js b/tests/auto/qtquick2/qquickcanvasitem/data/testhelper.js index bac0210e16..bac0210e16 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/testhelper.js +++ b/tests/auto/qtquick2/qquickcanvasitem/data/testhelper.js diff --git a/tests/auto/declarative/qquickcanvasitem/data/transparent.png b/tests/auto/qtquick2/qquickcanvasitem/data/transparent.png Binary files differindex 2b498699a8..2b498699a8 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/transparent.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/transparent.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/transparent50.png b/tests/auto/qtquick2/qquickcanvasitem/data/transparent50.png Binary files differindex 55f8e69325..55f8e69325 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/transparent50.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/transparent50.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_arc.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_arc.qml index 6006a5a4c0..6006a5a4c0 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_arc.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_arc.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_arcto.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_arcto.qml index cc1d88672b..cc1d88672b 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_arcto.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_arcto.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_canvas.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_canvas.qml index 70bedb2131..70bedb2131 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_canvas.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_canvas.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_composite.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_composite.qml index 11e1dce902..11e1dce902 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_composite.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_composite.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_drawimage.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml index 3752f528be..3752f528be 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_drawimage.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_fillStyle.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillStyle.qml index 8f5a78cec0..8f5a78cec0 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_fillStyle.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillStyle.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_fillrect.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml index 2061647268..2061647268 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_fillrect.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_gradient.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_gradient.qml index d454c2efe1..d454c2efe1 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_gradient.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_gradient.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_line.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_line.qml index baf9987ce3..baf9987ce3 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_line.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_line.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_path.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_path.qml index b04ccf5458..b04ccf5458 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_path.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_path.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_pattern.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_pattern.qml index dd5b6628e8..dd5b6628e8 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_pattern.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_pattern.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_pixel.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_pixel.qml index 1a3793d7a3..1a3793d7a3 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_pixel.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_pixel.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_shadow.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_shadow.qml index 4405ca6c0e..4405ca6c0e 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_shadow.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_shadow.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_state.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_state.qml index 8042cf6a1d..8042cf6a1d 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_state.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_state.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_strokeStyle.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_strokeStyle.qml index 6b42f8a770..6b42f8a770 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_strokeStyle.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_strokeStyle.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_text.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_text.qml index baeb17c9fb..baeb17c9fb 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_text.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_text.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/tst_transform.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_transform.qml index 834a22f549..834a22f549 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/tst_transform.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_transform.qml diff --git a/tests/auto/declarative/qquickcanvasitem/data/yellow.png b/tests/auto/qtquick2/qquickcanvasitem/data/yellow.png Binary files differindex 51e8aaf38c..51e8aaf38c 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/yellow.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/yellow.png diff --git a/tests/auto/declarative/qquickcanvasitem/data/yellow75.png b/tests/auto/qtquick2/qquickcanvasitem/data/yellow75.png Binary files differindex 2bb82c9834..2bb82c9834 100644 --- a/tests/auto/declarative/qquickcanvasitem/data/yellow75.png +++ b/tests/auto/qtquick2/qquickcanvasitem/data/yellow75.png diff --git a/tests/auto/declarative/qquickcanvasitem/qquickcanvasitem.pro b/tests/auto/qtquick2/qquickcanvasitem/qquickcanvasitem.pro index 141e477416..141e477416 100644 --- a/tests/auto/declarative/qquickcanvasitem/qquickcanvasitem.pro +++ b/tests/auto/qtquick2/qquickcanvasitem/qquickcanvasitem.pro diff --git a/tests/auto/declarative/qquickcanvasitem/tst_qquickcanvasitem.cpp b/tests/auto/qtquick2/qquickcanvasitem/tst_qquickcanvasitem.cpp index 57195babb7..57195babb7 100644 --- a/tests/auto/declarative/qquickcanvasitem/tst_qquickcanvasitem.cpp +++ b/tests/auto/qtquick2/qquickcanvasitem/tst_qquickcanvasitem.cpp diff --git a/tests/auto/declarative/qquickdrag/qquickdrag.pro b/tests/auto/qtquick2/qquickdrag/qquickdrag.pro index 416ecdbe8e..4fdfa7b355 100644 --- a/tests/auto/declarative/qquickdrag/qquickdrag.pro +++ b/tests/auto/qtquick2/qquickdrag/qquickdrag.pro @@ -6,4 +6,4 @@ SOURCES += tst_qquickdrag.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickdrag/tst_qquickdrag.cpp b/tests/auto/qtquick2/qquickdrag/tst_qquickdrag.cpp index 6bc0866a6e..9163df6c62 100644 --- a/tests/auto/declarative/qquickdrag/tst_qquickdrag.cpp +++ b/tests/auto/qtquick2/qquickdrag/tst_qquickdrag.cpp @@ -41,8 +41,8 @@ #include <QtTest/QtTest> #include <QtTest/QSignalSpy> -#include <QtDeclarative/qquickitem.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativeexpression.h> diff --git a/tests/auto/declarative/qquickdroparea/qquickdroparea.pro b/tests/auto/qtquick2/qquickdroparea/qquickdroparea.pro index eff08a2e94..46fe08c145 100644 --- a/tests/auto/declarative/qquickdroparea/qquickdroparea.pro +++ b/tests/auto/qtquick2/qquickdroparea/qquickdroparea.pro @@ -6,4 +6,4 @@ SOURCES += tst_qquickdroparea.cpp CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickdroparea/tst_qquickdroparea.cpp b/tests/auto/qtquick2/qquickdroparea/tst_qquickdroparea.cpp index 0147536abf..f8a081ff21 100644 --- a/tests/auto/declarative/qquickdroparea/tst_qquickdroparea.cpp +++ b/tests/auto/qtquick2/qquickdroparea/tst_qquickdroparea.cpp @@ -41,8 +41,8 @@ #include <QtTest/QtTest> #include <QtTest/QSignalSpy> -#include <QtDeclarative/qquickitem.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativeexpression.h> diff --git a/tests/auto/declarative/qquickflickable/data/disabled.qml b/tests/auto/qtquick2/qquickflickable/data/disabled.qml index 9b679827c7..9b679827c7 100644 --- a/tests/auto/declarative/qquickflickable/data/disabled.qml +++ b/tests/auto/qtquick2/qquickflickable/data/disabled.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickable01.qml b/tests/auto/qtquick2/qquickflickable/data/flickable01.qml index cbec44bb4f..cbec44bb4f 100644 --- a/tests/auto/declarative/qquickflickable/data/flickable01.qml +++ b/tests/auto/qtquick2/qquickflickable/data/flickable01.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickable02.qml b/tests/auto/qtquick2/qquickflickable/data/flickable02.qml index 80caa32da5..80caa32da5 100644 --- a/tests/auto/declarative/qquickflickable/data/flickable02.qml +++ b/tests/auto/qtquick2/qquickflickable/data/flickable02.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickable03.qml b/tests/auto/qtquick2/qquickflickable/data/flickable03.qml index ebc49ba90a..ebc49ba90a 100644 --- a/tests/auto/declarative/qquickflickable/data/flickable03.qml +++ b/tests/auto/qtquick2/qquickflickable/data/flickable03.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickable04.qml b/tests/auto/qtquick2/qquickflickable/data/flickable04.qml index b2f30b84ec..b2f30b84ec 100644 --- a/tests/auto/declarative/qquickflickable/data/flickable04.qml +++ b/tests/auto/qtquick2/qquickflickable/data/flickable04.qml diff --git a/tests/auto/declarative/qquickflickable/data/flickableqgraphicswidget.qml b/tests/auto/qtquick2/qquickflickable/data/flickableqgraphicswidget.qml index bb8f1eefc6..bb8f1eefc6 100644 --- a/tests/auto/declarative/qquickflickable/data/flickableqgraphicswidget.qml +++ b/tests/auto/qtquick2/qquickflickable/data/flickableqgraphicswidget.qml diff --git a/tests/auto/declarative/qquickflickable/data/margins.qml b/tests/auto/qtquick2/qquickflickable/data/margins.qml index 4866bd8301..4866bd8301 100644 --- a/tests/auto/declarative/qquickflickable/data/margins.qml +++ b/tests/auto/qtquick2/qquickflickable/data/margins.qml diff --git a/tests/auto/declarative/qquickflickable/data/nestedPressDelay.qml b/tests/auto/qtquick2/qquickflickable/data/nestedPressDelay.qml index 60dadcc73c..60dadcc73c 100644 --- a/tests/auto/declarative/qquickflickable/data/nestedPressDelay.qml +++ b/tests/auto/qtquick2/qquickflickable/data/nestedPressDelay.qml diff --git a/tests/auto/declarative/qquickflickable/data/resize.qml b/tests/auto/qtquick2/qquickflickable/data/resize.qml index 1a9ef54107..1a9ef54107 100644 --- a/tests/auto/declarative/qquickflickable/data/resize.qml +++ b/tests/auto/qtquick2/qquickflickable/data/resize.qml diff --git a/tests/auto/declarative/qquickflickable/data/wheel.qml b/tests/auto/qtquick2/qquickflickable/data/wheel.qml index 2928bbcd72..2928bbcd72 100644 --- a/tests/auto/declarative/qquickflickable/data/wheel.qml +++ b/tests/auto/qtquick2/qquickflickable/data/wheel.qml diff --git a/tests/auto/declarative/qquickflickable/qquickflickable.pro b/tests/auto/qtquick2/qquickflickable/qquickflickable.pro index ba951cc051..7376f593fd 100644 --- a/tests/auto/declarative/qquickflickable/qquickflickable.pro +++ b/tests/auto/qtquick2/qquickflickable/qquickflickable.pro @@ -9,4 +9,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp b/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp index a02db06616..1827e0af1c 100644 --- a/tests/auto/declarative/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/qtquick2/qquickflickable/tst_qquickflickable.cpp @@ -42,11 +42,11 @@ #include <QtTest/QSignalSpy> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <private/qquickflickable_p.h> #include <private/qdeclarativevaluetype_p.h> #include <math.h> -#include "../shared/util.h" +#include "../../shared/util.h" #include <QtOpenGL/QGLShaderProgram> class tst_qquickflickable : public QObject diff --git a/tests/auto/declarative/qquickflipable/data/crash.qml b/tests/auto/qtquick2/qquickflipable/data/crash.qml index a0327918cb..a0327918cb 100644 --- a/tests/auto/declarative/qquickflipable/data/crash.qml +++ b/tests/auto/qtquick2/qquickflipable/data/crash.qml diff --git a/tests/auto/declarative/qquickflipable/data/flipable-abort.qml b/tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml index 90fc03a5f9..90fc03a5f9 100644 --- a/tests/auto/declarative/qquickflipable/data/flipable-abort.qml +++ b/tests/auto/qtquick2/qquickflipable/data/flipable-abort.qml diff --git a/tests/auto/declarative/qquickflipable/data/test-flipable.qml b/tests/auto/qtquick2/qquickflipable/data/test-flipable.qml index dff6d3fe39..dff6d3fe39 100644 --- a/tests/auto/declarative/qquickflipable/data/test-flipable.qml +++ b/tests/auto/qtquick2/qquickflipable/data/test-flipable.qml diff --git a/tests/auto/declarative/qquickflipable/qquickflipable.pro b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro index a36c468c1c..532c42f79b 100644 --- a/tests/auto/declarative/qquickflipable/qquickflipable.pro +++ b/tests/auto/qtquick2/qquickflipable/qquickflipable.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private testlib +QT += core-private gui-private v8-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickflipable/tst_qquickflipable.cpp b/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp index 7243836031..a217e26714 100644 --- a/tests/auto/declarative/qquickflipable/tst_qquickflipable.cpp +++ b/tests/auto/qtquick2/qquickflipable/tst_qquickflipable.cpp @@ -41,14 +41,14 @@ #include <qtest.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <private/qquickflipable_p.h> #include <private/qdeclarativevaluetype_p.h> #include <QFontMetrics> -#include <private/qquickrectangle_p.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <math.h> #include <QtOpenGL/QGLShaderProgram> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qquickflipable : public QObject { diff --git a/tests/auto/declarative/qquickfocusscope/data/canvasFocus.qml b/tests/auto/qtquick2/qquickfocusscope/data/canvasFocus.qml index 7d8dac5a22..7d8dac5a22 100644 --- a/tests/auto/declarative/qquickfocusscope/data/canvasFocus.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/canvasFocus.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/chain.qml b/tests/auto/qtquick2/qquickfocusscope/data/chain.qml index 4b96662318..4b96662318 100644 --- a/tests/auto/declarative/qquickfocusscope/data/chain.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/chain.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/forceActiveFocus.qml b/tests/auto/qtquick2/qquickfocusscope/data/forceActiveFocus.qml index 74d2106888..74d2106888 100644 --- a/tests/auto/declarative/qquickfocusscope/data/forceActiveFocus.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/forceActiveFocus.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/forcefocus.qml b/tests/auto/qtquick2/qquickfocusscope/data/forcefocus.qml index f41582a951..f41582a951 100644 --- a/tests/auto/declarative/qquickfocusscope/data/forcefocus.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/forcefocus.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/qtBug13380.qml b/tests/auto/qtquick2/qquickfocusscope/data/qtBug13380.qml index 29de046b38..29de046b38 100644 --- a/tests/auto/declarative/qquickfocusscope/data/qtBug13380.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/qtBug13380.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/signalEmission.qml b/tests/auto/qtquick2/qquickfocusscope/data/signalEmission.qml index 999a40c5ad..999a40c5ad 100644 --- a/tests/auto/declarative/qquickfocusscope/data/signalEmission.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/signalEmission.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test.qml b/tests/auto/qtquick2/qquickfocusscope/data/test.qml index 67be29c3fb..67be29c3fb 100644 --- a/tests/auto/declarative/qquickfocusscope/data/test.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/test.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test2.qml b/tests/auto/qtquick2/qquickfocusscope/data/test2.qml index ad74f3e9f4..ad74f3e9f4 100644 --- a/tests/auto/declarative/qquickfocusscope/data/test2.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/test2.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test3.qml b/tests/auto/qtquick2/qquickfocusscope/data/test3.qml index 537c30816e..537c30816e 100644 --- a/tests/auto/declarative/qquickfocusscope/data/test3.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/test3.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test4.qml b/tests/auto/qtquick2/qquickfocusscope/data/test4.qml index 0eea649f5d..0eea649f5d 100644 --- a/tests/auto/declarative/qquickfocusscope/data/test4.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/test4.qml diff --git a/tests/auto/declarative/qquickfocusscope/data/test5.qml b/tests/auto/qtquick2/qquickfocusscope/data/test5.qml index 9c37cd1303..9c37cd1303 100644 --- a/tests/auto/declarative/qquickfocusscope/data/test5.qml +++ b/tests/auto/qtquick2/qquickfocusscope/data/test5.qml diff --git a/tests/auto/declarative/qquickfocusscope/qquickfocusscope.pro b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro index 79649ebb8a..138750db3c 100644 --- a/tests/auto/declarative/qquickfocusscope/qquickfocusscope.pro +++ b/tests/auto/qtquick2/qquickfocusscope/qquickfocusscope.pro @@ -7,4 +7,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp index d0149ed1d6..11cc7a15e0 100644 --- a/tests/auto/declarative/qquickfocusscope/tst_qquickfocusscope.cpp +++ b/tests/auto/qtquick2/qquickfocusscope/tst_qquickfocusscope.cpp @@ -42,12 +42,12 @@ #include <QSignalSpy> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> -#include <private/qquickrectangle_p.h> +#include <QtQuick/qquickview.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <private/qquicktextedit_p.h> -#include <private/qquicktext_p.h> -#include <QtDeclarative/private/qquickfocusscope_p.h> -#include "../shared/util.h" +#include <QtQuick/private/qquicktext_p.h> +#include <QtQuick/private/qquickfocusscope_p.h> +#include "../../shared/util.h" class tst_qquickfocusscope : public QObject { diff --git a/tests/auto/declarative/qquickgridview/data/ComponentView.qml b/tests/auto/qtquick2/qquickgridview/data/ComponentView.qml index 12ab6c92d1..12ab6c92d1 100644 --- a/tests/auto/declarative/qquickgridview/data/ComponentView.qml +++ b/tests/auto/qtquick2/qquickgridview/data/ComponentView.qml diff --git a/tests/auto/declarative/qquickgridview/data/asyncloader.qml b/tests/auto/qtquick2/qquickgridview/data/asyncloader.qml index ab66f20a1e..ab66f20a1e 100644 --- a/tests/auto/declarative/qquickgridview/data/asyncloader.qml +++ b/tests/auto/qtquick2/qquickgridview/data/asyncloader.qml diff --git a/tests/auto/declarative/qquickgridview/data/attachedSignals.qml b/tests/auto/qtquick2/qquickgridview/data/attachedSignals.qml index 73c10d8caf..73c10d8caf 100644 --- a/tests/auto/declarative/qquickgridview/data/attachedSignals.qml +++ b/tests/auto/qtquick2/qquickgridview/data/attachedSignals.qml diff --git a/tests/auto/declarative/qquickgridview/data/creationContext.qml b/tests/auto/qtquick2/qquickgridview/data/creationContext.qml index 79a682788b..79a682788b 100644 --- a/tests/auto/declarative/qquickgridview/data/creationContext.qml +++ b/tests/auto/qtquick2/qquickgridview/data/creationContext.qml diff --git a/tests/auto/declarative/qquickgridview/data/displaygrid.qml b/tests/auto/qtquick2/qquickgridview/data/displaygrid.qml index 1da4fe50ac..1da4fe50ac 100644 --- a/tests/auto/declarative/qquickgridview/data/displaygrid.qml +++ b/tests/auto/qtquick2/qquickgridview/data/displaygrid.qml diff --git a/tests/auto/declarative/qquickgridview/data/footer.qml b/tests/auto/qtquick2/qquickgridview/data/footer.qml index 9083f9f57c..9083f9f57c 100644 --- a/tests/auto/declarative/qquickgridview/data/footer.qml +++ b/tests/auto/qtquick2/qquickgridview/data/footer.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview-enforcerange.qml b/tests/auto/qtquick2/qquickgridview/data/gridview-enforcerange.qml index 2bfe7da78e..2bfe7da78e 100644 --- a/tests/auto/declarative/qquickgridview/data/gridview-enforcerange.qml +++ b/tests/auto/qtquick2/qquickgridview/data/gridview-enforcerange.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview-initCurrent.qml b/tests/auto/qtquick2/qquickgridview/data/gridview-initCurrent.qml index 624f639962..624f639962 100644 --- a/tests/auto/declarative/qquickgridview/data/gridview-initCurrent.qml +++ b/tests/auto/qtquick2/qquickgridview/data/gridview-initCurrent.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview-noCurrent.qml b/tests/auto/qtquick2/qquickgridview/data/gridview-noCurrent.qml index 600716e2d4..600716e2d4 100644 --- a/tests/auto/declarative/qquickgridview/data/gridview-noCurrent.qml +++ b/tests/auto/qtquick2/qquickgridview/data/gridview-noCurrent.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview1.qml b/tests/auto/qtquick2/qquickgridview/data/gridview1.qml index 4bf6f0b952..4bf6f0b952 100644 --- a/tests/auto/declarative/qquickgridview/data/gridview1.qml +++ b/tests/auto/qtquick2/qquickgridview/data/gridview1.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview2.qml b/tests/auto/qtquick2/qquickgridview/data/gridview2.qml index 5fb45a1613..5fb45a1613 100644 --- a/tests/auto/declarative/qquickgridview/data/gridview2.qml +++ b/tests/auto/qtquick2/qquickgridview/data/gridview2.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview3.qml b/tests/auto/qtquick2/qquickgridview/data/gridview3.qml index a8c1c5a0f7..a8c1c5a0f7 100644 --- a/tests/auto/declarative/qquickgridview/data/gridview3.qml +++ b/tests/auto/qtquick2/qquickgridview/data/gridview3.qml diff --git a/tests/auto/declarative/qquickgridview/data/gridview4.qml b/tests/auto/qtquick2/qquickgridview/data/gridview4.qml index eed3a2bdb1..eed3a2bdb1 100644 --- a/tests/auto/declarative/qquickgridview/data/gridview4.qml +++ b/tests/auto/qtquick2/qquickgridview/data/gridview4.qml diff --git a/tests/auto/declarative/qquickgridview/data/header.qml b/tests/auto/qtquick2/qquickgridview/data/header.qml index 648e2a2298..648e2a2298 100644 --- a/tests/auto/declarative/qquickgridview/data/header.qml +++ b/tests/auto/qtquick2/qquickgridview/data/header.qml diff --git a/tests/auto/declarative/qquickgridview/data/manual-highlight.qml b/tests/auto/qtquick2/qquickgridview/data/manual-highlight.qml index c2f1d20fb1..c2f1d20fb1 100644 --- a/tests/auto/declarative/qquickgridview/data/manual-highlight.qml +++ b/tests/auto/qtquick2/qquickgridview/data/manual-highlight.qml diff --git a/tests/auto/declarative/qquickgridview/data/margins.qml b/tests/auto/qtquick2/qquickgridview/data/margins.qml index d369658a91..d369658a91 100644 --- a/tests/auto/declarative/qquickgridview/data/margins.qml +++ b/tests/auto/qtquick2/qquickgridview/data/margins.qml diff --git a/tests/auto/declarative/qquickgridview/data/mirroring.qml b/tests/auto/qtquick2/qquickgridview/data/mirroring.qml index b9aff501c1..b9aff501c1 100644 --- a/tests/auto/declarative/qquickgridview/data/mirroring.qml +++ b/tests/auto/qtquick2/qquickgridview/data/mirroring.qml diff --git a/tests/auto/declarative/qquickgridview/data/propertychangestest.qml b/tests/auto/qtquick2/qquickgridview/data/propertychangestest.qml index 97efbe78f5..97efbe78f5 100644 --- a/tests/auto/declarative/qquickgridview/data/propertychangestest.qml +++ b/tests/auto/qtquick2/qquickgridview/data/propertychangestest.qml diff --git a/tests/auto/declarative/qquickgridview/data/resizeview.qml b/tests/auto/qtquick2/qquickgridview/data/resizeview.qml index 1f730a4a8a..1f730a4a8a 100644 --- a/tests/auto/declarative/qquickgridview/data/resizeview.qml +++ b/tests/auto/qtquick2/qquickgridview/data/resizeview.qml diff --git a/tests/auto/declarative/qquickgridview/data/setindex.qml b/tests/auto/qtquick2/qquickgridview/data/setindex.qml index ef80f3a2fb..ef80f3a2fb 100644 --- a/tests/auto/declarative/qquickgridview/data/setindex.qml +++ b/tests/auto/qtquick2/qquickgridview/data/setindex.qml diff --git a/tests/auto/declarative/qquickgridview/data/snapToRow.qml b/tests/auto/qtquick2/qquickgridview/data/snapToRow.qml index f079a048f0..f079a048f0 100644 --- a/tests/auto/declarative/qquickgridview/data/snapToRow.qml +++ b/tests/auto/qtquick2/qquickgridview/data/snapToRow.qml diff --git a/tests/auto/declarative/qquickgridview/data/unaligned.qml b/tests/auto/qtquick2/qquickgridview/data/unaligned.qml index 445400e8b4..445400e8b4 100644 --- a/tests/auto/declarative/qquickgridview/data/unaligned.qml +++ b/tests/auto/qtquick2/qquickgridview/data/unaligned.qml diff --git a/tests/auto/declarative/qquickgridview/qquickgridview.pro b/tests/auto/qtquick2/qquickgridview/qquickgridview.pro index c88b63a68e..b43e720162 100644 --- a/tests/auto/declarative/qquickgridview/qquickgridview.pro +++ b/tests/auto/qtquick2/qquickgridview/qquickgridview.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test CONFIG += insignificant_test #QTBUG-22807 -QT += core-private gui-private v8-private declarative-private opengl-private testlib widgets +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib widgets diff --git a/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp b/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp index 503379ae42..cc0f7b7225 100644 --- a/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/qtquick2/qquickgridview/tst_qquickgridview.cpp @@ -41,18 +41,18 @@ #include <QtTest/QtTest> #include <QtWidgets/qstringlistmodel.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtDeclarative/qdeclarativeincubator.h> -#include <QtDeclarative/private/qquickitem_p.h> +#include <QtQuick/private/qquickitem_p.h> #include <QtDeclarative/private/qlistmodelinterface_p.h> -#include <QtDeclarative/private/qquickgridview_p.h> -#include <QtDeclarative/private/qquicktext_p.h> +#include <QtQuick/private/qquickgridview_p.h> +#include <QtQuick/private/qquicktext_p.h> #include <QtDeclarative/private/qdeclarativelistmodel_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" #include <QtGui/qguiapplication.h> Q_DECLARE_METATYPE(Qt::LayoutDirection) diff --git a/tests/auto/declarative/qquickimage/data/aspectratio.qml b/tests/auto/qtquick2/qquickimage/data/aspectratio.qml index b26f0e1f04..b26f0e1f04 100644 --- a/tests/auto/declarative/qquickimage/data/aspectratio.qml +++ b/tests/auto/qtquick2/qquickimage/data/aspectratio.qml diff --git a/tests/auto/declarative/qquickimage/data/big.jpeg b/tests/auto/qtquick2/qquickimage/data/big.jpeg Binary files differindex bed7bd65c3..bed7bd65c3 100644 --- a/tests/auto/declarative/qquickimage/data/big.jpeg +++ b/tests/auto/qtquick2/qquickimage/data/big.jpeg diff --git a/tests/auto/declarative/qquickimage/data/big256.png b/tests/auto/qtquick2/qquickimage/data/big256.png Binary files differindex 1dc1596d03..1dc1596d03 100644 --- a/tests/auto/declarative/qquickimage/data/big256.png +++ b/tests/auto/qtquick2/qquickimage/data/big256.png diff --git a/tests/auto/declarative/qquickimage/data/colors.png b/tests/auto/qtquick2/qquickimage/data/colors.png Binary files differindex dfb62f3d64..dfb62f3d64 100644 --- a/tests/auto/declarative/qquickimage/data/colors.png +++ b/tests/auto/qtquick2/qquickimage/data/colors.png diff --git a/tests/auto/declarative/qquickimage/data/colors1.png b/tests/auto/qtquick2/qquickimage/data/colors1.png Binary files differindex dfb62f3d64..dfb62f3d64 100644 --- a/tests/auto/declarative/qquickimage/data/colors1.png +++ b/tests/auto/qtquick2/qquickimage/data/colors1.png diff --git a/tests/auto/declarative/qquickimage/data/green.png b/tests/auto/qtquick2/qquickimage/data/green.png Binary files differindex 0a2e153ba1..0a2e153ba1 100644 --- a/tests/auto/declarative/qquickimage/data/green.png +++ b/tests/auto/qtquick2/qquickimage/data/green.png diff --git a/tests/auto/declarative/qquickimage/data/heart-win32.png b/tests/auto/qtquick2/qquickimage/data/heart-win32.png Binary files differindex 351da13772..351da13772 100644 --- a/tests/auto/declarative/qquickimage/data/heart-win32.png +++ b/tests/auto/qtquick2/qquickimage/data/heart-win32.png diff --git a/tests/auto/declarative/qquickimage/data/heart.png b/tests/auto/qtquick2/qquickimage/data/heart.png Binary files differindex abe97fee4b..abe97fee4b 100644 --- a/tests/auto/declarative/qquickimage/data/heart.png +++ b/tests/auto/qtquick2/qquickimage/data/heart.png diff --git a/tests/auto/declarative/qquickimage/data/heart.svg b/tests/auto/qtquick2/qquickimage/data/heart.svg index 8c982cd93c..8c982cd93c 100644 --- a/tests/auto/declarative/qquickimage/data/heart.svg +++ b/tests/auto/qtquick2/qquickimage/data/heart.svg diff --git a/tests/auto/declarative/qquickimage/data/heart200-win32.png b/tests/auto/qtquick2/qquickimage/data/heart200-win32.png Binary files differindex 4976ff98ba..4976ff98ba 100644 --- a/tests/auto/declarative/qquickimage/data/heart200-win32.png +++ b/tests/auto/qtquick2/qquickimage/data/heart200-win32.png diff --git a/tests/auto/declarative/qquickimage/data/heart200.png b/tests/auto/qtquick2/qquickimage/data/heart200.png Binary files differindex 7fbb13c5bb..7fbb13c5bb 100644 --- a/tests/auto/declarative/qquickimage/data/heart200.png +++ b/tests/auto/qtquick2/qquickimage/data/heart200.png diff --git a/tests/auto/declarative/qquickimage/data/htiling.qml b/tests/auto/qtquick2/qquickimage/data/htiling.qml index f192f931c9..f192f931c9 100644 --- a/tests/auto/declarative/qquickimage/data/htiling.qml +++ b/tests/auto/qtquick2/qquickimage/data/htiling.qml diff --git a/tests/auto/declarative/qquickimage/data/mirror.qml b/tests/auto/qtquick2/qquickimage/data/mirror.qml index 98fddf083e..98fddf083e 100644 --- a/tests/auto/declarative/qquickimage/data/mirror.qml +++ b/tests/auto/qtquick2/qquickimage/data/mirror.qml diff --git a/tests/auto/declarative/qquickimage/data/nullpixmap.qml b/tests/auto/qtquick2/qquickimage/data/nullpixmap.qml index d52f41f164..d52f41f164 100644 --- a/tests/auto/declarative/qquickimage/data/nullpixmap.qml +++ b/tests/auto/qtquick2/qquickimage/data/nullpixmap.qml diff --git a/tests/auto/declarative/qquickimage/data/pattern.png b/tests/auto/qtquick2/qquickimage/data/pattern.png Binary files differindex d3d5e1e007..d3d5e1e007 100644 --- a/tests/auto/declarative/qquickimage/data/pattern.png +++ b/tests/auto/qtquick2/qquickimage/data/pattern.png diff --git a/tests/auto/declarative/qquickimage/data/qtbug_16389.qml b/tests/auto/qtquick2/qquickimage/data/qtbug_16389.qml index 7b8adecb11..7b8adecb11 100644 --- a/tests/auto/declarative/qquickimage/data/qtbug_16389.qml +++ b/tests/auto/qtquick2/qquickimage/data/qtbug_16389.qml diff --git a/tests/auto/declarative/qquickimage/data/qtbug_22125.qml b/tests/auto/qtquick2/qquickimage/data/qtbug_22125.qml index 9b68c0a125..9b68c0a125 100644 --- a/tests/auto/declarative/qquickimage/data/qtbug_22125.qml +++ b/tests/auto/qtquick2/qquickimage/data/qtbug_22125.qml diff --git a/tests/auto/declarative/qquickimage/data/rect.png b/tests/auto/qtquick2/qquickimage/data/rect.png Binary files differindex d564a2d5a5..d564a2d5a5 100644 --- a/tests/auto/declarative/qquickimage/data/rect.png +++ b/tests/auto/qtquick2/qquickimage/data/rect.png diff --git a/tests/auto/declarative/qquickimage/data/vtiling.qml b/tests/auto/qtquick2/qquickimage/data/vtiling.qml index f730f6e050..f730f6e050 100644 --- a/tests/auto/declarative/qquickimage/data/vtiling.qml +++ b/tests/auto/qtquick2/qquickimage/data/vtiling.qml diff --git a/tests/auto/qtquick2/qquickimage/qquickimage.pro b/tests/auto/qtquick2/qquickimage/qquickimage.pro new file mode 100644 index 0000000000..fd2af3b677 --- /dev/null +++ b/tests/auto/qtquick2/qquickimage/qquickimage.pro @@ -0,0 +1,13 @@ +CONFIG += testcase +TARGET = tst_qquickimage +macx:CONFIG -= app_bundle + +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquickimage.cpp ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickimage/tst_qquickimage.cpp b/tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp index 520c0fe5da..a7883626c6 100644 --- a/tests/auto/declarative/qquickimage/tst_qquickimage.cpp +++ b/tests/auto/qtquick2/qquickimage/tst_qquickimage.cpp @@ -46,7 +46,7 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <private/qquickimage_p.h> #include <private/qquickimagebase_p.h> #include <private/qquickloader_p.h> @@ -56,8 +56,8 @@ #include <QtGui/QPainter> #include <QtGui/QImageReader> -#include "../shared/util.h" -#include "../shared/testhttpserver.h" +#include "../../shared/util.h" +#include "../../shared/testhttpserver.h" #define SERVER_PORT 14451 #define SERVER_ADDR "http://127.0.0.1:14451" diff --git a/tests/auto/declarative/qquickitem/data/order.1.qml b/tests/auto/qtquick2/qquickitem/data/order.1.qml index 963288b257..963288b257 100644 --- a/tests/auto/declarative/qquickitem/data/order.1.qml +++ b/tests/auto/qtquick2/qquickitem/data/order.1.qml diff --git a/tests/auto/declarative/qquickitem/data/order.2.qml b/tests/auto/qtquick2/qquickitem/data/order.2.qml index 5609c77e28..5609c77e28 100644 --- a/tests/auto/declarative/qquickitem/data/order.2.qml +++ b/tests/auto/qtquick2/qquickitem/data/order.2.qml diff --git a/tests/auto/declarative/qquickitem/qquickitem.pro b/tests/auto/qtquick2/qquickitem/qquickitem.pro index f484bae014..2ebe76b09c 100644 --- a/tests/auto/declarative/qquickitem/qquickitem.pro +++ b/tests/auto/qtquick2/qquickitem/qquickitem.pro @@ -9,4 +9,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private widgets testlib +QT += core-private gui-private v8-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qquickitem/tst_qquickitem.cpp b/tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp index f8660540d9..fd7433b64e 100644 --- a/tests/auto/declarative/qquickitem/tst_qquickitem.cpp +++ b/tests/auto/qtquick2/qquickitem/tst_qquickitem.cpp @@ -41,15 +41,15 @@ #include <qtest.h> -#include "qquickitem.h" -#include "qquickcanvas.h" -#include "qquickview.h" +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickcanvas.h> +#include <QtQuick/qquickview.h> #include <QtWidgets/QGraphicsSceneMouseEvent> #include "private/qquickfocusscope_p.h" #include "private/qquickitem_p.h" #include <QDebug> #include <QTimer> -#include "../shared/util.h" +#include "../../shared/util.h" class TestItem : public QQuickItem { diff --git a/tests/auto/declarative/qquickitem2/data/childrenProperty.qml b/tests/auto/qtquick2/qquickitem2/data/childrenProperty.qml index 85ddbc1446..85ddbc1446 100644 --- a/tests/auto/declarative/qquickitem2/data/childrenProperty.qml +++ b/tests/auto/qtquick2/qquickitem2/data/childrenProperty.qml diff --git a/tests/auto/declarative/qquickitem2/data/childrenRect.qml b/tests/auto/qtquick2/qquickitem2/data/childrenRect.qml index ebc57aefbe..ebc57aefbe 100644 --- a/tests/auto/declarative/qquickitem2/data/childrenRect.qml +++ b/tests/auto/qtquick2/qquickitem2/data/childrenRect.qml diff --git a/tests/auto/declarative/qquickitem2/data/childrenRectBug.qml b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug.qml index 86a4f19c5c..86a4f19c5c 100644 --- a/tests/auto/declarative/qquickitem2/data/childrenRectBug.qml +++ b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug.qml diff --git a/tests/auto/declarative/qquickitem2/data/childrenRectBug2.qml b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug2.qml index 6e80ed28af..6e80ed28af 100644 --- a/tests/auto/declarative/qquickitem2/data/childrenRectBug2.qml +++ b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug2.qml diff --git a/tests/auto/declarative/qquickitem2/data/childrenRectBug3.qml b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug3.qml index 518e76509e..518e76509e 100644 --- a/tests/auto/declarative/qquickitem2/data/childrenRectBug3.qml +++ b/tests/auto/qtquick2/qquickitem2/data/childrenRectBug3.qml diff --git a/tests/auto/declarative/qquickitem2/data/implicitsize.qml b/tests/auto/qtquick2/qquickitem2/data/implicitsize.qml index cc6aaf7d60..cc6aaf7d60 100644 --- a/tests/auto/declarative/qquickitem2/data/implicitsize.qml +++ b/tests/auto/qtquick2/qquickitem2/data/implicitsize.qml diff --git a/tests/auto/declarative/qquickitem2/data/keynavigationtest.qml b/tests/auto/qtquick2/qquickitem2/data/keynavigationtest.qml index aacb621fb0..aacb621fb0 100644 --- a/tests/auto/declarative/qquickitem2/data/keynavigationtest.qml +++ b/tests/auto/qtquick2/qquickitem2/data/keynavigationtest.qml diff --git a/tests/auto/declarative/qquickitem2/data/keynavigationtest_implicit.qml b/tests/auto/qtquick2/qquickitem2/data/keynavigationtest_implicit.qml index 92d4ae23de..92d4ae23de 100644 --- a/tests/auto/declarative/qquickitem2/data/keynavigationtest_implicit.qml +++ b/tests/auto/qtquick2/qquickitem2/data/keynavigationtest_implicit.qml diff --git a/tests/auto/declarative/qquickitem2/data/keyspriority.qml b/tests/auto/qtquick2/qquickitem2/data/keyspriority.qml index 114cf0488a..114cf0488a 100644 --- a/tests/auto/declarative/qquickitem2/data/keyspriority.qml +++ b/tests/auto/qtquick2/qquickitem2/data/keyspriority.qml diff --git a/tests/auto/declarative/qquickitem2/data/keystest.qml b/tests/auto/qtquick2/qquickitem2/data/keystest.qml index c70e0061f5..c70e0061f5 100644 --- a/tests/auto/declarative/qquickitem2/data/keystest.qml +++ b/tests/auto/qtquick2/qquickitem2/data/keystest.qml diff --git a/tests/auto/declarative/qquickitem2/data/layoutmirroring.qml b/tests/auto/qtquick2/qquickitem2/data/layoutmirroring.qml index 036819740c..036819740c 100644 --- a/tests/auto/declarative/qquickitem2/data/layoutmirroring.qml +++ b/tests/auto/qtquick2/qquickitem2/data/layoutmirroring.qml diff --git a/tests/auto/declarative/qquickitem2/data/mapCoordinates.qml b/tests/auto/qtquick2/qquickitem2/data/mapCoordinates.qml index 566cb220ff..566cb220ff 100644 --- a/tests/auto/declarative/qquickitem2/data/mapCoordinates.qml +++ b/tests/auto/qtquick2/qquickitem2/data/mapCoordinates.qml diff --git a/tests/auto/declarative/qquickitem2/data/propertychanges.qml b/tests/auto/qtquick2/qquickitem2/data/propertychanges.qml index 3fa5ea9c23..3fa5ea9c23 100644 --- a/tests/auto/declarative/qquickitem2/data/propertychanges.qml +++ b/tests/auto/qtquick2/qquickitem2/data/propertychanges.qml diff --git a/tests/auto/declarative/qquickitem2/data/qtbug_16871.qml b/tests/auto/qtquick2/qquickitem2/data/qtbug_16871.qml index f1e7377730..f1e7377730 100644 --- a/tests/auto/declarative/qquickitem2/data/qtbug_16871.qml +++ b/tests/auto/qtquick2/qquickitem2/data/qtbug_16871.qml diff --git a/tests/auto/declarative/qquickitem2/data/resourcesProperty.qml b/tests/auto/qtquick2/qquickitem2/data/resourcesProperty.qml index b8f18bb375..b8f18bb375 100644 --- a/tests/auto/declarative/qquickitem2/data/resourcesProperty.qml +++ b/tests/auto/qtquick2/qquickitem2/data/resourcesProperty.qml diff --git a/tests/auto/declarative/qquickitem2/data/transformCrash.qml b/tests/auto/qtquick2/qquickitem2/data/transformCrash.qml index 284e85f0e0..284e85f0e0 100644 --- a/tests/auto/declarative/qquickitem2/data/transformCrash.qml +++ b/tests/auto/qtquick2/qquickitem2/data/transformCrash.qml diff --git a/tests/auto/declarative/qquickitem2/qquickitem2.pro b/tests/auto/qtquick2/qquickitem2/qquickitem2.pro index 2fe1eb1e3a..2a1d63633c 100644 --- a/tests/auto/declarative/qquickitem2/qquickitem2.pro +++ b/tests/auto/qtquick2/qquickitem2/qquickitem2.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qquickitem2/tst_qquickitem.cpp b/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp index 3604128ccd..f04b9bac36 100644 --- a/tests/auto/declarative/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/qtquick2/qquickitem2/tst_qquickitem.cpp @@ -43,10 +43,10 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativecontext.h> -#include <QtDeclarative/qquickview.h> -#include <private/qquickrectangle_p.h> +#include <QtQuick/qquickview.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <private/qquickitem_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_QQuickItem : public QObject { diff --git a/tests/auto/declarative/qquicklistview/data/ComponentView.qml b/tests/auto/qtquick2/qquicklistview/data/ComponentView.qml index 3e87be8799..3e87be8799 100644 --- a/tests/auto/declarative/qquicklistview/data/ComponentView.qml +++ b/tests/auto/qtquick2/qquicklistview/data/ComponentView.qml diff --git a/tests/auto/declarative/qquicklistview/data/asyncloader.qml b/tests/auto/qtquick2/qquicklistview/data/asyncloader.qml index f038f0960c..f038f0960c 100644 --- a/tests/auto/declarative/qquicklistview/data/asyncloader.qml +++ b/tests/auto/qtquick2/qquicklistview/data/asyncloader.qml diff --git a/tests/auto/declarative/qquicklistview/data/attachedSignals.qml b/tests/auto/qtquick2/qquicklistview/data/attachedSignals.qml index 2c3c0bbada..2c3c0bbada 100644 --- a/tests/auto/declarative/qquicklistview/data/attachedSignals.qml +++ b/tests/auto/qtquick2/qquicklistview/data/attachedSignals.qml diff --git a/tests/auto/declarative/qquicklistview/data/creationContext.qml b/tests/auto/qtquick2/qquicklistview/data/creationContext.qml index 79a682788b..79a682788b 100644 --- a/tests/auto/declarative/qquicklistview/data/creationContext.qml +++ b/tests/auto/qtquick2/qquicklistview/data/creationContext.qml diff --git a/tests/auto/declarative/qquicklistview/data/displaylist.qml b/tests/auto/qtquick2/qquicklistview/data/displaylist.qml index 4e8fd32f6a..4e8fd32f6a 100644 --- a/tests/auto/declarative/qquicklistview/data/displaylist.qml +++ b/tests/auto/qtquick2/qquicklistview/data/displaylist.qml diff --git a/tests/auto/declarative/qquicklistview/data/fillModelOnComponentCompleted.qml b/tests/auto/qtquick2/qquicklistview/data/fillModelOnComponentCompleted.qml index 906e6adb6b..906e6adb6b 100644 --- a/tests/auto/declarative/qquicklistview/data/fillModelOnComponentCompleted.qml +++ b/tests/auto/qtquick2/qquicklistview/data/fillModelOnComponentCompleted.qml diff --git a/tests/auto/declarative/qquicklistview/data/footer.qml b/tests/auto/qtquick2/qquicklistview/data/footer.qml index 2a5619999e..2a5619999e 100644 --- a/tests/auto/declarative/qquicklistview/data/footer.qml +++ b/tests/auto/qtquick2/qquicklistview/data/footer.qml diff --git a/tests/auto/declarative/qquicklistview/data/header.qml b/tests/auto/qtquick2/qquicklistview/data/header.qml index bf70310630..bf70310630 100644 --- a/tests/auto/declarative/qquicklistview/data/header.qml +++ b/tests/auto/qtquick2/qquicklistview/data/header.qml diff --git a/tests/auto/declarative/qquicklistview/data/headerfooter.qml b/tests/auto/qtquick2/qquicklistview/data/headerfooter.qml index 8e8463d645..8e8463d645 100644 --- a/tests/auto/declarative/qquicklistview/data/headerfooter.qml +++ b/tests/auto/qtquick2/qquicklistview/data/headerfooter.qml diff --git a/tests/auto/declarative/qquicklistview/data/itemlist.qml b/tests/auto/qtquick2/qquicklistview/data/itemlist.qml index 5c7ecdd5e8..5c7ecdd5e8 100644 --- a/tests/auto/declarative/qquicklistview/data/itemlist.qml +++ b/tests/auto/qtquick2/qquicklistview/data/itemlist.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-enforcerange-nohighlight.qml b/tests/auto/qtquick2/qquicklistview/data/listview-enforcerange-nohighlight.qml index 1db1096499..1db1096499 100644 --- a/tests/auto/declarative/qquicklistview/data/listview-enforcerange-nohighlight.qml +++ b/tests/auto/qtquick2/qquicklistview/data/listview-enforcerange-nohighlight.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-enforcerange.qml b/tests/auto/qtquick2/qquicklistview/data/listview-enforcerange.qml index f1bf6c2b57..f1bf6c2b57 100644 --- a/tests/auto/declarative/qquicklistview/data/listview-enforcerange.qml +++ b/tests/auto/qtquick2/qquicklistview/data/listview-enforcerange.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-initCurrent.qml b/tests/auto/qtquick2/qquicklistview/data/listview-initCurrent.qml index c4f1860eda..c4f1860eda 100644 --- a/tests/auto/declarative/qquicklistview/data/listview-initCurrent.qml +++ b/tests/auto/qtquick2/qquicklistview/data/listview-initCurrent.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-noCurrent.qml b/tests/auto/qtquick2/qquicklistview/data/listview-noCurrent.qml index 079966d8e4..079966d8e4 100644 --- a/tests/auto/declarative/qquicklistview/data/listview-noCurrent.qml +++ b/tests/auto/qtquick2/qquicklistview/data/listview-noCurrent.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-sections.qml b/tests/auto/qtquick2/qquicklistview/data/listview-sections.qml index d5b8a4400d..d5b8a4400d 100644 --- a/tests/auto/declarative/qquicklistview/data/listview-sections.qml +++ b/tests/auto/qtquick2/qquicklistview/data/listview-sections.qml diff --git a/tests/auto/declarative/qquicklistview/data/listview-sections_delegate.qml b/tests/auto/qtquick2/qquicklistview/data/listview-sections_delegate.qml index 496d8d7784..496d8d7784 100644 --- a/tests/auto/declarative/qquicklistview/data/listview-sections_delegate.qml +++ b/tests/auto/qtquick2/qquicklistview/data/listview-sections_delegate.qml diff --git a/tests/auto/declarative/qquicklistview/data/listviewtest.qml b/tests/auto/qtquick2/qquicklistview/data/listviewtest.qml index 47b341c1fc..47b341c1fc 100644 --- a/tests/auto/declarative/qquicklistview/data/listviewtest.qml +++ b/tests/auto/qtquick2/qquicklistview/data/listviewtest.qml diff --git a/tests/auto/declarative/qquicklistview/data/manual-highlight.qml b/tests/auto/qtquick2/qquicklistview/data/manual-highlight.qml index aac4599f01..aac4599f01 100644 --- a/tests/auto/declarative/qquicklistview/data/manual-highlight.qml +++ b/tests/auto/qtquick2/qquicklistview/data/manual-highlight.qml diff --git a/tests/auto/declarative/qquicklistview/data/margins.qml b/tests/auto/qtquick2/qquicklistview/data/margins.qml index 19bbef500f..19bbef500f 100644 --- a/tests/auto/declarative/qquicklistview/data/margins.qml +++ b/tests/auto/qtquick2/qquicklistview/data/margins.qml diff --git a/tests/auto/declarative/qquicklistview/data/propertychangestest.qml b/tests/auto/qtquick2/qquicklistview/data/propertychangestest.qml index 146f3f13b0..146f3f13b0 100644 --- a/tests/auto/declarative/qquicklistview/data/propertychangestest.qml +++ b/tests/auto/qtquick2/qquicklistview/data/propertychangestest.qml diff --git a/tests/auto/declarative/qquicklistview/data/qtbug-21742.qml b/tests/auto/qtquick2/qquicklistview/data/qtbug-21742.qml index 774f9041fb..774f9041fb 100644 --- a/tests/auto/declarative/qquicklistview/data/qtbug-21742.qml +++ b/tests/auto/qtquick2/qquicklistview/data/qtbug-21742.qml diff --git a/tests/auto/declarative/qquicklistview/data/qtbug14821.qml b/tests/auto/qtquick2/qquicklistview/data/qtbug14821.qml index 0a5e0acbb4..0a5e0acbb4 100644 --- a/tests/auto/declarative/qquicklistview/data/qtbug14821.qml +++ b/tests/auto/qtquick2/qquicklistview/data/qtbug14821.qml diff --git a/tests/auto/declarative/qquicklistview/data/qtbug16037.qml b/tests/auto/qtquick2/qquicklistview/data/qtbug16037.qml index 21faeb3f32..21faeb3f32 100644 --- a/tests/auto/declarative/qquicklistview/data/qtbug16037.qml +++ b/tests/auto/qtquick2/qquicklistview/data/qtbug16037.qml diff --git a/tests/auto/declarative/qquicklistview/data/resizeview.qml b/tests/auto/qtquick2/qquicklistview/data/resizeview.qml index 071cdedf2e..071cdedf2e 100644 --- a/tests/auto/declarative/qquicklistview/data/resizeview.qml +++ b/tests/auto/qtquick2/qquicklistview/data/resizeview.qml diff --git a/tests/auto/declarative/qquicklistview/data/rightToLeft.qml b/tests/auto/qtquick2/qquicklistview/data/rightToLeft.qml index 6d77de26f4..6d77de26f4 100644 --- a/tests/auto/declarative/qquicklistview/data/rightToLeft.qml +++ b/tests/auto/qtquick2/qquicklistview/data/rightToLeft.qml diff --git a/tests/auto/declarative/qquicklistview/data/sizelessthan1.qml b/tests/auto/qtquick2/qquicklistview/data/sizelessthan1.qml index aa9dc20ae9..aa9dc20ae9 100644 --- a/tests/auto/declarative/qquicklistview/data/sizelessthan1.qml +++ b/tests/auto/qtquick2/qquicklistview/data/sizelessthan1.qml diff --git a/tests/auto/declarative/qquicklistview/data/snapToItem.qml b/tests/auto/qtquick2/qquicklistview/data/snapToItem.qml index 6f201072f0..6f201072f0 100644 --- a/tests/auto/declarative/qquicklistview/data/snapToItem.qml +++ b/tests/auto/qtquick2/qquicklistview/data/snapToItem.qml diff --git a/tests/auto/declarative/qquicklistview/data/strictlyenforcerange.qml b/tests/auto/qtquick2/qquicklistview/data/strictlyenforcerange.qml index 7960ac4abb..7960ac4abb 100644 --- a/tests/auto/declarative/qquicklistview/data/strictlyenforcerange.qml +++ b/tests/auto/qtquick2/qquicklistview/data/strictlyenforcerange.qml diff --git a/tests/auto/declarative/qquicklistview/incrementalmodel.cpp b/tests/auto/qtquick2/qquicklistview/incrementalmodel.cpp index 53d30915f5..53d30915f5 100644 --- a/tests/auto/declarative/qquicklistview/incrementalmodel.cpp +++ b/tests/auto/qtquick2/qquicklistview/incrementalmodel.cpp diff --git a/tests/auto/declarative/qquicklistview/incrementalmodel.h b/tests/auto/qtquick2/qquicklistview/incrementalmodel.h index a6cddb6b07..a6cddb6b07 100644 --- a/tests/auto/declarative/qquicklistview/incrementalmodel.h +++ b/tests/auto/qtquick2/qquicklistview/incrementalmodel.h diff --git a/tests/auto/declarative/qquicklistview/qquicklistview.pro b/tests/auto/qtquick2/qquicklistview/qquicklistview.pro index 3ffd3a7dc6..be88679c62 100644 --- a/tests/auto/declarative/qquicklistview/qquicklistview.pro +++ b/tests/auto/qtquick2/qquicklistview/qquicklistview.pro @@ -10,4 +10,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private widgets widgets-private v8-private opengl-private testlib +QT += core-private gui-private declarative-private quick-private widgets widgets-private v8-private opengl-private testlib diff --git a/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp index 3b41600eb6..780033bbeb 100644 --- a/tests/auto/declarative/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/qtquick2/qquicklistview/tst_qquicklistview.cpp @@ -41,19 +41,19 @@ #include <QtTest/QtTest> #include <QtWidgets/QStringListModel> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtDeclarative/qdeclarativeincubator.h> -#include <QtDeclarative/private/qquickitem_p.h> -#include <QtDeclarative/private/qquicklistview_p.h> -#include <QtDeclarative/private/qquicktext_p.h> -#include <QtDeclarative/private/qquickvisualitemmodel_p.h> +#include <QtQuick/private/qquickitem_p.h> +#include <QtQuick/private/qquicklistview_p.h> +#include <QtQuick/private/qquicktext_p.h> +#include <QtQuick/private/qquickvisualitemmodel_p.h> #include <QtDeclarative/private/qdeclarativelistmodel_p.h> #include <QtDeclarative/private/qlistmodelinterface_p.h> -#include <QtDeclarative/private/qdeclarativechangeset_p.h> -#include "../shared/util.h" +#include <QtQuick/private/qdeclarativechangeset_p.h> +#include "../../shared/util.h" #include "incrementalmodel.h" #include <math.h> diff --git a/tests/auto/declarative/qquickloader/data/ActiveComponent.qml b/tests/auto/qtquick2/qquickloader/data/ActiveComponent.qml index 24c6f7ad91..24c6f7ad91 100644 --- a/tests/auto/declarative/qquickloader/data/ActiveComponent.qml +++ b/tests/auto/qtquick2/qquickloader/data/ActiveComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/AnchoredLoader.qml b/tests/auto/qtquick2/qquickloader/data/AnchoredLoader.qml index 1a2a620d7f..1a2a620d7f 100644 --- a/tests/auto/declarative/qquickloader/data/AnchoredLoader.qml +++ b/tests/auto/qtquick2/qquickloader/data/AnchoredLoader.qml diff --git a/tests/auto/declarative/qquickloader/data/BigComponent.qml b/tests/auto/qtquick2/qquickloader/data/BigComponent.qml index df92532c43..df92532c43 100644 --- a/tests/auto/declarative/qquickloader/data/BigComponent.qml +++ b/tests/auto/qtquick2/qquickloader/data/BigComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/BlueRect.qml b/tests/auto/qtquick2/qquickloader/data/BlueRect.qml index e96ac00f21..e96ac00f21 100644 --- a/tests/auto/declarative/qquickloader/data/BlueRect.qml +++ b/tests/auto/qtquick2/qquickloader/data/BlueRect.qml diff --git a/tests/auto/declarative/qquickloader/data/CreationContextLoader.qml b/tests/auto/qtquick2/qquickloader/data/CreationContextLoader.qml index 4dd73e797c..4dd73e797c 100644 --- a/tests/auto/declarative/qquickloader/data/CreationContextLoader.qml +++ b/tests/auto/qtquick2/qquickloader/data/CreationContextLoader.qml diff --git a/tests/auto/declarative/qquickloader/data/GraphicsWidget250x250.qml b/tests/auto/qtquick2/qquickloader/data/GraphicsWidget250x250.qml index dae8e3fbbb..dae8e3fbbb 100644 --- a/tests/auto/declarative/qquickloader/data/GraphicsWidget250x250.qml +++ b/tests/auto/qtquick2/qquickloader/data/GraphicsWidget250x250.qml diff --git a/tests/auto/declarative/qquickloader/data/GreenRect.qml b/tests/auto/qtquick2/qquickloader/data/GreenRect.qml index 99cefaf176..99cefaf176 100644 --- a/tests/auto/declarative/qquickloader/data/GreenRect.qml +++ b/tests/auto/qtquick2/qquickloader/data/GreenRect.qml diff --git a/tests/auto/declarative/qquickloader/data/InitialPropertyValuesComponent.qml b/tests/auto/qtquick2/qquickloader/data/InitialPropertyValuesComponent.qml index 24c6f7ad91..24c6f7ad91 100644 --- a/tests/auto/declarative/qquickloader/data/InitialPropertyValuesComponent.qml +++ b/tests/auto/qtquick2/qquickloader/data/InitialPropertyValuesComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/InvalidSourceComponent.qml b/tests/auto/qtquick2/qquickloader/data/InvalidSourceComponent.qml index 7efa4a5f61..7efa4a5f61 100644 --- a/tests/auto/declarative/qquickloader/data/InvalidSourceComponent.qml +++ b/tests/auto/qtquick2/qquickloader/data/InvalidSourceComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/NoResize.qml b/tests/auto/qtquick2/qquickloader/data/NoResize.qml index 9b3ea6410b..9b3ea6410b 100644 --- a/tests/auto/declarative/qquickloader/data/NoResize.qml +++ b/tests/auto/qtquick2/qquickloader/data/NoResize.qml diff --git a/tests/auto/declarative/qquickloader/data/NoResizeGraphicsWidget.qml b/tests/auto/qtquick2/qquickloader/data/NoResizeGraphicsWidget.qml index c0f51d8c35..c0f51d8c35 100644 --- a/tests/auto/declarative/qquickloader/data/NoResizeGraphicsWidget.qml +++ b/tests/auto/qtquick2/qquickloader/data/NoResizeGraphicsWidget.qml diff --git a/tests/auto/declarative/qquickloader/data/QTBUG_16928.qml b/tests/auto/qtquick2/qquickloader/data/QTBUG_16928.qml index 903d7f0812..903d7f0812 100644 --- a/tests/auto/declarative/qquickloader/data/QTBUG_16928.qml +++ b/tests/auto/qtquick2/qquickloader/data/QTBUG_16928.qml diff --git a/tests/auto/declarative/qquickloader/data/QTBUG_17114.qml b/tests/auto/qtquick2/qquickloader/data/QTBUG_17114.qml index 7402037553..7402037553 100644 --- a/tests/auto/declarative/qquickloader/data/QTBUG_17114.qml +++ b/tests/auto/qtquick2/qquickloader/data/QTBUG_17114.qml diff --git a/tests/auto/declarative/qquickloader/data/Rect120x60.qml b/tests/auto/qtquick2/qquickloader/data/Rect120x60.qml index fc9e447e69..fc9e447e69 100644 --- a/tests/auto/declarative/qquickloader/data/Rect120x60.qml +++ b/tests/auto/qtquick2/qquickloader/data/Rect120x60.qml diff --git a/tests/auto/declarative/qquickloader/data/SetSourceComponent.qml b/tests/auto/qtquick2/qquickloader/data/SetSourceComponent.qml index 83cc358f7d..83cc358f7d 100644 --- a/tests/auto/declarative/qquickloader/data/SetSourceComponent.qml +++ b/tests/auto/qtquick2/qquickloader/data/SetSourceComponent.qml diff --git a/tests/auto/declarative/qquickloader/data/SizeGraphicsWidgetToLoader.qml b/tests/auto/qtquick2/qquickloader/data/SizeGraphicsWidgetToLoader.qml index 2a63b4d34f..2a63b4d34f 100644 --- a/tests/auto/declarative/qquickloader/data/SizeGraphicsWidgetToLoader.qml +++ b/tests/auto/qtquick2/qquickloader/data/SizeGraphicsWidgetToLoader.qml diff --git a/tests/auto/declarative/qquickloader/data/SizeLoaderToGraphicsWidget.qml b/tests/auto/qtquick2/qquickloader/data/SizeLoaderToGraphicsWidget.qml index a9875d8e21..a9875d8e21 100644 --- a/tests/auto/declarative/qquickloader/data/SizeLoaderToGraphicsWidget.qml +++ b/tests/auto/qtquick2/qquickloader/data/SizeLoaderToGraphicsWidget.qml diff --git a/tests/auto/declarative/qquickloader/data/SizeToItem.qml b/tests/auto/qtquick2/qquickloader/data/SizeToItem.qml index 866365754f..866365754f 100644 --- a/tests/auto/declarative/qquickloader/data/SizeToItem.qml +++ b/tests/auto/qtquick2/qquickloader/data/SizeToItem.qml diff --git a/tests/auto/declarative/qquickloader/data/SizeToLoader.qml b/tests/auto/qtquick2/qquickloader/data/SizeToLoader.qml index dad18c6939..dad18c6939 100644 --- a/tests/auto/declarative/qquickloader/data/SizeToLoader.qml +++ b/tests/auto/qtquick2/qquickloader/data/SizeToLoader.qml diff --git a/tests/auto/declarative/qquickloader/data/VmeError.qml b/tests/auto/qtquick2/qquickloader/data/VmeError.qml index 0443aa9054..0443aa9054 100644 --- a/tests/auto/declarative/qquickloader/data/VmeError.qml +++ b/tests/auto/qtquick2/qquickloader/data/VmeError.qml diff --git a/tests/auto/declarative/qquickloader/data/active.1.qml b/tests/auto/qtquick2/qquickloader/data/active.1.qml index 2dbd1a0887..2dbd1a0887 100644 --- a/tests/auto/declarative/qquickloader/data/active.1.qml +++ b/tests/auto/qtquick2/qquickloader/data/active.1.qml diff --git a/tests/auto/declarative/qquickloader/data/active.2.qml b/tests/auto/qtquick2/qquickloader/data/active.2.qml index e561744c63..e561744c63 100644 --- a/tests/auto/declarative/qquickloader/data/active.2.qml +++ b/tests/auto/qtquick2/qquickloader/data/active.2.qml diff --git a/tests/auto/declarative/qquickloader/data/active.3.qml b/tests/auto/qtquick2/qquickloader/data/active.3.qml index 0fbba959bb..0fbba959bb 100644 --- a/tests/auto/declarative/qquickloader/data/active.3.qml +++ b/tests/auto/qtquick2/qquickloader/data/active.3.qml diff --git a/tests/auto/declarative/qquickloader/data/active.4.qml b/tests/auto/qtquick2/qquickloader/data/active.4.qml index 63fd46e2da..63fd46e2da 100644 --- a/tests/auto/declarative/qquickloader/data/active.4.qml +++ b/tests/auto/qtquick2/qquickloader/data/active.4.qml diff --git a/tests/auto/declarative/qquickloader/data/active.5.qml b/tests/auto/qtquick2/qquickloader/data/active.5.qml index 903f458a41..903f458a41 100644 --- a/tests/auto/declarative/qquickloader/data/active.5.qml +++ b/tests/auto/qtquick2/qquickloader/data/active.5.qml diff --git a/tests/auto/declarative/qquickloader/data/active.6.qml b/tests/auto/qtquick2/qquickloader/data/active.6.qml index f769a4e184..f769a4e184 100644 --- a/tests/auto/declarative/qquickloader/data/active.6.qml +++ b/tests/auto/qtquick2/qquickloader/data/active.6.qml diff --git a/tests/auto/declarative/qquickloader/data/active.7.qml b/tests/auto/qtquick2/qquickloader/data/active.7.qml index a29e932f5e..a29e932f5e 100644 --- a/tests/auto/declarative/qquickloader/data/active.7.qml +++ b/tests/auto/qtquick2/qquickloader/data/active.7.qml diff --git a/tests/auto/declarative/qquickloader/data/active.8.qml b/tests/auto/qtquick2/qquickloader/data/active.8.qml index 3a66d3e99a..3a66d3e99a 100644 --- a/tests/auto/declarative/qquickloader/data/active.8.qml +++ b/tests/auto/qtquick2/qquickloader/data/active.8.qml diff --git a/tests/auto/declarative/qquickloader/data/asynchronous.qml b/tests/auto/qtquick2/qquickloader/data/asynchronous.qml index 29570525ad..29570525ad 100644 --- a/tests/auto/declarative/qquickloader/data/asynchronous.qml +++ b/tests/auto/qtquick2/qquickloader/data/asynchronous.qml diff --git a/tests/auto/declarative/qquickloader/data/crash.qml b/tests/auto/qtquick2/qquickloader/data/crash.qml index e6ddc33a10..e6ddc33a10 100644 --- a/tests/auto/declarative/qquickloader/data/crash.qml +++ b/tests/auto/qtquick2/qquickloader/data/crash.qml diff --git a/tests/auto/declarative/qquickloader/data/creationContext.qml b/tests/auto/qtquick2/qquickloader/data/creationContext.qml index 17a596cc74..17a596cc74 100644 --- a/tests/auto/declarative/qquickloader/data/creationContext.qml +++ b/tests/auto/qtquick2/qquickloader/data/creationContext.qml diff --git a/tests/auto/declarative/qquickloader/data/differentorigin.qml b/tests/auto/qtquick2/qquickloader/data/differentorigin.qml index 56a3034fe0..56a3034fe0 100644 --- a/tests/auto/declarative/qquickloader/data/differentorigin.qml +++ b/tests/auto/qtquick2/qquickloader/data/differentorigin.qml diff --git a/tests/auto/declarative/qquickloader/data/implicitSize.qml b/tests/auto/qtquick2/qquickloader/data/implicitSize.qml index 5c8c8348ed..5c8c8348ed 100644 --- a/tests/auto/declarative/qquickloader/data/implicitSize.qml +++ b/tests/auto/qtquick2/qquickloader/data/implicitSize.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.1.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.1.qml index ae371797ce..ae371797ce 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.1.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.1.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.2.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.2.qml index 76c7bc2fd6..76c7bc2fd6 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.2.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.2.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.3.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.3.qml index 3b08e6ee42..3b08e6ee42 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.3.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.3.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.4.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.4.qml index e8310044e8..e8310044e8 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.4.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.4.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.5.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.5.qml index 03ee599aba..03ee599aba 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.5.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.5.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.6.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.6.qml index 66452b512b..66452b512b 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.6.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.6.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.7.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.7.qml index 02349f7ddf..02349f7ddf 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.7.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.7.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.8.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.8.qml index 79e9264d4a..79e9264d4a 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.8.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.8.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.binding.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.binding.qml index e0df50a74a..e0df50a74a 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.binding.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.binding.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.1.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.1.qml index f324dbddac..f324dbddac 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.1.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.1.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.2.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.2.qml index 89aba313c7..89aba313c7 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.2.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.2.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.3.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.3.qml index c862007402..c862007402 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.3.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.3.qml diff --git a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.4.qml b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.4.qml index 9a80b2156d..9a80b2156d 100644 --- a/tests/auto/declarative/qquickloader/data/initialPropertyValues.error.4.qml +++ b/tests/auto/qtquick2/qquickloader/data/initialPropertyValues.error.4.qml diff --git a/tests/auto/declarative/qquickloader/data/nonItem.qml b/tests/auto/qtquick2/qquickloader/data/nonItem.qml index 8cfa0d8efb..8cfa0d8efb 100644 --- a/tests/auto/declarative/qquickloader/data/nonItem.qml +++ b/tests/auto/qtquick2/qquickloader/data/nonItem.qml diff --git a/tests/auto/declarative/qquickloader/data/parented.qml b/tests/auto/qtquick2/qquickloader/data/parented.qml index 1c19d4d1a5..1c19d4d1a5 100644 --- a/tests/auto/declarative/qquickloader/data/parented.qml +++ b/tests/auto/qtquick2/qquickloader/data/parented.qml diff --git a/tests/auto/declarative/qquickloader/data/qmldir b/tests/auto/qtquick2/qquickloader/data/qmldir index bf42b507c0..bf42b507c0 100644 --- a/tests/auto/declarative/qquickloader/data/qmldir +++ b/tests/auto/qtquick2/qquickloader/data/qmldir diff --git a/tests/auto/declarative/qquickloader/data/sameorigin-load.qml b/tests/auto/qtquick2/qquickloader/data/sameorigin-load.qml index 3332500be6..3332500be6 100644 --- a/tests/auto/declarative/qquickloader/data/sameorigin-load.qml +++ b/tests/auto/qtquick2/qquickloader/data/sameorigin-load.qml diff --git a/tests/auto/declarative/qquickloader/data/sameorigin.qml b/tests/auto/qtquick2/qquickloader/data/sameorigin.qml index 84846b6aba..84846b6aba 100644 --- a/tests/auto/declarative/qquickloader/data/sameorigin.qml +++ b/tests/auto/qtquick2/qquickloader/data/sameorigin.qml diff --git a/tests/auto/declarative/qquickloader/data/vmeErrors.qml b/tests/auto/qtquick2/qquickloader/data/vmeErrors.qml index 8e6c89dc8e..8e6c89dc8e 100644 --- a/tests/auto/declarative/qquickloader/data/vmeErrors.qml +++ b/tests/auto/qtquick2/qquickloader/data/vmeErrors.qml diff --git a/tests/auto/declarative/qquickloader/qquickloader.pro b/tests/auto/qtquick2/qquickloader/qquickloader.pro index 9ccecce478..6e372692c2 100644 --- a/tests/auto/declarative/qquickloader/qquickloader.pro +++ b/tests/auto/qtquick2/qquickloader/qquickloader.pro @@ -2,10 +2,10 @@ CONFIG += testcase TARGET = tst_qquickloader macx:CONFIG -= app_bundle -INCLUDEPATH += ../shared/ -HEADERS += ../shared/testhttpserver.h +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h SOURCES += tst_qquickloader.cpp \ - ../shared/testhttpserver.cpp + ../../shared/testhttpserver.cpp testDataFiles.files = data testDataFiles.path = . @@ -13,4 +13,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickloader/tst_qquickloader.cpp b/tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp index 96d0d88a84..3df692a6a6 100644 --- a/tests/auto/declarative/qquickloader/tst_qquickloader.cpp +++ b/tests/auto/qtquick2/qquickloader/tst_qquickloader.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativeincubator.h> #include <private/qquickloader_p.h> #include "testhttpserver.h" -#include "../shared/util.h" +#include "../../shared/util.h" #define SERVER_PORT 14450 diff --git a/tests/auto/declarative/qquickmousearea/data/clickThrough.qml b/tests/auto/qtquick2/qquickmousearea/data/clickThrough.qml index 3c03161faa..3c03161faa 100644 --- a/tests/auto/declarative/qquickmousearea/data/clickThrough.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/clickThrough.qml diff --git a/tests/auto/declarative/qquickmousearea/data/clickThrough2.qml b/tests/auto/qtquick2/qquickmousearea/data/clickThrough2.qml index 2624108225..2624108225 100644 --- a/tests/auto/declarative/qquickmousearea/data/clickThrough2.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/clickThrough2.qml diff --git a/tests/auto/declarative/qquickmousearea/data/clickandhold.qml b/tests/auto/qtquick2/qquickmousearea/data/clickandhold.qml index 5e4e48f6db..5e4e48f6db 100644 --- a/tests/auto/declarative/qquickmousearea/data/clickandhold.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/clickandhold.qml diff --git a/tests/auto/declarative/qquickmousearea/data/clicktwice.qml b/tests/auto/qtquick2/qquickmousearea/data/clicktwice.qml index 002d1b9047..002d1b9047 100644 --- a/tests/auto/declarative/qquickmousearea/data/clicktwice.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/clicktwice.qml diff --git a/tests/auto/declarative/qquickmousearea/data/doubleclick.qml b/tests/auto/qtquick2/qquickmousearea/data/doubleclick.qml index 1030d0c33e..1030d0c33e 100644 --- a/tests/auto/declarative/qquickmousearea/data/doubleclick.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/doubleclick.qml diff --git a/tests/auto/declarative/qquickmousearea/data/dragging.qml b/tests/auto/qtquick2/qquickmousearea/data/dragging.qml index d9b6ac4083..d9b6ac4083 100644 --- a/tests/auto/declarative/qquickmousearea/data/dragging.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/dragging.qml diff --git a/tests/auto/declarative/qquickmousearea/data/dragproperties.qml b/tests/auto/qtquick2/qquickmousearea/data/dragproperties.qml index 421dfe26b7..421dfe26b7 100644 --- a/tests/auto/declarative/qquickmousearea/data/dragproperties.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/dragproperties.qml diff --git a/tests/auto/declarative/qquickmousearea/data/dragreset.qml b/tests/auto/qtquick2/qquickmousearea/data/dragreset.qml index d7949f9139..d7949f9139 100644 --- a/tests/auto/declarative/qquickmousearea/data/dragreset.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/dragreset.qml diff --git a/tests/auto/declarative/qquickmousearea/data/hoverPosition.qml b/tests/auto/qtquick2/qquickmousearea/data/hoverPosition.qml index 834f91ff29..834f91ff29 100644 --- a/tests/auto/declarative/qquickmousearea/data/hoverPosition.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/hoverPosition.qml diff --git a/tests/auto/declarative/qquickmousearea/data/hoverPropagation.qml b/tests/auto/qtquick2/qquickmousearea/data/hoverPropagation.qml index c47c794132..c47c794132 100644 --- a/tests/auto/declarative/qquickmousearea/data/hoverPropagation.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/hoverPropagation.qml diff --git a/tests/auto/declarative/qquickmousearea/data/noclickandhold.qml b/tests/auto/qtquick2/qquickmousearea/data/noclickandhold.qml index 6647de001d..6647de001d 100644 --- a/tests/auto/declarative/qquickmousearea/data/noclickandhold.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/noclickandhold.qml diff --git a/tests/auto/declarative/qquickmousearea/data/pressedCanceled.qml b/tests/auto/qtquick2/qquickmousearea/data/pressedCanceled.qml index 231436d0f2..231436d0f2 100644 --- a/tests/auto/declarative/qquickmousearea/data/pressedCanceled.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/pressedCanceled.qml diff --git a/tests/auto/declarative/qquickmousearea/data/pressedOrdering.qml b/tests/auto/qtquick2/qquickmousearea/data/pressedOrdering.qml index 7aa3098100..7aa3098100 100644 --- a/tests/auto/declarative/qquickmousearea/data/pressedOrdering.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/pressedOrdering.qml diff --git a/tests/auto/declarative/qquickmousearea/data/preventstealing.qml b/tests/auto/qtquick2/qquickmousearea/data/preventstealing.qml index fb0d6955c1..fb0d6955c1 100644 --- a/tests/auto/declarative/qquickmousearea/data/preventstealing.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/preventstealing.qml diff --git a/tests/auto/declarative/qquickmousearea/data/rejectEvent.qml b/tests/auto/qtquick2/qquickmousearea/data/rejectEvent.qml index 816fc76fac..816fc76fac 100644 --- a/tests/auto/declarative/qquickmousearea/data/rejectEvent.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/rejectEvent.qml diff --git a/tests/auto/declarative/qquickmousearea/data/updateMousePosOnClick.qml b/tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnClick.qml index 7377a2e86c..7377a2e86c 100644 --- a/tests/auto/declarative/qquickmousearea/data/updateMousePosOnClick.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnClick.qml diff --git a/tests/auto/declarative/qquickmousearea/data/updateMousePosOnResize.qml b/tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnResize.qml index 55af864060..55af864060 100644 --- a/tests/auto/declarative/qquickmousearea/data/updateMousePosOnResize.qml +++ b/tests/auto/qtquick2/qquickmousearea/data/updateMousePosOnResize.qml diff --git a/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro b/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro new file mode 100644 index 0000000000..fcf166b0ed --- /dev/null +++ b/tests/auto/qtquick2/qquickmousearea/qquickmousearea.pro @@ -0,0 +1,14 @@ +CONFIG += testcase +TARGET = tst_qquickmousearea +macx:CONFIG -= app_bundle + +HEADERS += ../../shared/testhttpserver.h +SOURCES += tst_qquickmousearea.cpp ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp index ac1eea7a41..7c9af4ba64 100644 --- a/tests/auto/declarative/qquickmousearea/tst_qquickmousearea.cpp +++ b/tests/auto/qtquick2/qquickmousearea/tst_qquickmousearea.cpp @@ -41,14 +41,14 @@ #include <QtTest/QtTest> #include <QtTest/QSignalSpy> -#include <private/qquickmousearea_p.h> -#include <private/qquickrectangle_p.h> +#include <QtQuick/private/qquickmousearea_p.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <private/qquickflickable_p.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtOpenGL/QGLShaderProgram> -#include "../shared/util.h" +#include "../../shared/util.h" //#define OLDWAY diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/inFlickable.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml index 53a2bf87f9..53a2bf87f9 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/data/inFlickable.qml +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/data/inFlickable.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/nested.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/nested.qml index 37b8820aa0..37b8820aa0 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/data/nested.qml +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/data/nested.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/nonOverlapping.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/nonOverlapping.qml index 039607e26c..039607e26c 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/data/nonOverlapping.qml +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/data/nonOverlapping.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/properties.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/properties.qml index 98ef1a9cbe..98ef1a9cbe 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/data/properties.qml +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/data/properties.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/data/signalTest.qml b/tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml index 3a6aa86a1c..3a6aa86a1c 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/data/signalTest.qml +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/data/signalTest.qml diff --git a/tests/auto/declarative/qquickmultipointtoucharea/qquickmultipointtoucharea.pro b/tests/auto/qtquick2/qquickmultipointtoucharea/qquickmultipointtoucharea.pro index 8be4b1f1fd..38c32099b0 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/qquickmultipointtoucharea.pro +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/qquickmultipointtoucharea.pro @@ -8,4 +8,4 @@ importFiles.files = data importFiles.path = . DEPLOYMENT += importFiles -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp b/tests/auto/qtquick2/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp index 9acef50645..b4fca9bb9e 100644 --- a/tests/auto/declarative/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp +++ b/tests/auto/qtquick2/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp @@ -43,7 +43,7 @@ #include <QtTest/QSignalSpy> #include <private/qquickmultipointtoucharea_p.h> #include <private/qquickflickable_p.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> class tst_QQuickMultiPointTouchArea: public QObject { diff --git a/tests/auto/declarative/qquickpathview/data/ComponentView.qml b/tests/auto/qtquick2/qquickpathview/data/ComponentView.qml index b61033d375..b61033d375 100644 --- a/tests/auto/declarative/qquickpathview/data/ComponentView.qml +++ b/tests/auto/qtquick2/qquickpathview/data/ComponentView.qml diff --git a/tests/auto/declarative/qquickpathview/data/asyncloader.qml b/tests/auto/qtquick2/qquickpathview/data/asyncloader.qml index 94f560f3e7..94f560f3e7 100644 --- a/tests/auto/declarative/qquickpathview/data/asyncloader.qml +++ b/tests/auto/qtquick2/qquickpathview/data/asyncloader.qml diff --git a/tests/auto/declarative/qquickpathview/data/closedPath.qml b/tests/auto/qtquick2/qquickpathview/data/closedPath.qml index 3ca34056c8..3ca34056c8 100644 --- a/tests/auto/declarative/qquickpathview/data/closedPath.qml +++ b/tests/auto/qtquick2/qquickpathview/data/closedPath.qml diff --git a/tests/auto/declarative/qquickpathview/data/creationContext.qml b/tests/auto/qtquick2/qquickpathview/data/creationContext.qml index 79a682788b..79a682788b 100644 --- a/tests/auto/declarative/qquickpathview/data/creationContext.qml +++ b/tests/auto/qtquick2/qquickpathview/data/creationContext.qml diff --git a/tests/auto/declarative/qquickpathview/data/datamodel.qml b/tests/auto/qtquick2/qquickpathview/data/datamodel.qml index 44f2aecc0a..44f2aecc0a 100644 --- a/tests/auto/declarative/qquickpathview/data/datamodel.qml +++ b/tests/auto/qtquick2/qquickpathview/data/datamodel.qml diff --git a/tests/auto/declarative/qquickpathview/data/displaypath.qml b/tests/auto/qtquick2/qquickpathview/data/displaypath.qml index af0f381fc4..af0f381fc4 100644 --- a/tests/auto/declarative/qquickpathview/data/displaypath.qml +++ b/tests/auto/qtquick2/qquickpathview/data/displaypath.qml diff --git a/tests/auto/declarative/qquickpathview/data/dragpath.qml b/tests/auto/qtquick2/qquickpathview/data/dragpath.qml index f9c6615b04..f9c6615b04 100644 --- a/tests/auto/declarative/qquickpathview/data/dragpath.qml +++ b/tests/auto/qtquick2/qquickpathview/data/dragpath.qml diff --git a/tests/auto/declarative/qquickpathview/data/emptymodel.qml b/tests/auto/qtquick2/qquickpathview/data/emptymodel.qml index eb4d3006f4..eb4d3006f4 100644 --- a/tests/auto/declarative/qquickpathview/data/emptymodel.qml +++ b/tests/auto/qtquick2/qquickpathview/data/emptymodel.qml diff --git a/tests/auto/declarative/qquickpathview/data/missingPercent.qml b/tests/auto/qtquick2/qquickpathview/data/missingPercent.qml index 97af8e8982..97af8e8982 100644 --- a/tests/auto/declarative/qquickpathview/data/missingPercent.qml +++ b/tests/auto/qtquick2/qquickpathview/data/missingPercent.qml diff --git a/tests/auto/declarative/qquickpathview/data/openPath.qml b/tests/auto/qtquick2/qquickpathview/data/openPath.qml index 1bd8375d9e..1bd8375d9e 100644 --- a/tests/auto/declarative/qquickpathview/data/openPath.qml +++ b/tests/auto/qtquick2/qquickpathview/data/openPath.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathUpdate.qml b/tests/auto/qtquick2/qquickpathview/data/pathUpdate.qml index e729291025..e729291025 100644 --- a/tests/auto/declarative/qquickpathview/data/pathUpdate.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathUpdate.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathUpdateOnStartChanged.qml b/tests/auto/qtquick2/qquickpathview/data/pathUpdateOnStartChanged.qml index 89084b2a37..89084b2a37 100644 --- a/tests/auto/declarative/qquickpathview/data/pathUpdateOnStartChanged.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathUpdateOnStartChanged.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathline.qml b/tests/auto/qtquick2/qquickpathview/data/pathline.qml index 4c1c785bce..4c1c785bce 100644 --- a/tests/auto/declarative/qquickpathview/data/pathline.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathline.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathtest.qml b/tests/auto/qtquick2/qquickpathview/data/pathtest.qml index 736d58d2a9..736d58d2a9 100644 --- a/tests/auto/declarative/qquickpathview/data/pathtest.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathtest.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview0.qml b/tests/auto/qtquick2/qquickpathview/data/pathview0.qml index 8b9378163f..8b9378163f 100644 --- a/tests/auto/declarative/qquickpathview/data/pathview0.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathview0.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview1.qml b/tests/auto/qtquick2/qquickpathview/data/pathview1.qml index 53d375e596..53d375e596 100644 --- a/tests/auto/declarative/qquickpathview/data/pathview1.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathview1.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview2.qml b/tests/auto/qtquick2/qquickpathview/data/pathview2.qml index 1d279c42a0..1d279c42a0 100644 --- a/tests/auto/declarative/qquickpathview/data/pathview2.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathview2.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview3.qml b/tests/auto/qtquick2/qquickpathview/data/pathview3.qml index ded5a3911c..ded5a3911c 100644 --- a/tests/auto/declarative/qquickpathview/data/pathview3.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathview3.qml diff --git a/tests/auto/declarative/qquickpathview/data/pathview_package.qml b/tests/auto/qtquick2/qquickpathview/data/pathview_package.qml index 2af57e6bb1..2af57e6bb1 100644 --- a/tests/auto/declarative/qquickpathview/data/pathview_package.qml +++ b/tests/auto/qtquick2/qquickpathview/data/pathview_package.qml diff --git a/tests/auto/declarative/qquickpathview/data/propertychanges.qml b/tests/auto/qtquick2/qquickpathview/data/propertychanges.qml index 09b309f86f..09b309f86f 100644 --- a/tests/auto/declarative/qquickpathview/data/propertychanges.qml +++ b/tests/auto/qtquick2/qquickpathview/data/propertychanges.qml diff --git a/tests/auto/declarative/qquickpathview/data/treemodel.qml b/tests/auto/qtquick2/qquickpathview/data/treemodel.qml index fcf6922d00..fcf6922d00 100644 --- a/tests/auto/declarative/qquickpathview/data/treemodel.qml +++ b/tests/auto/qtquick2/qquickpathview/data/treemodel.qml diff --git a/tests/auto/declarative/qquickpathview/data/undefinedpath.qml b/tests/auto/qtquick2/qquickpathview/data/undefinedpath.qml index 674e7cca8d..674e7cca8d 100644 --- a/tests/auto/declarative/qquickpathview/data/undefinedpath.qml +++ b/tests/auto/qtquick2/qquickpathview/data/undefinedpath.qml diff --git a/tests/auto/declarative/qquickpathview/data/vdm.qml b/tests/auto/qtquick2/qquickpathview/data/vdm.qml index 839393d9bd..839393d9bd 100644 --- a/tests/auto/declarative/qquickpathview/data/vdm.qml +++ b/tests/auto/qtquick2/qquickpathview/data/vdm.qml diff --git a/tests/auto/declarative/qquickpathview/qquickpathview.pro b/tests/auto/qtquick2/qquickpathview/qquickpathview.pro index d03cd4eec7..6e16dd4879 100644 --- a/tests/auto/declarative/qquickpathview/qquickpathview.pro +++ b/tests/auto/qtquick2/qquickpathview/qquickpathview.pro @@ -9,4 +9,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private widgets testlib +QT += core-private gui-private v8-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qquickpathview/tst_qquickpathview.cpp b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp index b0efc5838d..2f1d836c72 100644 --- a/tests/auto/declarative/qquickpathview/tst_qquickpathview.cpp +++ b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp @@ -40,16 +40,16 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtDeclarative/qdeclarativeincubator.h> -#include <QtDeclarative/private/qquickpathview_p.h> -#include <QtDeclarative/private/qdeclarativepath_p.h> -#include <QtDeclarative/private/qquicktext_p.h> -#include <QtDeclarative/private/qquickrectangle_p.h> +#include <QtQuick/private/qquickpathview_p.h> +#include <QtQuick/private/qdeclarativepath_p.h> +#include <QtQuick/private/qquicktext_p.h> +#include <QtQuick/private/qquickrectangle_p.h> #include <QtDeclarative/private/qdeclarativelistmodel_p.h> #include <QtDeclarative/private/qdeclarativevaluetype_p.h> #include <QAbstractListModel> @@ -57,7 +57,7 @@ #include <QStandardItemModel> #include <QFile> -#include "../shared/util.h" +#include "../../shared/util.h" static void initStandardTreeModel(QStandardItemModel *model) { diff --git a/tests/auto/declarative/qquickpincharea/data/pinchproperties.qml b/tests/auto/qtquick2/qquickpincharea/data/pinchproperties.qml index 44d116184e..44d116184e 100644 --- a/tests/auto/declarative/qquickpincharea/data/pinchproperties.qml +++ b/tests/auto/qtquick2/qquickpincharea/data/pinchproperties.qml diff --git a/tests/auto/declarative/qquickpincharea/qquickpincharea.pro b/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro index df750fb2f6..6e2ff59512 100644 --- a/tests/auto/declarative/qquickpincharea/qquickpincharea.pro +++ b/tests/auto/qtquick2/qquickpincharea/qquickpincharea.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp b/tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp index 0d6126e671..c4912c46f1 100644 --- a/tests/auto/declarative/qquickpincharea/tst_qquickpincharea.cpp +++ b/tests/auto/qtquick2/qquickpincharea/tst_qquickpincharea.cpp @@ -42,10 +42,10 @@ #include <QtTest/QtTest> #include <QtTest/QSignalSpy> #include <private/qquickpincharea_p.h> -#include <private/qquickrectangle_p.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/private/qquickrectangle_p.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativecontext.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_QQuickPinchArea: public QObject { diff --git a/tests/auto/declarative/qquickpositioners/data/allInvisible.qml b/tests/auto/qtquick2/qquickpositioners/data/allInvisible.qml index 5894171434..5894171434 100644 --- a/tests/auto/declarative/qquickpositioners/data/allInvisible.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/allInvisible.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-column.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-column.qml index 4c667aa205..4c667aa205 100644 --- a/tests/auto/declarative/qquickpositioners/data/attachedproperties-column.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-column.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-dynamic.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-dynamic.qml index 894749dc16..894749dc16 100644 --- a/tests/auto/declarative/qquickpositioners/data/attachedproperties-dynamic.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-dynamic.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-flow.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-flow.qml index e7f9a63e2a..e7f9a63e2a 100644 --- a/tests/auto/declarative/qquickpositioners/data/attachedproperties-flow.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-flow.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-grid.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-grid.qml index 2094309b9f..2094309b9f 100644 --- a/tests/auto/declarative/qquickpositioners/data/attachedproperties-grid.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-grid.qml diff --git a/tests/auto/declarative/qquickpositioners/data/attachedproperties-row.qml b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-row.qml index 212a26b431..212a26b431 100644 --- a/tests/auto/declarative/qquickpositioners/data/attachedproperties-row.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/attachedproperties-row.qml diff --git a/tests/auto/declarative/qquickpositioners/data/flow-testimplicitsize.qml b/tests/auto/qtquick2/qquickpositioners/data/flow-testimplicitsize.qml index c32b78676c..c32b78676c 100644 --- a/tests/auto/declarative/qquickpositioners/data/flow-testimplicitsize.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/flow-testimplicitsize.qml diff --git a/tests/auto/declarative/qquickpositioners/data/flowtest-toptobottom.qml b/tests/auto/qtquick2/qquickpositioners/data/flowtest-toptobottom.qml index a7d3ee13c7..a7d3ee13c7 100644 --- a/tests/auto/declarative/qquickpositioners/data/flowtest-toptobottom.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/flowtest-toptobottom.qml diff --git a/tests/auto/declarative/qquickpositioners/data/flowtest.qml b/tests/auto/qtquick2/qquickpositioners/data/flowtest.qml index 40b042dd79..40b042dd79 100644 --- a/tests/auto/declarative/qquickpositioners/data/flowtest.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/flowtest.qml diff --git a/tests/auto/declarative/qquickpositioners/data/grid-animated.qml b/tests/auto/qtquick2/qquickpositioners/data/grid-animated.qml index b8ee8f9a52..b8ee8f9a52 100644 --- a/tests/auto/declarative/qquickpositioners/data/grid-animated.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/grid-animated.qml diff --git a/tests/auto/declarative/qquickpositioners/data/grid-row-column-spacing.qml b/tests/auto/qtquick2/qquickpositioners/data/grid-row-column-spacing.qml index 49bbd337e7..49bbd337e7 100644 --- a/tests/auto/declarative/qquickpositioners/data/grid-row-column-spacing.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/grid-row-column-spacing.qml diff --git a/tests/auto/declarative/qquickpositioners/data/grid-spacing.qml b/tests/auto/qtquick2/qquickpositioners/data/grid-spacing.qml index 535a39037f..535a39037f 100644 --- a/tests/auto/declarative/qquickpositioners/data/grid-spacing.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/grid-spacing.qml diff --git a/tests/auto/declarative/qquickpositioners/data/grid-toptobottom.qml b/tests/auto/qtquick2/qquickpositioners/data/grid-toptobottom.qml index 45559aab5d..45559aab5d 100644 --- a/tests/auto/declarative/qquickpositioners/data/grid-toptobottom.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/grid-toptobottom.qml diff --git a/tests/auto/declarative/qquickpositioners/data/gridtest.qml b/tests/auto/qtquick2/qquickpositioners/data/gridtest.qml index 50bec1377b..50bec1377b 100644 --- a/tests/auto/declarative/qquickpositioners/data/gridtest.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/gridtest.qml diff --git a/tests/auto/declarative/qquickpositioners/data/gridzerocolumns.qml b/tests/auto/qtquick2/qquickpositioners/data/gridzerocolumns.qml index a252f279c3..a252f279c3 100644 --- a/tests/auto/declarative/qquickpositioners/data/gridzerocolumns.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/gridzerocolumns.qml diff --git a/tests/auto/declarative/qquickpositioners/data/horizontal-animated-disabled.qml b/tests/auto/qtquick2/qquickpositioners/data/horizontal-animated-disabled.qml index 8723ffc78f..8723ffc78f 100644 --- a/tests/auto/declarative/qquickpositioners/data/horizontal-animated-disabled.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/horizontal-animated-disabled.qml diff --git a/tests/auto/declarative/qquickpositioners/data/horizontal-animated.qml b/tests/auto/qtquick2/qquickpositioners/data/horizontal-animated.qml index a88c26b66c..a88c26b66c 100644 --- a/tests/auto/declarative/qquickpositioners/data/horizontal-animated.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/horizontal-animated.qml diff --git a/tests/auto/declarative/qquickpositioners/data/horizontal-spacing.qml b/tests/auto/qtquick2/qquickpositioners/data/horizontal-spacing.qml index c6ff75ac6b..c6ff75ac6b 100644 --- a/tests/auto/declarative/qquickpositioners/data/horizontal-spacing.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/horizontal-spacing.qml diff --git a/tests/auto/declarative/qquickpositioners/data/horizontal.qml b/tests/auto/qtquick2/qquickpositioners/data/horizontal.qml index 235ee78c9b..235ee78c9b 100644 --- a/tests/auto/declarative/qquickpositioners/data/horizontal.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/horizontal.qml diff --git a/tests/auto/declarative/qquickpositioners/data/propertychangestest.qml b/tests/auto/qtquick2/qquickpositioners/data/propertychangestest.qml index c9fd62b012..c9fd62b012 100644 --- a/tests/auto/declarative/qquickpositioners/data/propertychangestest.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/propertychangestest.qml diff --git a/tests/auto/declarative/qquickpositioners/data/rectangleComponent.qml b/tests/auto/qtquick2/qquickpositioners/data/rectangleComponent.qml index de1bb99593..de1bb99593 100644 --- a/tests/auto/declarative/qquickpositioners/data/rectangleComponent.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/rectangleComponent.qml diff --git a/tests/auto/declarative/qquickpositioners/data/repeatertest.qml b/tests/auto/qtquick2/qquickpositioners/data/repeatertest.qml index d90e1cf160..d90e1cf160 100644 --- a/tests/auto/declarative/qquickpositioners/data/repeatertest.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/repeatertest.qml diff --git a/tests/auto/declarative/qquickpositioners/data/vertical-animated.qml b/tests/auto/qtquick2/qquickpositioners/data/vertical-animated.qml index ecf593cd70..ecf593cd70 100644 --- a/tests/auto/declarative/qquickpositioners/data/vertical-animated.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/vertical-animated.qml diff --git a/tests/auto/declarative/qquickpositioners/data/vertical-spacing.qml b/tests/auto/qtquick2/qquickpositioners/data/vertical-spacing.qml index 7087961651..7087961651 100644 --- a/tests/auto/declarative/qquickpositioners/data/vertical-spacing.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/vertical-spacing.qml diff --git a/tests/auto/declarative/qquickpositioners/data/vertical.qml b/tests/auto/qtquick2/qquickpositioners/data/vertical.qml index 0c3a81f008..0c3a81f008 100644 --- a/tests/auto/declarative/qquickpositioners/data/vertical.qml +++ b/tests/auto/qtquick2/qquickpositioners/data/vertical.qml diff --git a/tests/auto/declarative/qquickpositioners/qquickpositioners.pro b/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro index eee9eca97a..5931b9ba3a 100644 --- a/tests/auto/declarative/qquickpositioners/qquickpositioners.pro +++ b/tests/auto/qtquick2/qquickpositioners/qquickpositioners.pro @@ -8,4 +8,4 @@ testDataFiles.path = . DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp index ebfd394b0e..867de8cb9e 100644 --- a/tests/auto/declarative/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/qtquick2/qquickpositioners/tst_qquickpositioners.cpp @@ -40,14 +40,14 @@ ****************************************************************************/ #include <QtTest/QtTest> #include <private/qlistmodelinterface_p.h> -#include <qquickview.h> +#include <QtQuick/qquickview.h> #include <qdeclarativeengine.h> -#include <private/qquickrectangle_p.h> -#include <private/qquickpositioners_p.h> -#include <private/qdeclarativetransition_p.h> +#include <QtQuick/private/qquickrectangle_p.h> +#include <QtQuick/private/qquickpositioners_p.h> +#include <QtQuick/private/qdeclarativetransition_p.h> #include <private/qquickitem_p.h> #include <qdeclarativeexpression.h> -#include "../shared/util.h" +#include "../../shared/util.h" class tst_qquickpositioners : public QObject { diff --git a/tests/auto/declarative/qquickrepeater/data/asyncloader.qml b/tests/auto/qtquick2/qquickrepeater/data/asyncloader.qml index 82094e2666..82094e2666 100644 --- a/tests/auto/declarative/qquickrepeater/data/asyncloader.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/asyncloader.qml diff --git a/tests/auto/declarative/qquickrepeater/data/initparent.qml b/tests/auto/qtquick2/qquickrepeater/data/initparent.qml index e6571f09d3..e6571f09d3 100644 --- a/tests/auto/declarative/qquickrepeater/data/initparent.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/initparent.qml diff --git a/tests/auto/declarative/qquickrepeater/data/intmodel.qml b/tests/auto/qtquick2/qquickrepeater/data/intmodel.qml index 30a650dd52..30a650dd52 100644 --- a/tests/auto/declarative/qquickrepeater/data/intmodel.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/intmodel.qml diff --git a/tests/auto/declarative/qquickrepeater/data/itemlist.qml b/tests/auto/qtquick2/qquickrepeater/data/itemlist.qml index 174bfd4d18..174bfd4d18 100644 --- a/tests/auto/declarative/qquickrepeater/data/itemlist.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/itemlist.qml diff --git a/tests/auto/declarative/qquickrepeater/data/modelChanged.qml b/tests/auto/qtquick2/qquickrepeater/data/modelChanged.qml index 23af127e79..23af127e79 100644 --- a/tests/auto/declarative/qquickrepeater/data/modelChanged.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/modelChanged.qml diff --git a/tests/auto/declarative/qquickrepeater/data/objlist.qml b/tests/auto/qtquick2/qquickrepeater/data/objlist.qml index c49d5926e5..c49d5926e5 100644 --- a/tests/auto/declarative/qquickrepeater/data/objlist.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/objlist.qml diff --git a/tests/auto/declarative/qquickrepeater/data/properties.qml b/tests/auto/qtquick2/qquickrepeater/data/properties.qml index 035431c784..035431c784 100644 --- a/tests/auto/declarative/qquickrepeater/data/properties.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/properties.qml diff --git a/tests/auto/declarative/qquickrepeater/data/repeater1.qml b/tests/auto/qtquick2/qquickrepeater/data/repeater1.qml index 596dc9131e..596dc9131e 100644 --- a/tests/auto/declarative/qquickrepeater/data/repeater1.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/repeater1.qml diff --git a/tests/auto/declarative/qquickrepeater/data/repeater2.qml b/tests/auto/qtquick2/qquickrepeater/data/repeater2.qml index 691fbda1e5..691fbda1e5 100644 --- a/tests/auto/declarative/qquickrepeater/data/repeater2.qml +++ b/tests/auto/qtquick2/qquickrepeater/data/repeater2.qml diff --git a/tests/auto/declarative/qquickrepeater/qquickrepeater.pro b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro index 9cdb9c2c53..7e740f98aa 100644 --- a/tests/auto/declarative/qquickrepeater/qquickrepeater.pro +++ b/tests/auto/qtquick2/qquickrepeater/qquickrepeater.pro @@ -9,4 +9,4 @@ testFiles.path = . DEPLOYMENT += testFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp index 6024d1307a..1d6af452e4 100644 --- a/tests/auto/declarative/qquickrepeater/tst_qquickrepeater.cpp +++ b/tests/auto/qtquick2/qquickrepeater/tst_qquickrepeater.cpp @@ -43,15 +43,14 @@ #include <QtTest/QSignalSpy> #include <private/qlistmodelinterface_p.h> #include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeexpression.h> #include <QtDeclarative/qdeclarativeincubator.h> #include <private/qquickrepeater_p.h> -#include <private/qquicktext_p.h> +#include <QtQuick/private/qquicktext_p.h> -#include "../shared/util.h" -#include "../../../shared/util.h" +#include "../../shared/util.h" inline QUrl TEST_FILE(const QString &filename) { diff --git a/tests/auto/declarative/qquickshadereffect/qquickshadereffect.pro b/tests/auto/qtquick2/qquickshadereffect/qquickshadereffect.pro index 540bbe1515..de8b247340 100644 --- a/tests/auto/declarative/qquickshadereffect/qquickshadereffect.pro +++ b/tests/auto/qtquick2/qquickshadereffect/qquickshadereffect.pro @@ -5,4 +5,4 @@ SOURCES += tst_qquickshadereffect.cpp macx:CONFIG -= app_bundle CONFIG += parallel_test -QT += core-private gui-private declarative-private widgets testlib +QT += core-private gui-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qquickshadereffect/tst_qquickshadereffect.cpp b/tests/auto/qtquick2/qquickshadereffect/tst_qquickshadereffect.cpp index 327fecf1ab..327fecf1ab 100644 --- a/tests/auto/declarative/qquickshadereffect/tst_qquickshadereffect.cpp +++ b/tests/auto/qtquick2/qquickshadereffect/tst_qquickshadereffect.cpp diff --git a/tests/auto/declarative/qquickspriteimage/data/basic.qml b/tests/auto/qtquick2/qquickspriteimage/data/basic.qml index 1fcdfd99c3..1fcdfd99c3 100644 --- a/tests/auto/declarative/qquickspriteimage/data/basic.qml +++ b/tests/auto/qtquick2/qquickspriteimage/data/basic.qml diff --git a/tests/auto/declarative/qquickspriteimage/data/squarefacesprite.png b/tests/auto/qtquick2/qquickspriteimage/data/squarefacesprite.png Binary files differindex f9a5d5fcce..f9a5d5fcce 100644 --- a/tests/auto/declarative/qquickspriteimage/data/squarefacesprite.png +++ b/tests/auto/qtquick2/qquickspriteimage/data/squarefacesprite.png diff --git a/tests/auto/declarative/qquickspriteimage/qquickspriteimage.pro b/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro index db5c45da8a..fe788f5b7b 100644 --- a/tests/auto/declarative/qquickspriteimage/qquickspriteimage.pro +++ b/tests/auto/qtquick2/qquickspriteimage/qquickspriteimage.pro @@ -9,4 +9,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private declarative-private network testlib +QT += core-private gui-private declarative-private quick-private network testlib diff --git a/tests/auto/declarative/qquickspriteimage/tst_qquickspriteimage.cpp b/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp index 1b8c58b873..5c09019b03 100644 --- a/tests/auto/declarative/qquickspriteimage/tst_qquickspriteimage.cpp +++ b/tests/auto/qtquick2/qquickspriteimage/tst_qquickspriteimage.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ #include <QtTest/QtTest> -#include "../shared/util.h" -#include <qquickview.h> +#include "../../shared/util.h" +#include <QtQuick/qquickview.h> #include <private/qquickspriteimage_p.h> class tst_qquickspriteimage : public QObject diff --git a/tests/auto/declarative/qquicktext/data/alignments.qml b/tests/auto/qtquick2/qquicktext/data/alignments.qml index 9798d9c736..9798d9c736 100644 --- a/tests/auto/declarative/qquicktext/data/alignments.qml +++ b/tests/auto/qtquick2/qquicktext/data/alignments.qml diff --git a/tests/auto/declarative/qquicktext/data/alignments_cb.png b/tests/auto/qtquick2/qquicktext/data/alignments_cb.png Binary files differindex cf6199a418..cf6199a418 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_cb.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_cb.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_cc.png b/tests/auto/qtquick2/qquicktext/data/alignments_cc.png Binary files differindex f81ccb4238..f81ccb4238 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_cc.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_cc.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_ct.png b/tests/auto/qtquick2/qquicktext/data/alignments_ct.png Binary files differindex 9ba64125d5..9ba64125d5 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_ct.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_ct.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_lb.png b/tests/auto/qtquick2/qquicktext/data/alignments_lb.png Binary files differindex 1b50a81f3d..1b50a81f3d 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_lb.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_lb.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_lc.png b/tests/auto/qtquick2/qquicktext/data/alignments_lc.png Binary files differindex f041b868f8..f041b868f8 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_lc.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_lc.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_lt.png b/tests/auto/qtquick2/qquicktext/data/alignments_lt.png Binary files differindex c75e0d158e..c75e0d158e 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_lt.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_lt.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_rb.png b/tests/auto/qtquick2/qquicktext/data/alignments_rb.png Binary files differindex b06a5da715..b06a5da715 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_rb.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_rb.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_rc.png b/tests/auto/qtquick2/qquicktext/data/alignments_rc.png Binary files differindex e468857cd0..e468857cd0 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_rc.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_rc.png diff --git a/tests/auto/declarative/qquicktext/data/alignments_rt.png b/tests/auto/qtquick2/qquicktext/data/alignments_rt.png Binary files differindex 576715ffce..576715ffce 100644 --- a/tests/auto/declarative/qquicktext/data/alignments_rt.png +++ b/tests/auto/qtquick2/qquicktext/data/alignments_rt.png diff --git a/tests/auto/declarative/qquicktext/data/embeddedImagesLocal.qml b/tests/auto/qtquick2/qquicktext/data/embeddedImagesLocal.qml index 74b2ab817a..74b2ab817a 100644 --- a/tests/auto/declarative/qquicktext/data/embeddedImagesLocal.qml +++ b/tests/auto/qtquick2/qquicktext/data/embeddedImagesLocal.qml diff --git a/tests/auto/declarative/qquicktext/data/embeddedImagesLocalError.qml b/tests/auto/qtquick2/qquicktext/data/embeddedImagesLocalError.qml index a2f7e0c89f..a2f7e0c89f 100644 --- a/tests/auto/declarative/qquicktext/data/embeddedImagesLocalError.qml +++ b/tests/auto/qtquick2/qquicktext/data/embeddedImagesLocalError.qml diff --git a/tests/auto/declarative/qquicktext/data/embeddedImagesRemote.qml b/tests/auto/qtquick2/qquicktext/data/embeddedImagesRemote.qml index 702633c538..702633c538 100644 --- a/tests/auto/declarative/qquicktext/data/embeddedImagesRemote.qml +++ b/tests/auto/qtquick2/qquicktext/data/embeddedImagesRemote.qml diff --git a/tests/auto/declarative/qquicktext/data/embeddedImagesRemoteError.qml b/tests/auto/qtquick2/qquicktext/data/embeddedImagesRemoteError.qml index 5762f3e47d..5762f3e47d 100644 --- a/tests/auto/declarative/qquicktext/data/embeddedImagesRemoteError.qml +++ b/tests/auto/qtquick2/qquicktext/data/embeddedImagesRemoteError.qml diff --git a/tests/auto/declarative/qquicktext/data/horizontalAlignment_RightToLeft.qml b/tests/auto/qtquick2/qquicktext/data/horizontalAlignment_RightToLeft.qml index 5ba4d35684..5ba4d35684 100644 --- a/tests/auto/declarative/qquicktext/data/horizontalAlignment_RightToLeft.qml +++ b/tests/auto/qtquick2/qquicktext/data/horizontalAlignment_RightToLeft.qml diff --git a/tests/auto/declarative/qquicktext/data/http/exists.png b/tests/auto/qtquick2/qquicktext/data/http/exists.png Binary files differindex 399bd0b1d9..399bd0b1d9 100644 --- a/tests/auto/declarative/qquicktext/data/http/exists.png +++ b/tests/auto/qtquick2/qquicktext/data/http/exists.png diff --git a/tests/auto/declarative/qquicktext/data/lineCount.qml b/tests/auto/qtquick2/qquicktext/data/lineCount.qml index b672863684..b672863684 100644 --- a/tests/auto/declarative/qquicktext/data/lineCount.qml +++ b/tests/auto/qtquick2/qquicktext/data/lineCount.qml diff --git a/tests/auto/declarative/qquicktext/data/lineHeight.qml b/tests/auto/qtquick2/qquicktext/data/lineHeight.qml index c1f337aa05..c1f337aa05 100644 --- a/tests/auto/declarative/qquicktext/data/lineHeight.qml +++ b/tests/auto/qtquick2/qquicktext/data/lineHeight.qml diff --git a/tests/auto/declarative/qquicktext/data/lineLayout.qml b/tests/auto/qtquick2/qquicktext/data/lineLayout.qml index cb2474791e..cb2474791e 100644 --- a/tests/auto/declarative/qquicktext/data/lineLayout.qml +++ b/tests/auto/qtquick2/qquicktext/data/lineLayout.qml diff --git a/tests/auto/declarative/qquicktext/data/multilineelide.qml b/tests/auto/qtquick2/qquicktext/data/multilineelide.qml index 23398a84a1..23398a84a1 100644 --- a/tests/auto/declarative/qquicktext/data/multilineelide.qml +++ b/tests/auto/qtquick2/qquicktext/data/multilineelide.qml diff --git a/tests/auto/declarative/qquicktext/data/qtbug_14734.qml b/tests/auto/qtquick2/qquicktext/data/qtbug_14734.qml index e71a798421..e71a798421 100644 --- a/tests/auto/declarative/qquicktext/data/qtbug_14734.qml +++ b/tests/auto/qtquick2/qquicktext/data/qtbug_14734.qml diff --git a/tests/auto/declarative/qquicktext/data/rotated.qml b/tests/auto/qtquick2/qquicktext/data/rotated.qml index fecf64b249..fecf64b249 100644 --- a/tests/auto/declarative/qquicktext/data/rotated.qml +++ b/tests/auto/qtquick2/qquicktext/data/rotated.qml diff --git a/tests/auto/qtquick2/qquicktext/qquicktext.pro b/tests/auto/qtquick2/qquicktext/qquicktext.pro new file mode 100644 index 0000000000..e5bd50afc6 --- /dev/null +++ b/tests/auto/qtquick2/qquicktext/qquicktext.pro @@ -0,0 +1,17 @@ +CONFIG += testcase +TARGET = tst_qquicktext +macx:CONFIG -= app_bundle + +SOURCES += tst_qquicktext.cpp + +INCLUDEPATH += ../../shared/ +HEADERS += ../../shared/testhttpserver.h +SOURCES += ../../shared/testhttpserver.cpp + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +CONFIG += parallel_test + +QT += core-private gui-private v8-private declarative-private quick-private widgets-private opengl-private network testlib diff --git a/tests/auto/declarative/qquicktext/tst_qquicktext.cpp b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp index fb37357608..60e8571a47 100644 --- a/tests/auto/declarative/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/qtquick2/qquicktext/tst_qquicktext.cpp @@ -42,17 +42,17 @@ #include <QTextDocument> #include <QtDeclarative/qdeclarativeengine.h> #include <QtDeclarative/qdeclarativecomponent.h> -#include <private/qquicktext_p.h> +#include <QtQuick/private/qquicktext_p.h> #include <private/qquicktext_p_p.h> #include <private/qdeclarativevaluetype_p.h> #include <QFontMetrics> #include <QGraphicsSceneMouseEvent> #include <qmath.h> -#include <QQuickView> +#include <QtQuick/QQuickView> #include <private/qapplication_p.h> #include <limits.h> #include <QtGui/QMouseEvent> -#include "../shared/util.h" +#include "../../shared/util.h" #include "testhttpserver.h" DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD) diff --git a/tests/auto/declarative/qquicktextedit/data/CursorRect.qml b/tests/auto/qtquick2/qquicktextedit/data/CursorRect.qml index cae3e63b72..cae3e63b72 100644 --- a/tests/auto/declarative/qquicktextedit/data/CursorRect.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/CursorRect.qml diff --git a/tests/auto/declarative/qquicktextedit/data/alignments.qml b/tests/auto/qtquick2/qquicktextedit/data/alignments.qml index 7d365da8cb..7d365da8cb 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments.qml diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_cb.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_cb.png Binary files differindex 99de2192de..99de2192de 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_cb.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_cb.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_cc.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_cc.png Binary files differindex cb85251180..cb85251180 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_cc.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_cc.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_ct.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_ct.png Binary files differindex ddca549c82..ddca549c82 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_ct.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_ct.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_lb.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_lb.png Binary files differindex 1b50a81f3d..1b50a81f3d 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_lb.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_lb.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_lc.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_lc.png Binary files differindex f041b868f8..f041b868f8 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_lc.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_lc.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_lt.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_lt.png Binary files differindex c75e0d158e..c75e0d158e 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_lt.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_lt.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_rb.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_rb.png Binary files differindex b06a5da715..b06a5da715 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_rb.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_rb.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_rc.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_rc.png Binary files differindex e468857cd0..e468857cd0 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_rc.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_rc.png diff --git a/tests/auto/declarative/qquicktextedit/data/alignments_rt.png b/tests/auto/qtquick2/qquicktextedit/data/alignments_rt.png Binary files differindex 576715ffce..576715ffce 100644 --- a/tests/auto/declarative/qquicktextedit/data/alignments_rt.png +++ b/tests/auto/qtquick2/qquicktextedit/data/alignments_rt.png diff --git a/tests/auto/declarative/qquicktextedit/data/cursorTest.qml b/tests/auto/qtquick2/qquicktextedit/data/cursorTest.qml index 7bfc869403..7bfc869403 100644 --- a/tests/auto/declarative/qquicktextedit/data/cursorTest.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/cursorTest.qml diff --git a/tests/auto/declarative/qquicktextedit/data/cursorVisible.qml b/tests/auto/qtquick2/qquicktextedit/data/cursorVisible.qml index 49e9386947..49e9386947 100644 --- a/tests/auto/declarative/qquicktextedit/data/cursorVisible.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/cursorVisible.qml diff --git a/tests/auto/declarative/qquicktextedit/data/geometrySignals.qml b/tests/auto/qtquick2/qquicktextedit/data/geometrySignals.qml index 3dbe61c74b..3dbe61c74b 100644 --- a/tests/auto/declarative/qquicktextedit/data/geometrySignals.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/geometrySignals.qml diff --git a/tests/auto/declarative/qquicktextedit/data/horizontalAlignment_RightToLeft.qml b/tests/auto/qtquick2/qquicktextedit/data/horizontalAlignment_RightToLeft.qml index 4cd92367ec..4cd92367ec 100644 --- a/tests/auto/declarative/qquicktextedit/data/horizontalAlignment_RightToLeft.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/horizontalAlignment_RightToLeft.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/ErrItem.qml b/tests/auto/qtquick2/qquicktextedit/data/http/ErrItem.qml index 68c0e0c093..68c0e0c093 100644 --- a/tests/auto/declarative/qquicktextedit/data/http/ErrItem.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/http/ErrItem.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/NormItem.qml b/tests/auto/qtquick2/qquicktextedit/data/http/NormItem.qml index 2e4c1ed440..2e4c1ed440 100644 --- a/tests/auto/declarative/qquicktextedit/data/http/NormItem.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/http/NormItem.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTest.qml b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTest.qml index be4526e22b..be4526e22b 100644 --- a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTest.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTest.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail1.qml b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail1.qml index 1d7763f913..1d7763f913 100644 --- a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail1.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail1.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail2.qml b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail2.qml index c82ec02e68..c82ec02e68 100644 --- a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestFail2.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestFail2.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestPass.qml b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestPass.qml index 96d582c95d..96d582c95d 100644 --- a/tests/auto/declarative/qquicktextedit/data/http/cursorHttpTestPass.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/http/cursorHttpTestPass.qml diff --git a/tests/auto/declarative/qquicktextedit/data/http/qmldir b/tests/auto/qtquick2/qquicktextedit/data/http/qmldir index 886e6ffec0..886e6ffec0 100644 --- a/tests/auto/declarative/qquicktextedit/data/http/qmldir +++ b/tests/auto/qtquick2/qquicktextedit/data/http/qmldir diff --git a/tests/auto/declarative/qquicktextedit/data/httpfail/FailItem.qml b/tests/auto/qtquick2/qquicktextedit/data/httpfail/FailItem.qml index 8161843479..8161843479 100644 --- a/tests/auto/declarative/qquicktextedit/data/httpfail/FailItem.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/httpfail/FailItem.qml diff --git a/tests/auto/declarative/qquicktextedit/data/httpslow/WaitItem.qml b/tests/auto/qtquick2/qquicktextedit/data/httpslow/WaitItem.qml index 8161843479..8161843479 100644 --- a/tests/auto/declarative/qquicktextedit/data/httpslow/WaitItem.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/httpslow/WaitItem.qml diff --git a/tests/auto/declarative/qquicktextedit/data/inputContext.qml b/tests/auto/qtquick2/qquicktextedit/data/inputContext.qml index a37c77e3bf..a37c77e3bf 100644 --- a/tests/auto/declarative/qquicktextedit/data/inputContext.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/inputContext.qml diff --git a/tests/auto/declarative/qquicktextedit/data/inputMethodEvent.qml b/tests/auto/qtquick2/qquicktextedit/data/inputMethodEvent.qml index e3f629ce3e..e3f629ce3e 100644 --- a/tests/auto/declarative/qquicktextedit/data/inputMethodEvent.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/inputMethodEvent.qml diff --git a/tests/auto/declarative/qquicktextedit/data/inputmethodhints.qml b/tests/auto/qtquick2/qquicktextedit/data/inputmethodhints.qml index dec3b978e7..dec3b978e7 100644 --- a/tests/auto/declarative/qquicktextedit/data/inputmethodhints.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/inputmethodhints.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_default.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_default.qml index ac32f4ced7..ac32f4ced7 100644 --- a/tests/auto/declarative/qquicktextedit/data/mouseselection_default.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_default.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_false.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_false.qml index ac32f4ced7..ac32f4ced7 100644 --- a/tests/auto/declarative/qquicktextedit/data/mouseselection_false.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_false.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_false_words.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_false_words.qml index 86aea46a85..86aea46a85 100644 --- a/tests/auto/declarative/qquicktextedit/data/mouseselection_false_words.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_false_words.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_true.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_true.qml index 7c7cb0b6fc..7c7cb0b6fc 100644 --- a/tests/auto/declarative/qquicktextedit/data/mouseselection_true.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_true.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselection_true_words.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_true_words.qml index c356999220..c356999220 100644 --- a/tests/auto/declarative/qquicktextedit/data/mouseselection_true_words.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/mouseselection_true_words.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_characters.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_characters.qml index c1fe42fd57..c1fe42fd57 100644 --- a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_characters.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_characters.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_default.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_default.qml index 7c7cb0b6fc..7c7cb0b6fc 100644 --- a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_default.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_default.qml diff --git a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_words.qml b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_words.qml index 0a372bbf83..0a372bbf83 100644 --- a/tests/auto/declarative/qquicktextedit/data/mouseselectionmode_words.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/mouseselectionmode_words.qml diff --git a/tests/auto/declarative/qquicktextedit/data/navigation.qml b/tests/auto/qtquick2/qquicktextedit/data/navigation.qml index 0201c62b3c..0201c62b3c 100644 --- a/tests/auto/declarative/qquicktextedit/data/navigation.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/navigation.qml diff --git a/tests/auto/declarative/qquicktextedit/data/openInputPanel.qml b/tests/auto/qtquick2/qquicktextedit/data/openInputPanel.qml index d3aecf21be..d3aecf21be 100644 --- a/tests/auto/declarative/qquicktextedit/data/openInputPanel.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/openInputPanel.qml diff --git a/tests/auto/declarative/qquicktextedit/data/positionAt.qml b/tests/auto/qtquick2/qquicktextedit/data/positionAt.qml index 19093281fe..19093281fe 100644 --- a/tests/auto/declarative/qquicktextedit/data/positionAt.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/positionAt.qml diff --git a/tests/auto/declarative/qquicktextedit/data/qtbug-22058.qml b/tests/auto/qtquick2/qquicktextedit/data/qtbug-22058.qml index 8ad1514fbf..8ad1514fbf 100644 --- a/tests/auto/declarative/qquicktextedit/data/qtbug-22058.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/qtbug-22058.qml diff --git a/tests/auto/declarative/qquicktextedit/data/readOnly.qml b/tests/auto/qtquick2/qquicktextedit/data/readOnly.qml index 085adba5fb..085adba5fb 100644 --- a/tests/auto/declarative/qquicktextedit/data/readOnly.qml +++ b/tests/auto/qtquick2/qquicktextedit/data/readOnly.qml diff --git a/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro b/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro new file mode 100644 index 0000000000..02a834beab --- /dev/null +++ b/tests/auto/qtquick2/qquicktextedit/qquicktextedit.pro @@ -0,0 +1,12 @@ +CONFIG += testcase +TARGET = tst_qquicktextedit +macx:CONFIG -= app_bundle + +SOURCES += tst_qquicktextedit.cpp ../../shared/testhttpserver.cpp +HEADERS += ../../shared/testhttpserver.h + +testDataFiles.files = data +testDataFiles.path = . +DEPLOYMENT += testDataFiles + +QT += core-private gui-private v8-private declarative-private quick-private opengl-private network widgets-private testlib diff --git a/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp index 6bcad83c52..97d7531321 100644 --- a/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/qtquick2/qquicktextedit/tst_qquicktextedit.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include "../shared/testhttpserver.h" +#include "../../shared/testhttpserver.h" #include <math.h> #include <QFile> #include <QTextDocument> @@ -52,14 +52,14 @@ #include <private/qquicktextedit_p.h> #include <private/qquicktextedit_p_p.h> #include <QFontMetrics> -#include <QQuickView> +#include <QtQuick/QQuickView> #include <QDir> #include <QStyle> #include <QInputPanel> #include <QClipboard> #include <QMimeData> #include <private/qtextcontrol_p.h> -#include "../shared/util.h" +#include "../../shared/util.h" #include <qplatforminputcontext_qpa.h> #include <private/qinputpanel_p.h> diff --git a/tests/auto/declarative/qquicktextinput/data/cursorTest.qml b/tests/auto/qtquick2/qquicktextinput/data/cursorTest.qml index 71a420ee7c..71a420ee7c 100644 --- a/tests/auto/declarative/qquicktextinput/data/cursorTest.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/cursorTest.qml diff --git a/tests/auto/declarative/qquicktextinput/data/cursorVisible.qml b/tests/auto/qtquick2/qquicktextinput/data/cursorVisible.qml index 49e9386947..49e9386947 100644 --- a/tests/auto/declarative/qquicktextinput/data/cursorVisible.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/cursorVisible.qml diff --git a/tests/auto/declarative/qquicktextinput/data/echoMode.qml b/tests/auto/qtquick2/qquicktextinput/data/echoMode.qml index f8a6cf1c89..f8a6cf1c89 100644 --- a/tests/auto/declarative/qquicktextinput/data/echoMode.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/echoMode.qml diff --git a/tests/auto/declarative/qquicktextinput/data/geometrySignals.qml b/tests/auto/qtquick2/qquicktextinput/data/geometrySignals.qml index 90855a61cf..90855a61cf 100644 --- a/tests/auto/declarative/qquicktextinput/data/geometrySignals.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/geometrySignals.qml diff --git a/tests/auto/declarative/qquicktextinput/data/halign_center.png b/tests/auto/qtquick2/qquicktextinput/data/halign_center.png Binary files differindex 53e09a8e5b..53e09a8e5b 100644 --- a/tests/auto/declarative/qquicktextinput/data/halign_center.png +++ b/tests/auto/qtquick2/qquicktextinput/data/halign_center.png diff --git a/tests/auto/declarative/qquicktextinput/data/halign_left.png b/tests/auto/qtquick2/qquicktextinput/data/halign_left.png Binary files differindex 247acbc9df..247acbc9df 100644 --- a/tests/auto/declarative/qquicktextinput/data/halign_left.png +++ b/tests/auto/qtquick2/qquicktextinput/data/halign_left.png diff --git a/tests/auto/declarative/qquicktextinput/data/halign_right.png b/tests/auto/qtquick2/qquicktextinput/data/halign_right.png Binary files differindex 691bc75c89..691bc75c89 100644 --- a/tests/auto/declarative/qquicktextinput/data/halign_right.png +++ b/tests/auto/qtquick2/qquicktextinput/data/halign_right.png diff --git a/tests/auto/declarative/qquicktextinput/data/horizontalAlignment.qml b/tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment.qml index e0fef4c11e..e0fef4c11e 100644 --- a/tests/auto/declarative/qquicktextinput/data/horizontalAlignment.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment.qml diff --git a/tests/auto/declarative/qquicktextinput/data/horizontalAlignment_RightToLeft.qml b/tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment_RightToLeft.qml index 5f88025536..5f88025536 100644 --- a/tests/auto/declarative/qquicktextinput/data/horizontalAlignment_RightToLeft.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/horizontalAlignment_RightToLeft.qml diff --git a/tests/auto/declarative/qquicktextinput/data/inputContext.qml b/tests/auto/qtquick2/qquicktextinput/data/inputContext.qml index dfc80990c6..dfc80990c6 100644 --- a/tests/auto/declarative/qquicktextinput/data/inputContext.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/inputContext.qml diff --git a/tests/auto/declarative/qquicktextinput/data/inputMethodEvent.qml b/tests/auto/qtquick2/qquicktextinput/data/inputMethodEvent.qml index 7aefdf28f4..7aefdf28f4 100644 --- a/tests/auto/declarative/qquicktextinput/data/inputMethodEvent.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/inputMethodEvent.qml diff --git a/tests/auto/declarative/qquicktextinput/data/inputmethods.qml b/tests/auto/qtquick2/qquicktextinput/data/inputmethods.qml index 711e89144c..711e89144c 100644 --- a/tests/auto/declarative/qquicktextinput/data/inputmethods.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/inputmethods.qml diff --git a/tests/auto/declarative/qquicktextinput/data/masks.qml b/tests/auto/qtquick2/qquicktextinput/data/masks.qml index 589b6a3c15..589b6a3c15 100644 --- a/tests/auto/declarative/qquicktextinput/data/masks.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/masks.qml diff --git a/tests/auto/declarative/qquicktextinput/data/maxLength.qml b/tests/auto/qtquick2/qquicktextinput/data/maxLength.qml index cca537ed6b..cca537ed6b 100644 --- a/tests/auto/declarative/qquicktextinput/data/maxLength.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/maxLength.qml diff --git a/tests/auto/declarative/qquicktextinput/data/mouseselection_true.qml b/tests/auto/qtquick2/qquicktextinput/data/mouseselection_true.qml index 974041b04a..974041b04a 100644 --- a/tests/auto/declarative/qquicktextinput/data/mouseselection_true.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/mouseselection_true.qml diff --git a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_characters.qml b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_characters.qml index f7c658b618..f7c658b618 100644 --- a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_characters.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_characters.qml diff --git a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_default.qml b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_default.qml index 974041b04a..974041b04a 100644 --- a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_default.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_default.qml diff --git a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_words.qml b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_words.qml index 20e777e470..20e777e470 100644 --- a/tests/auto/declarative/qquicktextinput/data/mouseselectionmode_words.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/mouseselectionmode_words.qml diff --git a/tests/auto/declarative/qquicktextinput/data/navigation.qml b/tests/auto/qtquick2/qquicktextinput/data/navigation.qml index 3a7d07b3c7..3a7d07b3c7 100644 --- a/tests/auto/declarative/qquicktextinput/data/navigation.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/navigation.qml diff --git a/tests/auto/declarative/qquicktextinput/data/openInputPanel.qml b/tests/auto/qtquick2/qquicktextinput/data/openInputPanel.qml index ca5cb263aa..ca5cb263aa 100644 --- a/tests/auto/declarative/qquicktextinput/data/openInputPanel.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/openInputPanel.qml diff --git a/tests/auto/declarative/qquicktextinput/data/positionAt.qml b/tests/auto/qtquick2/qquicktextinput/data/positionAt.qml index 1840462c87..1840462c87 100644 --- a/tests/auto/declarative/qquicktextinput/data/positionAt.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/positionAt.qml diff --git a/tests/auto/declarative/qquicktextinput/data/preeditAutoScroll.qml b/tests/auto/qtquick2/qquicktextinput/data/preeditAutoScroll.qml index 9d98a2e220..9d98a2e220 100644 --- a/tests/auto/declarative/qquicktextinput/data/preeditAutoScroll.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/preeditAutoScroll.qml diff --git a/tests/auto/declarative/qquicktextinput/data/qtbug-19956double.qml b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956double.qml index e9b80fceb2..e9b80fceb2 100644 --- a/tests/auto/declarative/qquicktextinput/data/qtbug-19956double.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956double.qml diff --git a/tests/auto/declarative/qquicktextinput/data/qtbug-19956int.qml b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956int.qml index 0d70eedb80..0d70eedb80 100644 --- a/tests/auto/declarative/qquicktextinput/data/qtbug-19956int.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956int.qml diff --git a/tests/auto/declarative/qquicktextinput/data/qtbug-19956regexp.qml b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956regexp.qml index b5af13cc4c..b5af13cc4c 100644 --- a/tests/auto/declarative/qquicktextinput/data/qtbug-19956regexp.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/qtbug-19956regexp.qml diff --git a/tests/auto/declarative/qquicktextinput/data/readOnly.qml b/tests/auto/qtquick2/qquicktextinput/data/readOnly.qml index 9cda7fbd1d..9cda7fbd1d 100644 --- a/tests/auto/declarative/qquicktextinput/data/readOnly.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/readOnly.qml diff --git a/tests/auto/declarative/qquicktextinput/data/validators.qml b/tests/auto/qtquick2/qquicktextinput/data/validators.qml index 0a074ce7dc..0a074ce7dc 100644 --- a/tests/auto/declarative/qquicktextinput/data/validators.qml +++ b/tests/auto/qtquick2/qquicktextinput/data/validators.qml diff --git a/tests/auto/declarative/qquicktextinput/qquicktextinput.pro b/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro index 9c74559cb2..f81da61634 100644 --- a/tests/auto/declarative/qquicktextinput/qquicktextinput.pro +++ b/tests/auto/qtquick2/qquicktextinput/qquicktextinput.pro @@ -8,4 +8,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp index a6a9add5d5..57b2df11c9 100644 --- a/tests/auto/declarative/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp @@ -40,11 +40,11 @@ ****************************************************************************/ #include <qtest.h> #include <QtTest/QSignalSpy> -#include "../shared/util.h" +#include "../../shared/util.h" #include <private/qinputpanel_p.h> #include <QtDeclarative/qdeclarativeengine.h> #include <QFile> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <QtGui/qguiapplication.h> #include <QtGui/qstylehints.h> #include <QInputPanel> diff --git a/tests/auto/declarative/qquickview/data/error1.qml b/tests/auto/qtquick2/qquickview/data/error1.qml index 09df679555..09df679555 100644 --- a/tests/auto/declarative/qquickview/data/error1.qml +++ b/tests/auto/qtquick2/qquickview/data/error1.qml diff --git a/tests/auto/declarative/qquickview/data/resizemodeitem.qml b/tests/auto/qtquick2/qquickview/data/resizemodeitem.qml index ed73009b26..ed73009b26 100644 --- a/tests/auto/declarative/qquickview/data/resizemodeitem.qml +++ b/tests/auto/qtquick2/qquickview/data/resizemodeitem.qml diff --git a/tests/auto/declarative/qquickview/qquickview.pro b/tests/auto/qtquick2/qquickview/qquickview.pro index c5cc3ce6a7..d4e7c064fa 100644 --- a/tests/auto/declarative/qquickview/qquickview.pro +++ b/tests/auto/qtquick2/qquickview/qquickview.pro @@ -8,4 +8,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private declarative-private testlib +QT += core-private gui-private declarative-private quick-private testlib diff --git a/tests/auto/declarative/qquickview/tst_qquickview.cpp b/tests/auto/qtquick2/qquickview/tst_qquickview.cpp index fc480b5fca..953374dcab 100644 --- a/tests/auto/declarative/qquickview/tst_qquickview.cpp +++ b/tests/auto/qtquick2/qquickview/tst_qquickview.cpp @@ -42,9 +42,9 @@ #include <QtTest/QSignalSpy> #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativecontext.h> -#include <QtDeclarative/qquickview.h> -#include <QtDeclarative/qquickitem.h> -#include "../shared/util.h" +#include <QtQuick/qquickview.h> +#include <QtQuick/qquickitem.h> +#include "../../shared/util.h" #include <QtGui/QWindow> #include <QtCore/QDebug> diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/create.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/create.qml index 3475a0dace..3475a0dace 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/create.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/create.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/datalist-package.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/datalist-package.qml index ae3bd81d91..ae3bd81d91 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/datalist-package.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/datalist-package.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/datalist.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/datalist.qml index 8ce59caddc..8ce59caddc 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/datalist.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/datalist.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/groups-invalid.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups-invalid.qml index 70c6f9f995..70c6f9f995 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/groups-invalid.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups-invalid.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/groups-package.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups-package.qml index ea5ad5d3bd..ea5ad5d3bd 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/groups-package.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups-package.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/groups.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups.qml index 7502dd2502..7502dd2502 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/groups.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/groups.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_listView.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_listView.qml index 103c4d2eb6..103c4d2eb6 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_listView.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_listView.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_package.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_package.qml index b47f22dc34..b47f22dc34 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_package.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_package.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml index bc619124fd..bc619124fd 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_pathView.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml index e97e0dad2e..e97e0dad2e 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/itemsDestroyed_repeater.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/modelproperties.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties.qml index 73b766f1af..73b766f1af 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/modelproperties.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/modelproperties2.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties2.qml index ea5c240b29..ea5c240b29 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/modelproperties2.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/modelproperties2.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/objectlist.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/objectlist.qml index b3952a8a4d..b3952a8a4d 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/objectlist.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/objectlist.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/onChanged.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/onChanged.qml index 71dc7d72d7..71dc7d72d7 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/onChanged.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/onChanged.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/singlerole1.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole1.qml index c471893e1d..c471893e1d 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/singlerole1.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole1.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/singlerole2.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole2.qml index ab1798999d..ab1798999d 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/singlerole2.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/singlerole2.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/data/visualdatamodel.qml b/tests/auto/qtquick2/qquickvisualdatamodel/data/visualdatamodel.qml index 0d4d9e2e46..0d4d9e2e46 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/data/visualdatamodel.qml +++ b/tests/auto/qtquick2/qquickvisualdatamodel/data/visualdatamodel.qml diff --git a/tests/auto/declarative/qquickvisualdatamodel/qquickvisualdatamodel.pro b/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro index 35e627c1ad..8e87e10a97 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/qquickvisualdatamodel.pro +++ b/tests/auto/qtquick2/qquickvisualdatamodel/qquickvisualdatamodel.pro @@ -10,4 +10,4 @@ DEPLOYMENT += testDataFiles CONFIG += parallel_test -QT += core-private gui-private v8-private declarative-private widgets testlib +QT += core-private gui-private v8-private declarative-private quick-private widgets testlib diff --git a/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp index 0278b0cf2c..f0e6228d29 100644 --- a/tests/auto/declarative/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp +++ b/tests/auto/qtquick2/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../shared/util.h" +#include "../../shared/util.h" #include <qtest.h> #include <QtTest/QSignalSpy> #include <QStandardItemModel> @@ -46,10 +46,10 @@ #include <QtDeclarative/qdeclarativecomponent.h> #include <QtDeclarative/qdeclarativecontext.h> #include <QtDeclarative/qdeclarativeexpression.h> -#include <QtDeclarative/qquickview.h> +#include <QtQuick/qquickview.h> #include <private/qquicklistview_p.h> -#include <private/qquicktext_p.h> -#include <private/qquickvisualdatamodel_p.h> +#include <QtQuick/private/qquicktext_p.h> +#include <QtQuick/private/qquickvisualdatamodel_p.h> #include <private/qdeclarativevaluetype_p.h> #include <private/qdeclarativechangeset_p.h> #include <private/qdeclarativeengine_p.h> diff --git a/tests/auto/qtquick2/qtquick2.pro b/tests/auto/qtquick2/qtquick2.pro new file mode 100644 index 0000000000..af468a6393 --- /dev/null +++ b/tests/auto/qtquick2/qtquick2.pro @@ -0,0 +1,63 @@ +TEMPLATE = subdirs + +PUBLICTESTS += \ + examples \ + geometry \ + nodes \ + qdeclarativepixmapcache + +PRIVATETESTS += \ + qdeclarativeanimations \ + qdeclarativeapplication \ + qdeclarativebehaviors \ + qdeclarativefontloader \ + qdeclarativepath \ + qdeclarativesmoothedanimation \ + qdeclarativespringanimation \ + qdeclarativestyledtext \ + qdeclarativestates \ + qdeclarativesystempalette \ + qdeclarativetimer \ + qdeclarativexmllistmodel + +# This test requires the xmlpatterns module +!contains(QT_CONFIG,xmlpatterns):PRIVATETESTS -= qdeclarativexmllistmodel + +QUICKTESTS = \ + qquickanchors \ + qquickanimatedimage \ + qquickborderimage \ + qquickcanvas \ + qquickdrag \ + qquickdroparea \ + qquickflickable \ + qquickflipable \ + qquickfocusscope \ + qquickgridview \ + qquickimage \ + qquickitem \ + qquickitem2 \ + qquicklistview \ + qquickloader \ + qquickmousearea \ + qquickmultipointtoucharea \ + qquickpathview \ + qquickpincharea \ + qquickpositioners \ + qquickrepeater \ + qquickshadereffect \ + qquickspriteimage \ + qquicktext \ + qquicktextedit \ + qquicktextinput \ + qquickvisualdatamodel \ + qquickview \ + qquickcanvasitem \ + + +SUBDIRS += $$PUBLICTESTS + +contains(QT_CONFIG, private_tests) { + SUBDIRS += $$PRIVATETESTS + SUBDIRS += $$QUICKTESTS +} diff --git a/tests/auto/declarative/shared/testhttpserver.cpp b/tests/auto/shared/testhttpserver.cpp index 206094924c..206094924c 100644 --- a/tests/auto/declarative/shared/testhttpserver.cpp +++ b/tests/auto/shared/testhttpserver.cpp diff --git a/tests/auto/declarative/shared/testhttpserver.h b/tests/auto/shared/testhttpserver.h index 3e8f70fea4..3e8f70fea4 100644 --- a/tests/auto/declarative/shared/testhttpserver.h +++ b/tests/auto/shared/testhttpserver.h diff --git a/tests/auto/declarative/shared/util.h b/tests/auto/shared/util.h index eac2c4ec12..eac2c4ec12 100644 --- a/tests/auto/declarative/shared/util.h +++ b/tests/auto/shared/util.h diff --git a/tests/benchmarks/particles/affectors/affectors.pro b/tests/benchmarks/particles/affectors/affectors.pro index 4d1926da22..17b23255ac 100644 --- a/tests/benchmarks/particles/affectors/affectors.pro +++ b/tests/benchmarks/particles/affectors/affectors.pro @@ -7,4 +7,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib diff --git a/tests/benchmarks/particles/emission/emission.pro b/tests/benchmarks/particles/emission/emission.pro index 6e5e8ec019..343bdf0430 100644 --- a/tests/benchmarks/particles/emission/emission.pro +++ b/tests/benchmarks/particles/emission/emission.pro @@ -7,4 +7,4 @@ testDataFiles.files = data testDataFiles.path = . DEPLOYMENT += testDataFiles -QT += core-private gui-private v8-private declarative-private opengl-private testlib +QT += core-private gui-private v8-private declarative-private quick-private opengl-private testlib |