diff options
Diffstat (limited to 'doc/src/snippets')
-rw-r--r-- | doc/src/snippets/qml/Button.qml (renamed from doc/src/snippets/declarative/Button.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/SelfDestroyingRect.qml (renamed from doc/src/snippets/declarative/SelfDestroyingRect.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/Sprite.qml (renamed from doc/src/snippets/declarative/Sprite.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/anchoranimation.qml (renamed from doc/src/snippets/declarative/anchoranimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/anchorchanges.qml (renamed from doc/src/snippets/declarative/anchorchanges.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/animatedimage.qml (renamed from doc/src/snippets/declarative/animatedimage.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/animation.qml (renamed from doc/src/snippets/declarative/animation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/application.qml (renamed from doc/src/snippets/declarative/application.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/behavior.qml (renamed from doc/src/snippets/declarative/behavior.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/borderimage/borderimage-scaled.qml (renamed from doc/src/snippets/declarative/borderimage/borderimage-scaled.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/borderimage/borderimage-tiled.qml (renamed from doc/src/snippets/declarative/borderimage/borderimage-tiled.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/borderimage/normal-image.qml (renamed from doc/src/snippets/declarative/borderimage/normal-image.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/codingconventions/dotproperties.qml (renamed from doc/src/snippets/declarative/codingconventions/dotproperties.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/codingconventions/javascript-imports.qml (renamed from doc/src/snippets/declarative/codingconventions/javascript-imports.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/codingconventions/javascript.qml (renamed from doc/src/snippets/declarative/codingconventions/javascript.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/codingconventions/lists.qml (renamed from doc/src/snippets/declarative/codingconventions/lists.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/codingconventions/myscript.js (renamed from doc/src/snippets/declarative/codingconventions/myscript.js) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/codingconventions/photo.qml (renamed from doc/src/snippets/declarative/codingconventions/photo.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/codingconventions/private.qml (renamed from doc/src/snippets/declarative/codingconventions/private.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/coloranimation.qml (renamed from doc/src/snippets/declarative/coloranimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/colors.qml (renamed from doc/src/snippets/declarative/colors.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/column/column-transitions.qml (renamed from doc/src/snippets/declarative/column/column-transitions.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/column/column.qml (renamed from doc/src/snippets/declarative/column/column.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/column/vertical-positioner.qml (renamed from doc/src/snippets/declarative/column/vertical-positioner.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/comments.qml (renamed from doc/src/snippets/declarative/comments.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/component.qml (renamed from doc/src/snippets/declarative/component.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/componentCreation.js (renamed from doc/src/snippets/declarative/componentCreation.js) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/createComponent-simple.qml (renamed from doc/src/snippets/declarative/createComponent-simple.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/createComponent.qml (renamed from doc/src/snippets/declarative/createComponent.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/createQmlObject.qml (renamed from doc/src/snippets/declarative/createQmlObject.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/drag.qml (renamed from doc/src/snippets/declarative/drag.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/dynamicObjects-destroy.qml (renamed from doc/src/snippets/declarative/dynamicObjects-destroy.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/events.qml (renamed from doc/src/snippets/declarative/events.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/flickable.qml (renamed from doc/src/snippets/declarative/flickable.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/flickableScrollbar.qml (renamed from doc/src/snippets/declarative/flickableScrollbar.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/flipable/flipable.qml (renamed from doc/src/snippets/declarative/flipable/flipable.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/flow.qml (renamed from doc/src/snippets/declarative/flow.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/focus/MyClickableWidget.qml (renamed from doc/src/snippets/declarative/focus/MyClickableWidget.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/focus/MyWidget.qml (renamed from doc/src/snippets/declarative/focus/MyWidget.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/focus/advancedFocus.qml (renamed from doc/src/snippets/declarative/focus/advancedFocus.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/focus/basicwidget.qml (renamed from doc/src/snippets/declarative/focus/basicwidget.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/focus/clickablewidget.qml (renamed from doc/src/snippets/declarative/focus/clickablewidget.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/focus/myfocusscopewidget.qml (renamed from doc/src/snippets/declarative/focus/myfocusscopewidget.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/focus/rectangle.qml (renamed from doc/src/snippets/declarative/focus/rectangle.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/focus/widget.qml (renamed from doc/src/snippets/declarative/focus/widget.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/folderlistmodel.qml (renamed from doc/src/snippets/declarative/folderlistmodel.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/gradient.qml (renamed from doc/src/snippets/declarative/gradient.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/grid-spacing.qml (renamed from doc/src/snippets/declarative/grid-spacing.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/grid/grid-items.qml (renamed from doc/src/snippets/declarative/grid/grid-items.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/grid/grid-no-spacing.qml (renamed from doc/src/snippets/declarative/grid/grid-no-spacing.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/grid/grid-spacing.qml (renamed from doc/src/snippets/declarative/grid/grid-spacing.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/grid/grid.qml (renamed from doc/src/snippets/declarative/grid/grid.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/gridview/ContactModel.qml (renamed from doc/src/snippets/declarative/gridview/ContactModel.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/gridview/gridview.qml (renamed from doc/src/snippets/declarative/gridview/gridview.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/image.qml (renamed from doc/src/snippets/declarative/image.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/imports/chart.qml (renamed from doc/src/snippets/declarative/imports/chart.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/imports/installed-module.qml (renamed from doc/src/snippets/declarative/imports/installed-module.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/imports/merged-named-imports.qml (renamed from doc/src/snippets/declarative/imports/merged-named-imports.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/imports/named-imports.qml (renamed from doc/src/snippets/declarative/imports/named-imports.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/imports/network-imports.qml (renamed from doc/src/snippets/declarative/imports/network-imports.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/imports/qtquick-1.0.qml (renamed from doc/src/snippets/declarative/imports/qtquick-1.0.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/imports/timeexample.qml (renamed from doc/src/snippets/declarative/imports/timeexample.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/connectjs.qml (renamed from doc/src/snippets/declarative/integrating-javascript/connectjs.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/includejs/app.qml (renamed from doc/src/snippets/declarative/integrating-javascript/includejs/app.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/includejs/factorial.js (renamed from doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/includejs/script.js (renamed from doc/src/snippets/declarative/integrating-javascript/includejs/script.js) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/avatarExample.cpp (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/avatarExample.cpp) | 14 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/avatarExample.h (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/avatarExample.h) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFive.qml (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFive.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFour.js (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFour.js) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFour.qml (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFour.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/exampleOne.qml (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleOne.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/exampleThree.js (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleThree.js) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/exampleThree.qml (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleThree.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/scarceresources/exampleTwo.qml (renamed from doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleTwo.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/integrating-javascript/script.js (renamed from doc/src/snippets/declarative/integrating-javascript/script.js) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/keynavigation.qml (renamed from doc/src/snippets/declarative/keynavigation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/keys/keys-handler.qml (renamed from doc/src/snippets/declarative/keys/keys-handler.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/keys/keys-pressed.qml (renamed from doc/src/snippets/declarative/keys/keys-pressed.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/layoutmirroring.qml (renamed from doc/src/snippets/declarative/layoutmirroring.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listmodel-modify.qml (renamed from doc/src/snippets/declarative/listmodel-modify.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listmodel-nested.qml (renamed from doc/src/snippets/declarative/listmodel-nested.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listmodel-simple.qml (renamed from doc/src/snippets/declarative/listmodel-simple.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listmodel.qml (renamed from doc/src/snippets/declarative/listmodel.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listview-decorations.qml (renamed from doc/src/snippets/declarative/listview-decorations.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listview-sections.qml (renamed from doc/src/snippets/declarative/listview-sections.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listview.qml (renamed from doc/src/snippets/declarative/listview.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listview/ContactModel.qml (renamed from doc/src/snippets/declarative/listview/ContactModel.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listview/listview-snippet.qml (renamed from doc/src/snippets/declarative/listview/listview-snippet.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/listview/listview.qml (renamed from doc/src/snippets/declarative/listview/listview.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/loader/KeyReader.qml (renamed from doc/src/snippets/declarative/loader/KeyReader.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/loader/MyItem.qml (renamed from doc/src/snippets/declarative/loader/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/loader/connections.qml (renamed from doc/src/snippets/declarative/loader/connections.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/loader/focus.qml (renamed from doc/src/snippets/declarative/loader/focus.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/loader/simple.qml (renamed from doc/src/snippets/declarative/loader/simple.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/loader/sizeitem.qml (renamed from doc/src/snippets/declarative/loader/sizeitem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/loader/sizeloader.qml (renamed from doc/src/snippets/declarative/loader/sizeloader.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/models/views-models-delegates.qml (renamed from doc/src/snippets/declarative/models/views-models-delegates.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/models/visual-model-and-view.qml (renamed from doc/src/snippets/declarative/models/visual-model-and-view.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/mousearea/mousearea-snippet.qml (renamed from doc/src/snippets/declarative/mousearea/mousearea-snippet.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/mousearea/mousearea.qml (renamed from doc/src/snippets/declarative/mousearea/mousearea.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/mousearea/mouseareadragfilter.qml (renamed from doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/multipointtoucharea/multipointtoucharea.qml (renamed from doc/src/snippets/declarative/multipointtoucharea/multipointtoucharea.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/numberanimation.qml (renamed from doc/src/snippets/declarative/numberanimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/parallelanimation.qml (renamed from doc/src/snippets/declarative/parallelanimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/parentanimation.qml (renamed from doc/src/snippets/declarative/parentanimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/parentchange.qml (renamed from doc/src/snippets/declarative/parentchange.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/path/arcdirection.qml (renamed from doc/src/snippets/declarative/path/arcdirection.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/path/arcradius.qml (renamed from doc/src/snippets/declarative/path/arcradius.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/path/basicarc.qml (renamed from doc/src/snippets/declarative/path/basicarc.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/path/basiccurve.qml (renamed from doc/src/snippets/declarative/path/basiccurve.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/path/largearc.qml (renamed from doc/src/snippets/declarative/path/largearc.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/pathinterpolator.qml (renamed from doc/src/snippets/declarative/pathinterpolator.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/pathview/ContactModel.qml (renamed from doc/src/snippets/declarative/pathview/ContactModel.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/pathview/pathattributes.qml (renamed from doc/src/snippets/declarative/pathview/pathattributes.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/pathview/pathview.qml (renamed from doc/src/snippets/declarative/pathview/pathview.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/properties.qml (renamed from doc/src/snippets/declarative/properties.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/propertyaction-sequential.qml (renamed from doc/src/snippets/declarative/propertyaction-sequential.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/propertyaction.qml (renamed from doc/src/snippets/declarative/propertyaction.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/propertyanimation.qml (renamed from doc/src/snippets/declarative/propertyanimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/propertychanges.qml (renamed from doc/src/snippets/declarative/propertychanges.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qml-data-models/dynamic-listmodel.qml (renamed from doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qml-data-models/listelements.qml (renamed from doc/src/snippets/declarative/qml-data-models/listelements.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qml-data-models/listmodel-listview.qml (renamed from doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qml-documents/inline-component.qml (renamed from doc/src/snippets/declarative/qml-documents/inline-component.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qml-documents/inline-text-component.qml (renamed from doc/src/snippets/declarative/qml-documents/inline-text-component.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qml-documents/non-trivial.qml (renamed from doc/src/snippets/declarative/qml-documents/non-trivial.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qml-documents/qmldocuments.qml (renamed from doc/src/snippets/declarative/qml-documents/qmldocuments.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qml-intro/images/qt-logo.svg (renamed from doc/src/snippets/declarative/qml-intro/images/qt-logo.svg) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/context-advanced/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/context-advanced/applicationdata.h (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/context-advanced/connections.qml (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/context-advanced/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp) | 4 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/context/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/context/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/context/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/context/main.cpp) | 4 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/enums/imageviewer.h (renamed from doc/src/snippets/declarative/qtbinding/enums/imageviewer.h) | 6 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/enums/standalone.qml (renamed from doc/src/snippets/declarative/qtbinding/enums/standalone.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/functions-cpp/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/functions-cpp/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp) | 4 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/functions-cpp/myclass.h (renamed from doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/functions-qml/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/functions-qml/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp) | 6 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/loading/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/loading/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/loading/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/loading/main.cpp) | 28 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/newelements/imageviewer.h (renamed from doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h) | 4 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/newelements/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/newelements/main.cpp) | 4 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/newelements/standalone.qml (renamed from doc/src/snippets/declarative/qtbinding/newelements/standalone.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/properties-cpp/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/properties-cpp/applicationdata.h (renamed from doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/properties-qml/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/properties-qml/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp) | 10 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/resources/example.qrc (renamed from doc/src/snippets/declarative/qtbinding/resources/example.qrc) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/resources/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/resources/main.cpp) | 6 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/resources/main.qml (renamed from doc/src/snippets/declarative/qtbinding/resources/main.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/resources/resources.pro (renamed from doc/src/snippets/declarative/qtbinding/resources/resources.pro) | 2 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/signals-cpp/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/signals-cpp/imageviewer.h (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h) | 6 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/signals-cpp/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp) | 10 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/signals-cpp/standalone.qml (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/signals-qml/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/signals-qml/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp) | 4 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/signals-qml/myclass.h (renamed from doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/variantlistmap/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtbinding/variantlistmap/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp) | 4 | ||||
-rw-r--r-- | doc/src/snippets/qml/qtobject.qml (renamed from doc/src/snippets/declarative/qtobject.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/rectangle/rect-border-width.qml (renamed from doc/src/snippets/declarative/rectangle/rect-border-width.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/rectangle/rectangle-colors.qml (renamed from doc/src/snippets/declarative/rectangle/rectangle-colors.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/rectangle/rectangle-gradient.qml (renamed from doc/src/snippets/declarative/rectangle/rectangle-gradient.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/rectangle/rectangle.qml (renamed from doc/src/snippets/declarative/rectangle/rectangle.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/repeaters/repeater-grid-index.qml (renamed from doc/src/snippets/declarative/repeaters/repeater-grid-index.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/repeaters/repeater.qml (renamed from doc/src/snippets/declarative/repeaters/repeater.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/reusablecomponents/Button.qml (renamed from doc/src/snippets/declarative/reusablecomponents/Button.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/reusablecomponents/application.qml (renamed from doc/src/snippets/declarative/reusablecomponents/application.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/reusablecomponents/component.qml (renamed from doc/src/snippets/declarative/reusablecomponents/component.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/reusablecomponents/focusbutton.qml (renamed from doc/src/snippets/declarative/reusablecomponents/focusbutton.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/reusablecomponents/qmldir (renamed from doc/src/snippets/declarative/reusablecomponents/qmldir) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/righttoleft.qml (renamed from doc/src/snippets/declarative/righttoleft.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/righttoleft/Child.qml (renamed from doc/src/snippets/declarative/righttoleft/Child.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/rotation.qml (renamed from doc/src/snippets/declarative/rotation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/rotationanimation.qml (renamed from doc/src/snippets/declarative/rotationanimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/row.qml (renamed from doc/src/snippets/declarative/row.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/row/row.qml (renamed from doc/src/snippets/declarative/row/row.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/script.js (renamed from doc/src/snippets/declarative/script.js) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/sequentialanimation.qml (renamed from doc/src/snippets/declarative/sequentialanimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/smoothedanimation.qml (renamed from doc/src/snippets/declarative/smoothedanimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/springanimation.qml (renamed from doc/src/snippets/declarative/springanimation.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/state-when.qml (renamed from doc/src/snippets/declarative/state-when.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/state.qml (renamed from doc/src/snippets/declarative/state.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/states.qml (renamed from doc/src/snippets/declarative/states.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/states/statechangescript.qml (renamed from doc/src/snippets/declarative/states/statechangescript.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/systempalette.qml (renamed from doc/src/snippets/declarative/systempalette.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/text/onLinkActivated.qml (renamed from doc/src/snippets/declarative/text/onLinkActivated.qml) | 2 | ||||
-rw-r--r-- | doc/src/snippets/qml/texthandling.qml (renamed from doc/src/snippets/declarative/texthandling.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/transition-from-to-modified.qml (renamed from doc/src/snippets/declarative/transition-from-to-modified.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/transition-from-to.qml (renamed from doc/src/snippets/declarative/transition-from-to.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/transition-reversible.qml (renamed from doc/src/snippets/declarative/transition-reversible.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/transition.qml (renamed from doc/src/snippets/declarative/transition.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/transitions-list.qml (renamed from doc/src/snippets/declarative/transitions-list.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/viewtransitions/viewtransitions-basic.qml (renamed from doc/src/snippets/declarative/viewtransitions/viewtransitions-basic.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/viewtransitions/viewtransitions-delayedbyindex.qml (renamed from doc/src/snippets/declarative/viewtransitions/viewtransitions-delayedbyindex.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/viewtransitions/viewtransitions-intermediatemove.qml (renamed from doc/src/snippets/declarative/viewtransitions/viewtransitions-intermediatemove.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/viewtransitions/viewtransitions-interruptedgood.qml (renamed from doc/src/snippets/declarative/viewtransitions/viewtransitions-interruptedgood.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/viewtransitions/viewtransitions-pathanim.qml (renamed from doc/src/snippets/declarative/viewtransitions/viewtransitions-pathanim.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactionbad.qml (renamed from doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactionbad.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactiongood.qml (renamed from doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactiongood.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/visualdatagroup.qml (renamed from doc/src/snippets/declarative/visualdatagroup.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/visualdatamodel.qml (renamed from doc/src/snippets/declarative/visualdatamodel.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/visualdatamodel_rootindex/main.cpp (renamed from doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp) | 8 | ||||
-rw-r--r-- | doc/src/snippets/qml/visualdatamodel_rootindex/view.qml (renamed from doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/workerscript.qml (renamed from doc/src/snippets/declarative/workerscript.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/xmlrole.qml (renamed from doc/src/snippets/declarative/xmlrole.qml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qml/xmlrole.xml (renamed from doc/src/snippets/declarative/xmlrole.xml) | 0 | ||||
-rw-r--r-- | doc/src/snippets/qtjavascript/evaluation/main.cpp | 2 | ||||
-rw-r--r-- | doc/src/snippets/qtjavascript/registeringobjects/main.cpp | 2 | ||||
-rw-r--r-- | doc/src/snippets/qtjavascript/registeringvalues/main.cpp | 2 |
215 files changed, 66 insertions, 66 deletions
diff --git a/doc/src/snippets/declarative/Button.qml b/doc/src/snippets/qml/Button.qml index 0525ac1383..0525ac1383 100644 --- a/doc/src/snippets/declarative/Button.qml +++ b/doc/src/snippets/qml/Button.qml diff --git a/doc/src/snippets/declarative/SelfDestroyingRect.qml b/doc/src/snippets/qml/SelfDestroyingRect.qml index baa4ab63a1..baa4ab63a1 100644 --- a/doc/src/snippets/declarative/SelfDestroyingRect.qml +++ b/doc/src/snippets/qml/SelfDestroyingRect.qml diff --git a/doc/src/snippets/declarative/Sprite.qml b/doc/src/snippets/qml/Sprite.qml index ec08963be5..ec08963be5 100644 --- a/doc/src/snippets/declarative/Sprite.qml +++ b/doc/src/snippets/qml/Sprite.qml diff --git a/doc/src/snippets/declarative/anchoranimation.qml b/doc/src/snippets/qml/anchoranimation.qml index 8f0603fab8..8f0603fab8 100644 --- a/doc/src/snippets/declarative/anchoranimation.qml +++ b/doc/src/snippets/qml/anchoranimation.qml diff --git a/doc/src/snippets/declarative/anchorchanges.qml b/doc/src/snippets/qml/anchorchanges.qml index 9cc9d15221..9cc9d15221 100644 --- a/doc/src/snippets/declarative/anchorchanges.qml +++ b/doc/src/snippets/qml/anchorchanges.qml diff --git a/doc/src/snippets/declarative/animatedimage.qml b/doc/src/snippets/qml/animatedimage.qml index a483619e11..a483619e11 100644 --- a/doc/src/snippets/declarative/animatedimage.qml +++ b/doc/src/snippets/qml/animatedimage.qml diff --git a/doc/src/snippets/declarative/animation.qml b/doc/src/snippets/qml/animation.qml index d45ded397f..d45ded397f 100644 --- a/doc/src/snippets/declarative/animation.qml +++ b/doc/src/snippets/qml/animation.qml diff --git a/doc/src/snippets/declarative/application.qml b/doc/src/snippets/qml/application.qml index 4e847176fa..4e847176fa 100644 --- a/doc/src/snippets/declarative/application.qml +++ b/doc/src/snippets/qml/application.qml diff --git a/doc/src/snippets/declarative/behavior.qml b/doc/src/snippets/qml/behavior.qml index 4776e09a54..4776e09a54 100644 --- a/doc/src/snippets/declarative/behavior.qml +++ b/doc/src/snippets/qml/behavior.qml diff --git a/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml b/doc/src/snippets/qml/borderimage/borderimage-scaled.qml index 468aa24eab..468aa24eab 100644 --- a/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml +++ b/doc/src/snippets/qml/borderimage/borderimage-scaled.qml diff --git a/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml b/doc/src/snippets/qml/borderimage/borderimage-tiled.qml index 69297378bf..69297378bf 100644 --- a/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml +++ b/doc/src/snippets/qml/borderimage/borderimage-tiled.qml diff --git a/doc/src/snippets/declarative/borderimage/normal-image.qml b/doc/src/snippets/qml/borderimage/normal-image.qml index 3bd34e3933..3bd34e3933 100644 --- a/doc/src/snippets/declarative/borderimage/normal-image.qml +++ b/doc/src/snippets/qml/borderimage/normal-image.qml diff --git a/doc/src/snippets/declarative/codingconventions/dotproperties.qml b/doc/src/snippets/qml/codingconventions/dotproperties.qml index 75f4629b3e..75f4629b3e 100644 --- a/doc/src/snippets/declarative/codingconventions/dotproperties.qml +++ b/doc/src/snippets/qml/codingconventions/dotproperties.qml diff --git a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml b/doc/src/snippets/qml/codingconventions/javascript-imports.qml index 5ea66a9b1f..5ea66a9b1f 100644 --- a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml +++ b/doc/src/snippets/qml/codingconventions/javascript-imports.qml diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/doc/src/snippets/qml/codingconventions/javascript.qml index de3cc21493..de3cc21493 100644 --- a/doc/src/snippets/declarative/codingconventions/javascript.qml +++ b/doc/src/snippets/qml/codingconventions/javascript.qml diff --git a/doc/src/snippets/declarative/codingconventions/lists.qml b/doc/src/snippets/qml/codingconventions/lists.qml index f99c92b08e..f99c92b08e 100644 --- a/doc/src/snippets/declarative/codingconventions/lists.qml +++ b/doc/src/snippets/qml/codingconventions/lists.qml diff --git a/doc/src/snippets/declarative/codingconventions/myscript.js b/doc/src/snippets/qml/codingconventions/myscript.js index e7f83c259c..e7f83c259c 100644 --- a/doc/src/snippets/declarative/codingconventions/myscript.js +++ b/doc/src/snippets/qml/codingconventions/myscript.js diff --git a/doc/src/snippets/declarative/codingconventions/photo.qml b/doc/src/snippets/qml/codingconventions/photo.qml index 1bd2811e9f..1bd2811e9f 100644 --- a/doc/src/snippets/declarative/codingconventions/photo.qml +++ b/doc/src/snippets/qml/codingconventions/photo.qml diff --git a/doc/src/snippets/declarative/codingconventions/private.qml b/doc/src/snippets/qml/codingconventions/private.qml index 9aba1d0377..9aba1d0377 100644 --- a/doc/src/snippets/declarative/codingconventions/private.qml +++ b/doc/src/snippets/qml/codingconventions/private.qml diff --git a/doc/src/snippets/declarative/coloranimation.qml b/doc/src/snippets/qml/coloranimation.qml index bb2d83bfb8..bb2d83bfb8 100644 --- a/doc/src/snippets/declarative/coloranimation.qml +++ b/doc/src/snippets/qml/coloranimation.qml diff --git a/doc/src/snippets/declarative/colors.qml b/doc/src/snippets/qml/colors.qml index 7f94c6b843..7f94c6b843 100644 --- a/doc/src/snippets/declarative/colors.qml +++ b/doc/src/snippets/qml/colors.qml diff --git a/doc/src/snippets/declarative/column/column-transitions.qml b/doc/src/snippets/qml/column/column-transitions.qml index 8e291b12c8..8e291b12c8 100644 --- a/doc/src/snippets/declarative/column/column-transitions.qml +++ b/doc/src/snippets/qml/column/column-transitions.qml diff --git a/doc/src/snippets/declarative/column/column.qml b/doc/src/snippets/qml/column/column.qml index 3d51728d13..3d51728d13 100644 --- a/doc/src/snippets/declarative/column/column.qml +++ b/doc/src/snippets/qml/column/column.qml diff --git a/doc/src/snippets/declarative/column/vertical-positioner.qml b/doc/src/snippets/qml/column/vertical-positioner.qml index 1661c46ba8..1661c46ba8 100644 --- a/doc/src/snippets/declarative/column/vertical-positioner.qml +++ b/doc/src/snippets/qml/column/vertical-positioner.qml diff --git a/doc/src/snippets/declarative/comments.qml b/doc/src/snippets/qml/comments.qml index 8c3f0045b9..8c3f0045b9 100644 --- a/doc/src/snippets/declarative/comments.qml +++ b/doc/src/snippets/qml/comments.qml diff --git a/doc/src/snippets/declarative/component.qml b/doc/src/snippets/qml/component.qml index e2a359e0e4..e2a359e0e4 100644 --- a/doc/src/snippets/declarative/component.qml +++ b/doc/src/snippets/qml/component.qml diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/qml/componentCreation.js index 7364139d3d..7364139d3d 100644 --- a/doc/src/snippets/declarative/componentCreation.js +++ b/doc/src/snippets/qml/componentCreation.js diff --git a/doc/src/snippets/declarative/createComponent-simple.qml b/doc/src/snippets/qml/createComponent-simple.qml index 3f90a39166..3f90a39166 100644 --- a/doc/src/snippets/declarative/createComponent-simple.qml +++ b/doc/src/snippets/qml/createComponent-simple.qml diff --git a/doc/src/snippets/declarative/createComponent.qml b/doc/src/snippets/qml/createComponent.qml index e2d81170e4..e2d81170e4 100644 --- a/doc/src/snippets/declarative/createComponent.qml +++ b/doc/src/snippets/qml/createComponent.qml diff --git a/doc/src/snippets/declarative/createQmlObject.qml b/doc/src/snippets/qml/createQmlObject.qml index 76cf836914..76cf836914 100644 --- a/doc/src/snippets/declarative/createQmlObject.qml +++ b/doc/src/snippets/qml/createQmlObject.qml diff --git a/doc/src/snippets/declarative/drag.qml b/doc/src/snippets/qml/drag.qml index 286fcfc52b..286fcfc52b 100644 --- a/doc/src/snippets/declarative/drag.qml +++ b/doc/src/snippets/qml/drag.qml diff --git a/doc/src/snippets/declarative/dynamicObjects-destroy.qml b/doc/src/snippets/qml/dynamicObjects-destroy.qml index 66fbc0b243..66fbc0b243 100644 --- a/doc/src/snippets/declarative/dynamicObjects-destroy.qml +++ b/doc/src/snippets/qml/dynamicObjects-destroy.qml diff --git a/doc/src/snippets/declarative/events.qml b/doc/src/snippets/qml/events.qml index b9c5fef954..b9c5fef954 100644 --- a/doc/src/snippets/declarative/events.qml +++ b/doc/src/snippets/qml/events.qml diff --git a/doc/src/snippets/declarative/flickable.qml b/doc/src/snippets/qml/flickable.qml index fda2615e14..fda2615e14 100644 --- a/doc/src/snippets/declarative/flickable.qml +++ b/doc/src/snippets/qml/flickable.qml diff --git a/doc/src/snippets/declarative/flickableScrollbar.qml b/doc/src/snippets/qml/flickableScrollbar.qml index fd0aee3fc1..fd0aee3fc1 100644 --- a/doc/src/snippets/declarative/flickableScrollbar.qml +++ b/doc/src/snippets/qml/flickableScrollbar.qml diff --git a/doc/src/snippets/declarative/flipable/flipable.qml b/doc/src/snippets/qml/flipable/flipable.qml index 4e451204d4..4e451204d4 100644 --- a/doc/src/snippets/declarative/flipable/flipable.qml +++ b/doc/src/snippets/qml/flipable/flipable.qml diff --git a/doc/src/snippets/declarative/flow.qml b/doc/src/snippets/qml/flow.qml index 1141269986..1141269986 100644 --- a/doc/src/snippets/declarative/flow.qml +++ b/doc/src/snippets/qml/flow.qml diff --git a/doc/src/snippets/declarative/focus/MyClickableWidget.qml b/doc/src/snippets/qml/focus/MyClickableWidget.qml index 7017f1bcb6..7017f1bcb6 100644 --- a/doc/src/snippets/declarative/focus/MyClickableWidget.qml +++ b/doc/src/snippets/qml/focus/MyClickableWidget.qml diff --git a/doc/src/snippets/declarative/focus/MyWidget.qml b/doc/src/snippets/qml/focus/MyWidget.qml index 5899b18ae0..5899b18ae0 100644 --- a/doc/src/snippets/declarative/focus/MyWidget.qml +++ b/doc/src/snippets/qml/focus/MyWidget.qml diff --git a/doc/src/snippets/declarative/focus/advancedFocus.qml b/doc/src/snippets/qml/focus/advancedFocus.qml index ec4efca450..ec4efca450 100644 --- a/doc/src/snippets/declarative/focus/advancedFocus.qml +++ b/doc/src/snippets/qml/focus/advancedFocus.qml diff --git a/doc/src/snippets/declarative/focus/basicwidget.qml b/doc/src/snippets/qml/focus/basicwidget.qml index bd5778948a..bd5778948a 100644 --- a/doc/src/snippets/declarative/focus/basicwidget.qml +++ b/doc/src/snippets/qml/focus/basicwidget.qml diff --git a/doc/src/snippets/declarative/focus/clickablewidget.qml b/doc/src/snippets/qml/focus/clickablewidget.qml index 81bd5f7e51..81bd5f7e51 100644 --- a/doc/src/snippets/declarative/focus/clickablewidget.qml +++ b/doc/src/snippets/qml/focus/clickablewidget.qml diff --git a/doc/src/snippets/declarative/focus/myfocusscopewidget.qml b/doc/src/snippets/qml/focus/myfocusscopewidget.qml index f568c39a32..f568c39a32 100644 --- a/doc/src/snippets/declarative/focus/myfocusscopewidget.qml +++ b/doc/src/snippets/qml/focus/myfocusscopewidget.qml diff --git a/doc/src/snippets/declarative/focus/rectangle.qml b/doc/src/snippets/qml/focus/rectangle.qml index cb00f1f11a..cb00f1f11a 100644 --- a/doc/src/snippets/declarative/focus/rectangle.qml +++ b/doc/src/snippets/qml/focus/rectangle.qml diff --git a/doc/src/snippets/declarative/focus/widget.qml b/doc/src/snippets/qml/focus/widget.qml index 5ee8a71846..5ee8a71846 100644 --- a/doc/src/snippets/declarative/focus/widget.qml +++ b/doc/src/snippets/qml/focus/widget.qml diff --git a/doc/src/snippets/declarative/folderlistmodel.qml b/doc/src/snippets/qml/folderlistmodel.qml index 5878640567..5878640567 100644 --- a/doc/src/snippets/declarative/folderlistmodel.qml +++ b/doc/src/snippets/qml/folderlistmodel.qml diff --git a/doc/src/snippets/declarative/gradient.qml b/doc/src/snippets/qml/gradient.qml index a5af6a7930..a5af6a7930 100644 --- a/doc/src/snippets/declarative/gradient.qml +++ b/doc/src/snippets/qml/gradient.qml diff --git a/doc/src/snippets/declarative/grid-spacing.qml b/doc/src/snippets/qml/grid-spacing.qml index 1385492ac6..1385492ac6 100644 --- a/doc/src/snippets/declarative/grid-spacing.qml +++ b/doc/src/snippets/qml/grid-spacing.qml diff --git a/doc/src/snippets/declarative/grid/grid-items.qml b/doc/src/snippets/qml/grid/grid-items.qml index 8afb170f75..8afb170f75 100644 --- a/doc/src/snippets/declarative/grid/grid-items.qml +++ b/doc/src/snippets/qml/grid/grid-items.qml diff --git a/doc/src/snippets/declarative/grid/grid-no-spacing.qml b/doc/src/snippets/qml/grid/grid-no-spacing.qml index c44eadce63..c44eadce63 100644 --- a/doc/src/snippets/declarative/grid/grid-no-spacing.qml +++ b/doc/src/snippets/qml/grid/grid-no-spacing.qml diff --git a/doc/src/snippets/declarative/grid/grid-spacing.qml b/doc/src/snippets/qml/grid/grid-spacing.qml index 1385492ac6..1385492ac6 100644 --- a/doc/src/snippets/declarative/grid/grid-spacing.qml +++ b/doc/src/snippets/qml/grid/grid-spacing.qml diff --git a/doc/src/snippets/declarative/grid/grid.qml b/doc/src/snippets/qml/grid/grid.qml index 7fb1bb6f5a..7fb1bb6f5a 100644 --- a/doc/src/snippets/declarative/grid/grid.qml +++ b/doc/src/snippets/qml/grid/grid.qml diff --git a/doc/src/snippets/declarative/gridview/ContactModel.qml b/doc/src/snippets/qml/gridview/ContactModel.qml index f744c1e73f..f744c1e73f 100644 --- a/doc/src/snippets/declarative/gridview/ContactModel.qml +++ b/doc/src/snippets/qml/gridview/ContactModel.qml diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/qml/gridview/gridview.qml index d3b37d1338..d3b37d1338 100644 --- a/doc/src/snippets/declarative/gridview/gridview.qml +++ b/doc/src/snippets/qml/gridview/gridview.qml diff --git a/doc/src/snippets/declarative/image.qml b/doc/src/snippets/qml/image.qml index 61724ffeea..61724ffeea 100644 --- a/doc/src/snippets/declarative/image.qml +++ b/doc/src/snippets/qml/image.qml diff --git a/doc/src/snippets/declarative/imports/chart.qml b/doc/src/snippets/qml/imports/chart.qml index d5a2d3bf45..d5a2d3bf45 100644 --- a/doc/src/snippets/declarative/imports/chart.qml +++ b/doc/src/snippets/qml/imports/chart.qml diff --git a/doc/src/snippets/declarative/imports/installed-module.qml b/doc/src/snippets/qml/imports/installed-module.qml index c263ea89ed..c263ea89ed 100644 --- a/doc/src/snippets/declarative/imports/installed-module.qml +++ b/doc/src/snippets/qml/imports/installed-module.qml diff --git a/doc/src/snippets/declarative/imports/merged-named-imports.qml b/doc/src/snippets/qml/imports/merged-named-imports.qml index a75687c740..a75687c740 100644 --- a/doc/src/snippets/declarative/imports/merged-named-imports.qml +++ b/doc/src/snippets/qml/imports/merged-named-imports.qml diff --git a/doc/src/snippets/declarative/imports/named-imports.qml b/doc/src/snippets/qml/imports/named-imports.qml index 125e6cfa27..125e6cfa27 100644 --- a/doc/src/snippets/declarative/imports/named-imports.qml +++ b/doc/src/snippets/qml/imports/named-imports.qml diff --git a/doc/src/snippets/declarative/imports/network-imports.qml b/doc/src/snippets/qml/imports/network-imports.qml index f039c44f1e..f039c44f1e 100644 --- a/doc/src/snippets/declarative/imports/network-imports.qml +++ b/doc/src/snippets/qml/imports/network-imports.qml diff --git a/doc/src/snippets/declarative/imports/qtquick-1.0.qml b/doc/src/snippets/qml/imports/qtquick-1.0.qml index 481bc12e7e..481bc12e7e 100644 --- a/doc/src/snippets/declarative/imports/qtquick-1.0.qml +++ b/doc/src/snippets/qml/imports/qtquick-1.0.qml diff --git a/doc/src/snippets/declarative/imports/timeexample.qml b/doc/src/snippets/qml/imports/timeexample.qml index 4d79dbe15e..4d79dbe15e 100644 --- a/doc/src/snippets/declarative/imports/timeexample.qml +++ b/doc/src/snippets/qml/imports/timeexample.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/connectjs.qml b/doc/src/snippets/qml/integrating-javascript/connectjs.qml index 89c9ebc21a..89c9ebc21a 100644 --- a/doc/src/snippets/declarative/integrating-javascript/connectjs.qml +++ b/doc/src/snippets/qml/integrating-javascript/connectjs.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml b/doc/src/snippets/qml/integrating-javascript/includejs/app.qml index 0dd7b533a6..0dd7b533a6 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml +++ b/doc/src/snippets/qml/integrating-javascript/includejs/app.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js b/doc/src/snippets/qml/integrating-javascript/includejs/factorial.js index a7bc4ac69f..a7bc4ac69f 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js +++ b/doc/src/snippets/qml/integrating-javascript/includejs/factorial.js diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/script.js b/doc/src/snippets/qml/integrating-javascript/includejs/script.js index 964b2f5e8a..964b2f5e8a 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/script.js +++ b/doc/src/snippets/qml/integrating-javascript/includejs/script.js diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/avatarExample.cpp b/doc/src/snippets/qml/integrating-javascript/scarceresources/avatarExample.cpp index 8825cca4bb..e018a68292 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/avatarExample.cpp +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/avatarExample.cpp @@ -39,8 +39,8 @@ ****************************************************************************/ #include "avatarExample.h" -#include <QDeclarativeEngine> -#include <QDeclarativeComponent> +#include <QQmlEngine> +#include <QQmlComponent> void registerTypes() { @@ -52,7 +52,7 @@ void registerTypes() void expectOne() { //![1] -QDeclarativeComponent component(&engine, "exampleOne.qml"); +QQmlComponent component(&engine, "exampleOne.qml"); QObject *object = component.create(); // The scarce resource will have been released automatically // by this point, after the binding expression was evaluated. @@ -63,7 +63,7 @@ delete object; void expectTwo() { //![2] -QDeclarativeComponent component(&engine, "exampleTwo.qml"); +QQmlComponent component(&engine, "exampleTwo.qml"); QObject *object = component.create(); // The scarce resource will not have been released automatically // after the binding expression was evaluated. @@ -77,7 +77,7 @@ delete object; void expectThree() { //![3] -QDeclarativeComponent component(&engine, "exampleThree.qml"); +QQmlComponent component(&engine, "exampleThree.qml"); QObject *object = component.create(); // The resource was preserved explicitly during evaluation of the // JavaScript expression. Thus, during property assignment, the @@ -92,7 +92,7 @@ delete object; void expectFour() { //![4] -QDeclarativeComponent component(&engine, "exampleFour.qml"); +QQmlComponent component(&engine, "exampleFour.qml"); QObject *object = component.create(); // The scarce resource was explicitly preserved by the client during // the importAvatar() function, and so the scarce resource @@ -111,7 +111,7 @@ delete object; void expectFive() { //![5] -QDeclarativeComponent component(&engine, "exampleFive.qml"); +QQmlComponent component(&engine, "exampleFive.qml"); QObject *object = component.create(); // We have the expected results: bool expectedResultOne = (object->property("avatarOne").isValid() == false); diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/avatarExample.h b/doc/src/snippets/qml/integrating-javascript/scarceresources/avatarExample.h index d9fbff4fde..d9fbff4fde 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/avatarExample.h +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/avatarExample.h diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFive.qml b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFive.qml index 7cfab16a51..7cfab16a51 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFive.qml +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFive.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFour.js b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFour.js index d104e6f6c7..d104e6f6c7 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFour.js +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFour.js diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFour.qml b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFour.qml index f5811602dc..f5811602dc 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleFour.qml +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleFour.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleOne.qml b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleOne.qml index cf9b3ebc5d..cf9b3ebc5d 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleOne.qml +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleOne.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleThree.js b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleThree.js index 44df13f7a4..44df13f7a4 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleThree.js +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleThree.js diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleThree.qml b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleThree.qml index 3f12458cec..3f12458cec 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleThree.qml +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleThree.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleTwo.qml b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleTwo.qml index f322fb9ed9..f322fb9ed9 100644 --- a/doc/src/snippets/declarative/integrating-javascript/scarceresources/exampleTwo.qml +++ b/doc/src/snippets/qml/integrating-javascript/scarceresources/exampleTwo.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/script.js b/doc/src/snippets/qml/integrating-javascript/script.js index 006cf1aead..006cf1aead 100644 --- a/doc/src/snippets/declarative/integrating-javascript/script.js +++ b/doc/src/snippets/qml/integrating-javascript/script.js diff --git a/doc/src/snippets/declarative/keynavigation.qml b/doc/src/snippets/qml/keynavigation.qml index 4854ecd0ed..4854ecd0ed 100644 --- a/doc/src/snippets/declarative/keynavigation.qml +++ b/doc/src/snippets/qml/keynavigation.qml diff --git a/doc/src/snippets/declarative/keys/keys-handler.qml b/doc/src/snippets/qml/keys/keys-handler.qml index 21fc98e23d..21fc98e23d 100644 --- a/doc/src/snippets/declarative/keys/keys-handler.qml +++ b/doc/src/snippets/qml/keys/keys-handler.qml diff --git a/doc/src/snippets/declarative/keys/keys-pressed.qml b/doc/src/snippets/qml/keys/keys-pressed.qml index 3c9a2d9dce..3c9a2d9dce 100644 --- a/doc/src/snippets/declarative/keys/keys-pressed.qml +++ b/doc/src/snippets/qml/keys/keys-pressed.qml diff --git a/doc/src/snippets/declarative/layoutmirroring.qml b/doc/src/snippets/qml/layoutmirroring.qml index 5daf3f58b3..5daf3f58b3 100644 --- a/doc/src/snippets/declarative/layoutmirroring.qml +++ b/doc/src/snippets/qml/layoutmirroring.qml diff --git a/doc/src/snippets/declarative/listmodel-modify.qml b/doc/src/snippets/qml/listmodel-modify.qml index 308453b393..308453b393 100644 --- a/doc/src/snippets/declarative/listmodel-modify.qml +++ b/doc/src/snippets/qml/listmodel-modify.qml diff --git a/doc/src/snippets/declarative/listmodel-nested.qml b/doc/src/snippets/qml/listmodel-nested.qml index bac95608e1..bac95608e1 100644 --- a/doc/src/snippets/declarative/listmodel-nested.qml +++ b/doc/src/snippets/qml/listmodel-nested.qml diff --git a/doc/src/snippets/declarative/listmodel-simple.qml b/doc/src/snippets/qml/listmodel-simple.qml index e8c4cea68e..e8c4cea68e 100644 --- a/doc/src/snippets/declarative/listmodel-simple.qml +++ b/doc/src/snippets/qml/listmodel-simple.qml diff --git a/doc/src/snippets/declarative/listmodel.qml b/doc/src/snippets/qml/listmodel.qml index e93732e2ee..e93732e2ee 100644 --- a/doc/src/snippets/declarative/listmodel.qml +++ b/doc/src/snippets/qml/listmodel.qml diff --git a/doc/src/snippets/declarative/listview-decorations.qml b/doc/src/snippets/qml/listview-decorations.qml index ccd7023d9c..ccd7023d9c 100644 --- a/doc/src/snippets/declarative/listview-decorations.qml +++ b/doc/src/snippets/qml/listview-decorations.qml diff --git a/doc/src/snippets/declarative/listview-sections.qml b/doc/src/snippets/qml/listview-sections.qml index 59cfdf80bb..59cfdf80bb 100644 --- a/doc/src/snippets/declarative/listview-sections.qml +++ b/doc/src/snippets/qml/listview-sections.qml diff --git a/doc/src/snippets/declarative/listview.qml b/doc/src/snippets/qml/listview.qml index e8752a47cd..e8752a47cd 100644 --- a/doc/src/snippets/declarative/listview.qml +++ b/doc/src/snippets/qml/listview.qml diff --git a/doc/src/snippets/declarative/listview/ContactModel.qml b/doc/src/snippets/qml/listview/ContactModel.qml index 395c637b6a..395c637b6a 100644 --- a/doc/src/snippets/declarative/listview/ContactModel.qml +++ b/doc/src/snippets/qml/listview/ContactModel.qml diff --git a/doc/src/snippets/declarative/listview/listview-snippet.qml b/doc/src/snippets/qml/listview/listview-snippet.qml index 1458e9aa50..1458e9aa50 100644 --- a/doc/src/snippets/declarative/listview/listview-snippet.qml +++ b/doc/src/snippets/qml/listview/listview-snippet.qml diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/qml/listview/listview.qml index 689e6d2c45..689e6d2c45 100644 --- a/doc/src/snippets/declarative/listview/listview.qml +++ b/doc/src/snippets/qml/listview/listview.qml diff --git a/doc/src/snippets/declarative/loader/KeyReader.qml b/doc/src/snippets/qml/loader/KeyReader.qml index ef15a01bb1..ef15a01bb1 100644 --- a/doc/src/snippets/declarative/loader/KeyReader.qml +++ b/doc/src/snippets/qml/loader/KeyReader.qml diff --git a/doc/src/snippets/declarative/loader/MyItem.qml b/doc/src/snippets/qml/loader/MyItem.qml index 2879e7ae23..2879e7ae23 100644 --- a/doc/src/snippets/declarative/loader/MyItem.qml +++ b/doc/src/snippets/qml/loader/MyItem.qml diff --git a/doc/src/snippets/declarative/loader/connections.qml b/doc/src/snippets/qml/loader/connections.qml index 82d770b2cb..82d770b2cb 100644 --- a/doc/src/snippets/declarative/loader/connections.qml +++ b/doc/src/snippets/qml/loader/connections.qml diff --git a/doc/src/snippets/declarative/loader/focus.qml b/doc/src/snippets/qml/loader/focus.qml index 4447c62905..4447c62905 100644 --- a/doc/src/snippets/declarative/loader/focus.qml +++ b/doc/src/snippets/qml/loader/focus.qml diff --git a/doc/src/snippets/declarative/loader/simple.qml b/doc/src/snippets/qml/loader/simple.qml index a4408c2231..a4408c2231 100644 --- a/doc/src/snippets/declarative/loader/simple.qml +++ b/doc/src/snippets/qml/loader/simple.qml diff --git a/doc/src/snippets/declarative/loader/sizeitem.qml b/doc/src/snippets/qml/loader/sizeitem.qml index d673d82817..d673d82817 100644 --- a/doc/src/snippets/declarative/loader/sizeitem.qml +++ b/doc/src/snippets/qml/loader/sizeitem.qml diff --git a/doc/src/snippets/declarative/loader/sizeloader.qml b/doc/src/snippets/qml/loader/sizeloader.qml index 551324598c..551324598c 100644 --- a/doc/src/snippets/declarative/loader/sizeloader.qml +++ b/doc/src/snippets/qml/loader/sizeloader.qml diff --git a/doc/src/snippets/declarative/models/views-models-delegates.qml b/doc/src/snippets/qml/models/views-models-delegates.qml index e9f872578f..e9f872578f 100644 --- a/doc/src/snippets/declarative/models/views-models-delegates.qml +++ b/doc/src/snippets/qml/models/views-models-delegates.qml diff --git a/doc/src/snippets/declarative/models/visual-model-and-view.qml b/doc/src/snippets/qml/models/visual-model-and-view.qml index 97e443b675..97e443b675 100644 --- a/doc/src/snippets/declarative/models/visual-model-and-view.qml +++ b/doc/src/snippets/qml/models/visual-model-and-view.qml diff --git a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml b/doc/src/snippets/qml/mousearea/mousearea-snippet.qml index 237c0c31b0..237c0c31b0 100644 --- a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml +++ b/doc/src/snippets/qml/mousearea/mousearea-snippet.qml diff --git a/doc/src/snippets/declarative/mousearea/mousearea.qml b/doc/src/snippets/qml/mousearea/mousearea.qml index 1f35cd8b5f..1f35cd8b5f 100644 --- a/doc/src/snippets/declarative/mousearea/mousearea.qml +++ b/doc/src/snippets/qml/mousearea/mousearea.qml diff --git a/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml b/doc/src/snippets/qml/mousearea/mouseareadragfilter.qml index 922bfea636..922bfea636 100644 --- a/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml +++ b/doc/src/snippets/qml/mousearea/mouseareadragfilter.qml diff --git a/doc/src/snippets/declarative/multipointtoucharea/multipointtoucharea.qml b/doc/src/snippets/qml/multipointtoucharea/multipointtoucharea.qml index e4c2ffb039..e4c2ffb039 100644 --- a/doc/src/snippets/declarative/multipointtoucharea/multipointtoucharea.qml +++ b/doc/src/snippets/qml/multipointtoucharea/multipointtoucharea.qml diff --git a/doc/src/snippets/declarative/numberanimation.qml b/doc/src/snippets/qml/numberanimation.qml index 404381863d..404381863d 100644 --- a/doc/src/snippets/declarative/numberanimation.qml +++ b/doc/src/snippets/qml/numberanimation.qml diff --git a/doc/src/snippets/declarative/parallelanimation.qml b/doc/src/snippets/qml/parallelanimation.qml index 20f6ccc1df..20f6ccc1df 100644 --- a/doc/src/snippets/declarative/parallelanimation.qml +++ b/doc/src/snippets/qml/parallelanimation.qml diff --git a/doc/src/snippets/declarative/parentanimation.qml b/doc/src/snippets/qml/parentanimation.qml index 60429ed61c..60429ed61c 100644 --- a/doc/src/snippets/declarative/parentanimation.qml +++ b/doc/src/snippets/qml/parentanimation.qml diff --git a/doc/src/snippets/declarative/parentchange.qml b/doc/src/snippets/qml/parentchange.qml index 4ae4476e13..4ae4476e13 100644 --- a/doc/src/snippets/declarative/parentchange.qml +++ b/doc/src/snippets/qml/parentchange.qml diff --git a/doc/src/snippets/declarative/path/arcdirection.qml b/doc/src/snippets/qml/path/arcdirection.qml index 7522649607..7522649607 100644 --- a/doc/src/snippets/declarative/path/arcdirection.qml +++ b/doc/src/snippets/qml/path/arcdirection.qml diff --git a/doc/src/snippets/declarative/path/arcradius.qml b/doc/src/snippets/qml/path/arcradius.qml index 04f2919270..04f2919270 100644 --- a/doc/src/snippets/declarative/path/arcradius.qml +++ b/doc/src/snippets/qml/path/arcradius.qml diff --git a/doc/src/snippets/declarative/path/basicarc.qml b/doc/src/snippets/qml/path/basicarc.qml index 562f2a0adf..562f2a0adf 100644 --- a/doc/src/snippets/declarative/path/basicarc.qml +++ b/doc/src/snippets/qml/path/basicarc.qml diff --git a/doc/src/snippets/declarative/path/basiccurve.qml b/doc/src/snippets/qml/path/basiccurve.qml index feb783cb01..feb783cb01 100644 --- a/doc/src/snippets/declarative/path/basiccurve.qml +++ b/doc/src/snippets/qml/path/basiccurve.qml diff --git a/doc/src/snippets/declarative/path/largearc.qml b/doc/src/snippets/qml/path/largearc.qml index 69ce953c92..69ce953c92 100644 --- a/doc/src/snippets/declarative/path/largearc.qml +++ b/doc/src/snippets/qml/path/largearc.qml diff --git a/doc/src/snippets/declarative/pathinterpolator.qml b/doc/src/snippets/qml/pathinterpolator.qml index 77cc664e27..77cc664e27 100644 --- a/doc/src/snippets/declarative/pathinterpolator.qml +++ b/doc/src/snippets/qml/pathinterpolator.qml diff --git a/doc/src/snippets/declarative/pathview/ContactModel.qml b/doc/src/snippets/qml/pathview/ContactModel.qml index d191413f27..d191413f27 100644 --- a/doc/src/snippets/declarative/pathview/ContactModel.qml +++ b/doc/src/snippets/qml/pathview/ContactModel.qml diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/qml/pathview/pathattributes.qml index d555998650..d555998650 100644 --- a/doc/src/snippets/declarative/pathview/pathattributes.qml +++ b/doc/src/snippets/qml/pathview/pathattributes.qml diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/qml/pathview/pathview.qml index e5249d4cb6..e5249d4cb6 100644 --- a/doc/src/snippets/declarative/pathview/pathview.qml +++ b/doc/src/snippets/qml/pathview/pathview.qml diff --git a/doc/src/snippets/declarative/properties.qml b/doc/src/snippets/qml/properties.qml index 21894b68e0..21894b68e0 100644 --- a/doc/src/snippets/declarative/properties.qml +++ b/doc/src/snippets/qml/properties.qml diff --git a/doc/src/snippets/declarative/propertyaction-sequential.qml b/doc/src/snippets/qml/propertyaction-sequential.qml index 77d6ec194e..77d6ec194e 100644 --- a/doc/src/snippets/declarative/propertyaction-sequential.qml +++ b/doc/src/snippets/qml/propertyaction-sequential.qml diff --git a/doc/src/snippets/declarative/propertyaction.qml b/doc/src/snippets/qml/propertyaction.qml index 5ddef30177..5ddef30177 100644 --- a/doc/src/snippets/declarative/propertyaction.qml +++ b/doc/src/snippets/qml/propertyaction.qml diff --git a/doc/src/snippets/declarative/propertyanimation.qml b/doc/src/snippets/qml/propertyanimation.qml index b5781af94a..b5781af94a 100644 --- a/doc/src/snippets/declarative/propertyanimation.qml +++ b/doc/src/snippets/qml/propertyanimation.qml diff --git a/doc/src/snippets/declarative/propertychanges.qml b/doc/src/snippets/qml/propertychanges.qml index 3be13f7861..3be13f7861 100644 --- a/doc/src/snippets/declarative/propertychanges.qml +++ b/doc/src/snippets/qml/propertychanges.qml diff --git a/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml b/doc/src/snippets/qml/qml-data-models/dynamic-listmodel.qml index da9610c117..da9610c117 100644 --- a/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml +++ b/doc/src/snippets/qml/qml-data-models/dynamic-listmodel.qml diff --git a/doc/src/snippets/declarative/qml-data-models/listelements.qml b/doc/src/snippets/qml/qml-data-models/listelements.qml index 0097423142..0097423142 100644 --- a/doc/src/snippets/declarative/qml-data-models/listelements.qml +++ b/doc/src/snippets/qml/qml-data-models/listelements.qml diff --git a/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml b/doc/src/snippets/qml/qml-data-models/listmodel-listview.qml index 406fada2ce..406fada2ce 100644 --- a/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml +++ b/doc/src/snippets/qml/qml-data-models/listmodel-listview.qml diff --git a/doc/src/snippets/declarative/qml-documents/inline-component.qml b/doc/src/snippets/qml/qml-documents/inline-component.qml index 7e01ca369b..7e01ca369b 100644 --- a/doc/src/snippets/declarative/qml-documents/inline-component.qml +++ b/doc/src/snippets/qml/qml-documents/inline-component.qml diff --git a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml b/doc/src/snippets/qml/qml-documents/inline-text-component.qml index 2405585b43..2405585b43 100644 --- a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml +++ b/doc/src/snippets/qml/qml-documents/inline-text-component.qml diff --git a/doc/src/snippets/declarative/qml-documents/non-trivial.qml b/doc/src/snippets/qml/qml-documents/non-trivial.qml index bd1b94a3cc..bd1b94a3cc 100644 --- a/doc/src/snippets/declarative/qml-documents/non-trivial.qml +++ b/doc/src/snippets/qml/qml-documents/non-trivial.qml diff --git a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml b/doc/src/snippets/qml/qml-documents/qmldocuments.qml index cf60741f0c..cf60741f0c 100644 --- a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml +++ b/doc/src/snippets/qml/qml-documents/qmldocuments.qml diff --git a/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg b/doc/src/snippets/qml/qml-intro/images/qt-logo.svg index 8c018be6a2..8c018be6a2 100644 --- a/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg +++ b/doc/src/snippets/qml/qml-intro/images/qt-logo.svg diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml b/doc/src/snippets/qml/qtbinding/context-advanced/MyItem.qml index a9b873d4b0..a9b873d4b0 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/context-advanced/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h b/doc/src/snippets/qml/qtbinding/context-advanced/applicationdata.h index fc5bbc6400..fc5bbc6400 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h +++ b/doc/src/snippets/qml/qtbinding/context-advanced/applicationdata.h diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml b/doc/src/snippets/qml/qtbinding/context-advanced/connections.qml index 01f0cdefb9..01f0cdefb9 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml +++ b/doc/src/snippets/qml/qtbinding/context-advanced/connections.qml diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp b/doc/src/snippets/qml/qtbinding/context-advanced/main.cpp index d7cfe6f3ef..b9676e4b66 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp +++ b/doc/src/snippets/qml/qtbinding/context-advanced/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> #include "applicationdata.h" @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - QDeclarativeView view; + QQuickView view; ApplicationData data; view.rootContext()->setContextProperty("applicationData", &data); diff --git a/doc/src/snippets/declarative/qtbinding/context/MyItem.qml b/doc/src/snippets/qml/qtbinding/context/MyItem.qml index 3abf2411f0..3abf2411f0 100644 --- a/doc/src/snippets/declarative/qtbinding/context/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/context/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/context/main.cpp b/doc/src/snippets/qml/qtbinding/context/main.cpp index e0d9a83e64..0849a845a6 100644 --- a/doc/src/snippets/declarative/qtbinding/context/main.cpp +++ b/doc/src/snippets/qml/qtbinding/context/main.cpp @@ -38,14 +38,14 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> int main(int argc, char *argv[]) { QApplication app(argc, argv); //![0] -QDeclarativeView view; +QQuickView view; view.rootContext()->setContextProperty("currentDateTime", QDateTime::currentDateTime()); view.setSource(QUrl::fromLocalFile("MyItem.qml")); view.show(); diff --git a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h b/doc/src/snippets/qml/qtbinding/enums/imageviewer.h index de9f2ecaab..df9709953f 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h +++ b/doc/src/snippets/qml/qtbinding/enums/imageviewer.h @@ -38,10 +38,10 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> //![start] -class ImageViewer : public QDeclarativeItem +class ImageViewer : public QQuickItem { Q_OBJECT Q_ENUMS(Status) @@ -56,7 +56,7 @@ public: Status status() const; //![start] - ImageViewer(QDeclarativeItem *parent = 0); + ImageViewer(QQuickItem *parent = 0); public slots: void emitSignals(); diff --git a/doc/src/snippets/declarative/qtbinding/enums/standalone.qml b/doc/src/snippets/qml/qtbinding/enums/standalone.qml index 5641854175..5641854175 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/standalone.qml +++ b/doc/src/snippets/qml/qtbinding/enums/standalone.qml diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml b/doc/src/snippets/qml/qtbinding/functions-cpp/MyItem.qml index e5ba588b25..e5ba588b25 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/functions-cpp/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp b/doc/src/snippets/qml/qtbinding/functions-cpp/main.cpp index 5e6c474a8f..3d63e055a3 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp +++ b/doc/src/snippets/qml/qtbinding/functions-cpp/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> #include "myclass.h" @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); - QDeclarativeView view; + QQuickView view; MyClass myClass; view.rootContext()->setContextProperty("myObject", &myClass); diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h b/doc/src/snippets/qml/qtbinding/functions-cpp/myclass.h index 8b6847ca99..8b6847ca99 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h +++ b/doc/src/snippets/qml/qtbinding/functions-cpp/myclass.h diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml b/doc/src/snippets/qml/qtbinding/functions-qml/MyItem.qml index a8b41d55a0..a8b41d55a0 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/functions-qml/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp b/doc/src/snippets/qml/qtbinding/functions-qml/main.cpp index ba72e9459a..5c6a0c507d 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp +++ b/doc/src/snippets/qml/qtbinding/functions-qml/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> int main(int argc, char *argv[]) { @@ -46,8 +46,8 @@ int main(int argc, char *argv[]) //![0] // main.cpp -QDeclarativeEngine engine; -QDeclarativeComponent component(&engine, "MyItem.qml"); +QQmlEngine engine; +QQmlComponent component(&engine, "MyItem.qml"); QObject *object = component.create(); QVariant returnedValue; diff --git a/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml b/doc/src/snippets/qml/qtbinding/loading/MyItem.qml index b496479c95..b496479c95 100644 --- a/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/loading/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/loading/main.cpp b/doc/src/snippets/qml/qtbinding/loading/main.cpp index 839b7352a5..98ed4173f9 100644 --- a/doc/src/snippets/declarative/qtbinding/loading/main.cpp +++ b/doc/src/snippets/qml/qtbinding/loading/main.cpp @@ -38,38 +38,38 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> static void withComponent() { -//![QDeclarativeComponent-a] -// Using QDeclarativeComponent -QDeclarativeEngine engine; -QDeclarativeComponent component(&engine, +//![QQmlComponent-a] +// Using QQmlComponent +QQmlEngine engine; +QQmlComponent component(&engine, QUrl::fromLocalFile("MyItem.qml")); QObject *object = component.create(); -//![QDeclarativeComponent-a] +//![QQmlComponent-a] } int main(int argc, char *argv[]) { QApplication app(argc, argv); -//![QDeclarativeView] -// Using QDeclarativeView -QDeclarativeView view; +//![QQuickView] +// Using QQuickView +QQuickView view; view.setSource(QUrl::fromLocalFile("MyItem.qml")); view.show(); QObject *object = view.rootObject(); -//![QDeclarativeView] +//![QQuickView] //![properties] object->setProperty("width", 500); -QDeclarativeProperty(object, "width").write(500); +QQmlProperty(object, "width").write(500); //![properties] //![cast] -QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(object); +QQuickItem *item = qobject_cast<QQuickItem*>(object); item->setWidth(500); //![cast] @@ -79,9 +79,9 @@ if (rect) rect->setProperty("color", "red"); //![findChild] -//![QDeclarativeComponent-b] +//![QQmlComponent-b] delete object; -//![QDeclarativeComponent-b] +//![QQmlComponent-b] withComponent(); diff --git a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h b/doc/src/snippets/qml/qtbinding/newelements/imageviewer.h index 7bbc243d83..3559951693 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h +++ b/doc/src/snippets/qml/qtbinding/newelements/imageviewer.h @@ -39,9 +39,9 @@ ****************************************************************************/ //![0] #include <QtCore> -#include <QtDeclarative> +#include <QtQml> -class ImageViewer : public QDeclarativeItem +class ImageViewer : public QQuickItem { Q_OBJECT Q_PROPERTY(QUrl image READ image WRITE setImage NOTIFY imageChanged) diff --git a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp b/doc/src/snippets/qml/qtbinding/newelements/main.cpp index ead2fd1722..8ab7eb63f4 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp +++ b/doc/src/snippets/qml/qtbinding/newelements/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> #include "imageviewer.h" @@ -53,7 +53,7 @@ int main(int argc, char *argv[]) qmlRegisterType<ImageViewer>("MyLibrary", 1, 0, "ImageViewer"); //![register] - QDeclarativeView view; + QQuickView view; view.setSource(QUrl::fromLocalFile("standalone.qml")); view.show(); diff --git a/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml b/doc/src/snippets/qml/qtbinding/newelements/standalone.qml index d2a8926bd0..d2a8926bd0 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml +++ b/doc/src/snippets/qml/qtbinding/newelements/standalone.qml diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml b/doc/src/snippets/qml/qtbinding/properties-cpp/MyItem.qml index f2a14d92a4..f2a14d92a4 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/properties-cpp/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h b/doc/src/snippets/qml/qtbinding/properties-cpp/applicationdata.h index b558e8528f..b558e8528f 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h +++ b/doc/src/snippets/qml/qtbinding/properties-cpp/applicationdata.h diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml b/doc/src/snippets/qml/qtbinding/properties-qml/MyItem.qml index 87015eac24..87015eac24 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/properties-qml/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp b/doc/src/snippets/qml/qtbinding/properties-qml/main.cpp index 91347ee70f..15cb517c7b 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp +++ b/doc/src/snippets/qml/qtbinding/properties-qml/main.cpp @@ -38,19 +38,19 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> int main(int argc, char *argv[]) { QApplication app(argc, argv); //![0] -QDeclarativeEngine engine; -QDeclarativeComponent component(&engine, "MyItem.qml"); +QQmlEngine engine; +QQmlComponent component(&engine, "MyItem.qml"); QObject *object = component.create(); -qDebug() << "Property value:" << QDeclarativeProperty::read(object, "someNumber").toInt(); -QDeclarativeProperty::write(object, "someNumber", 5000); +qDebug() << "Property value:" << QQmlProperty::read(object, "someNumber").toInt(); +QQmlProperty::write(object, "someNumber", 5000); qDebug() << "Property value:" << object->property("someNumber").toInt(); object->setProperty("someNumber", 100); diff --git a/doc/src/snippets/declarative/qtbinding/resources/example.qrc b/doc/src/snippets/qml/qtbinding/resources/example.qrc index 5e4941512b..5e4941512b 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/example.qrc +++ b/doc/src/snippets/qml/qtbinding/resources/example.qrc diff --git a/doc/src/snippets/declarative/qtbinding/resources/main.cpp b/doc/src/snippets/qml/qtbinding/resources/main.cpp index 0ec1189eeb..2902064fc9 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/main.cpp +++ b/doc/src/snippets/qml/qtbinding/resources/main.cpp @@ -39,15 +39,15 @@ ****************************************************************************/ #include <QApplication> -#include <QDeclarativeView> -#include <QDeclarativeContext> +#include <QQuickView> +#include <QQmlContext> //![0] int main(int argc, char *argv[]) { QApplication app(argc, argv); - QDeclarativeView view; + QQuickView view; view.setSource(QUrl("qrc:/main.qml")); view.show(); diff --git a/doc/src/snippets/declarative/qtbinding/resources/main.qml b/doc/src/snippets/qml/qtbinding/resources/main.qml index 670d1a5309..670d1a5309 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/main.qml +++ b/doc/src/snippets/qml/qtbinding/resources/main.qml diff --git a/doc/src/snippets/declarative/qtbinding/resources/resources.pro b/doc/src/snippets/qml/qtbinding/resources/resources.pro index cc01ee126f..5aee288a6e 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/resources.pro +++ b/doc/src/snippets/qml/qtbinding/resources/resources.pro @@ -1,4 +1,4 @@ -QT += declarative +QT += qml SOURCES += main.cpp RESOURCES += example.qrc diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml b/doc/src/snippets/qml/qtbinding/signals-cpp/MyItem.qml index 17df7704c5..17df7704c5 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/signals-cpp/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h b/doc/src/snippets/qml/qtbinding/signals-cpp/imageviewer.h index a066447cfb..3423295234 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h +++ b/doc/src/snippets/qml/qtbinding/signals-cpp/imageviewer.h @@ -38,16 +38,16 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> //![start] -class ImageViewer : public QDeclarativeItem +class ImageViewer : public QQuickItem { Q_OBJECT Q_PROPERTY(QUrl image READ image WRITE setImage NOTIFY imageChanged) public: //![start] - ImageViewer(QDeclarativeItem *item = 0); + ImageViewer(QQuickItem *item = 0); void setImage(const QUrl &url) {} QUrl image() const { return QUrl(); } diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp b/doc/src/snippets/qml/qtbinding/signals-cpp/main.cpp index f3ea3f26df..402e811913 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp +++ b/doc/src/snippets/qml/qtbinding/signals-cpp/main.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> #include "imageviewer.h" -ImageViewer::ImageViewer(QDeclarativeItem *item) - : QDeclarativeItem(item) +ImageViewer::ImageViewer(QQuickItem *item) + : QQuickItem(item) { QTimer::singleShot(0, this, SLOT(emitSignals())); } @@ -61,14 +61,14 @@ int main(int argc, char *argv[]) qmlRegisterType<ImageViewer>("MyLibrary", 1, 0, "ImageViewer"); - QDeclarativeView standalone; + QQuickView standalone; standalone.setSource(QUrl::fromLocalFile("standalone.qml")); standalone.show(); //![connections] ImageViewer viewer; -QDeclarativeView view; +QQuickView view; view.rootContext()->setContextProperty("imageViewer", &viewer); view.setSource(QUrl::fromLocalFile("MyItem.qml")); diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml b/doc/src/snippets/qml/qtbinding/signals-cpp/standalone.qml index 33afc1f39c..33afc1f39c 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml +++ b/doc/src/snippets/qml/qtbinding/signals-cpp/standalone.qml diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml b/doc/src/snippets/qml/qtbinding/signals-qml/MyItem.qml index 9269b51863..9269b51863 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/signals-qml/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp b/doc/src/snippets/qml/qtbinding/signals-qml/main.cpp index 084d5f0e4b..8528d9ce5e 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp +++ b/doc/src/snippets/qml/qtbinding/signals-qml/main.cpp @@ -38,13 +38,13 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> //![0] int main(int argc, char *argv[]) { QApplication app(argc, argv); - QDeclarativeView view(QUrl::fromLocalFile("MyItem.qml")); + QQuickView view(QUrl::fromLocalFile("MyItem.qml")); QObject *item = view.rootObject(); MyClass myClass; diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h b/doc/src/snippets/qml/qtbinding/signals-qml/myclass.h index 6275de6b2c..6275de6b2c 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h +++ b/doc/src/snippets/qml/qtbinding/signals-qml/myclass.h diff --git a/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml b/doc/src/snippets/qml/qtbinding/variantlistmap/MyItem.qml index ff4be87795..ff4be87795 100644 --- a/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml +++ b/doc/src/snippets/qml/qtbinding/variantlistmap/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp b/doc/src/snippets/qml/qtbinding/variantlistmap/main.cpp index 1cebecdff4..a10b9a8c12 100644 --- a/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp +++ b/doc/src/snippets/qml/qtbinding/variantlistmap/main.cpp @@ -38,14 +38,14 @@ ** ****************************************************************************/ #include <QtCore> -#include <QtDeclarative> +#include <QtQml> int main(int argc, char *argv[]) { QApplication app(argc, argv); //![0] // C++ -QDeclarativeView view(QUrl::fromLocalFile("MyItem.qml")); +QQuickView view(QUrl::fromLocalFile("MyItem.qml")); QVariantList list; list << 10 << Qt::green << "bottles"; diff --git a/doc/src/snippets/declarative/qtobject.qml b/doc/src/snippets/qml/qtobject.qml index 04811b6316..04811b6316 100644 --- a/doc/src/snippets/declarative/qtobject.qml +++ b/doc/src/snippets/qml/qtobject.qml diff --git a/doc/src/snippets/declarative/rectangle/rect-border-width.qml b/doc/src/snippets/qml/rectangle/rect-border-width.qml index 6dd4dbe739..6dd4dbe739 100644 --- a/doc/src/snippets/declarative/rectangle/rect-border-width.qml +++ b/doc/src/snippets/qml/rectangle/rect-border-width.qml diff --git a/doc/src/snippets/declarative/rectangle/rectangle-colors.qml b/doc/src/snippets/qml/rectangle/rectangle-colors.qml index 70f7a203f4..70f7a203f4 100644 --- a/doc/src/snippets/declarative/rectangle/rectangle-colors.qml +++ b/doc/src/snippets/qml/rectangle/rectangle-colors.qml diff --git a/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml b/doc/src/snippets/qml/rectangle/rectangle-gradient.qml index e8146a6467..e8146a6467 100644 --- a/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml +++ b/doc/src/snippets/qml/rectangle/rectangle-gradient.qml diff --git a/doc/src/snippets/declarative/rectangle/rectangle.qml b/doc/src/snippets/qml/rectangle/rectangle.qml index c315a27da0..c315a27da0 100644 --- a/doc/src/snippets/declarative/rectangle/rectangle.qml +++ b/doc/src/snippets/qml/rectangle/rectangle.qml diff --git a/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml b/doc/src/snippets/qml/repeaters/repeater-grid-index.qml index 0f2b770d82..0f2b770d82 100644 --- a/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml +++ b/doc/src/snippets/qml/repeaters/repeater-grid-index.qml diff --git a/doc/src/snippets/declarative/repeaters/repeater.qml b/doc/src/snippets/qml/repeaters/repeater.qml index 856b038a04..856b038a04 100644 --- a/doc/src/snippets/declarative/repeaters/repeater.qml +++ b/doc/src/snippets/qml/repeaters/repeater.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/Button.qml b/doc/src/snippets/qml/reusablecomponents/Button.qml index cedc782f75..cedc782f75 100644 --- a/doc/src/snippets/declarative/reusablecomponents/Button.qml +++ b/doc/src/snippets/qml/reusablecomponents/Button.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/application.qml b/doc/src/snippets/qml/reusablecomponents/application.qml index 42428ce25e..42428ce25e 100644 --- a/doc/src/snippets/declarative/reusablecomponents/application.qml +++ b/doc/src/snippets/qml/reusablecomponents/application.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/component.qml b/doc/src/snippets/qml/reusablecomponents/component.qml index 9a60468d73..9a60468d73 100644 --- a/doc/src/snippets/declarative/reusablecomponents/component.qml +++ b/doc/src/snippets/qml/reusablecomponents/component.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/focusbutton.qml b/doc/src/snippets/qml/reusablecomponents/focusbutton.qml index 34fc6294e2..34fc6294e2 100644 --- a/doc/src/snippets/declarative/reusablecomponents/focusbutton.qml +++ b/doc/src/snippets/qml/reusablecomponents/focusbutton.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/qmldir b/doc/src/snippets/qml/reusablecomponents/qmldir index 253732de01..253732de01 100644 --- a/doc/src/snippets/declarative/reusablecomponents/qmldir +++ b/doc/src/snippets/qml/reusablecomponents/qmldir diff --git a/doc/src/snippets/declarative/righttoleft.qml b/doc/src/snippets/qml/righttoleft.qml index 0566be2f67..0566be2f67 100644 --- a/doc/src/snippets/declarative/righttoleft.qml +++ b/doc/src/snippets/qml/righttoleft.qml diff --git a/doc/src/snippets/declarative/righttoleft/Child.qml b/doc/src/snippets/qml/righttoleft/Child.qml index 50068540cb..50068540cb 100644 --- a/doc/src/snippets/declarative/righttoleft/Child.qml +++ b/doc/src/snippets/qml/righttoleft/Child.qml diff --git a/doc/src/snippets/declarative/rotation.qml b/doc/src/snippets/qml/rotation.qml index c7f9df3a9b..c7f9df3a9b 100644 --- a/doc/src/snippets/declarative/rotation.qml +++ b/doc/src/snippets/qml/rotation.qml diff --git a/doc/src/snippets/declarative/rotationanimation.qml b/doc/src/snippets/qml/rotationanimation.qml index caa1ce8207..caa1ce8207 100644 --- a/doc/src/snippets/declarative/rotationanimation.qml +++ b/doc/src/snippets/qml/rotationanimation.qml diff --git a/doc/src/snippets/declarative/row.qml b/doc/src/snippets/qml/row.qml index 3e505717d6..3e505717d6 100644 --- a/doc/src/snippets/declarative/row.qml +++ b/doc/src/snippets/qml/row.qml diff --git a/doc/src/snippets/declarative/row/row.qml b/doc/src/snippets/qml/row/row.qml index 465baa577b..465baa577b 100644 --- a/doc/src/snippets/declarative/row/row.qml +++ b/doc/src/snippets/qml/row/row.qml diff --git a/doc/src/snippets/declarative/script.js b/doc/src/snippets/qml/script.js index f55dee3507..f55dee3507 100644 --- a/doc/src/snippets/declarative/script.js +++ b/doc/src/snippets/qml/script.js diff --git a/doc/src/snippets/declarative/sequentialanimation.qml b/doc/src/snippets/qml/sequentialanimation.qml index 73923e4ea0..73923e4ea0 100644 --- a/doc/src/snippets/declarative/sequentialanimation.qml +++ b/doc/src/snippets/qml/sequentialanimation.qml diff --git a/doc/src/snippets/declarative/smoothedanimation.qml b/doc/src/snippets/qml/smoothedanimation.qml index ba6f505976..ba6f505976 100644 --- a/doc/src/snippets/declarative/smoothedanimation.qml +++ b/doc/src/snippets/qml/smoothedanimation.qml diff --git a/doc/src/snippets/declarative/springanimation.qml b/doc/src/snippets/qml/springanimation.qml index e04c483405..e04c483405 100644 --- a/doc/src/snippets/declarative/springanimation.qml +++ b/doc/src/snippets/qml/springanimation.qml diff --git a/doc/src/snippets/declarative/state-when.qml b/doc/src/snippets/qml/state-when.qml index de9fb39cef..de9fb39cef 100644 --- a/doc/src/snippets/declarative/state-when.qml +++ b/doc/src/snippets/qml/state-when.qml diff --git a/doc/src/snippets/declarative/state.qml b/doc/src/snippets/qml/state.qml index 5948cba770..5948cba770 100644 --- a/doc/src/snippets/declarative/state.qml +++ b/doc/src/snippets/qml/state.qml diff --git a/doc/src/snippets/declarative/states.qml b/doc/src/snippets/qml/states.qml index aeb805f38e..aeb805f38e 100644 --- a/doc/src/snippets/declarative/states.qml +++ b/doc/src/snippets/qml/states.qml diff --git a/doc/src/snippets/declarative/states/statechangescript.qml b/doc/src/snippets/qml/states/statechangescript.qml index 262938fc9c..262938fc9c 100644 --- a/doc/src/snippets/declarative/states/statechangescript.qml +++ b/doc/src/snippets/qml/states/statechangescript.qml diff --git a/doc/src/snippets/declarative/systempalette.qml b/doc/src/snippets/qml/systempalette.qml index 4cb42dee93..4cb42dee93 100644 --- a/doc/src/snippets/declarative/systempalette.qml +++ b/doc/src/snippets/qml/systempalette.qml diff --git a/doc/src/snippets/declarative/text/onLinkActivated.qml b/doc/src/snippets/qml/text/onLinkActivated.qml index 71545ad3e2..03641d989e 100644 --- a/doc/src/snippets/declarative/text/onLinkActivated.qml +++ b/doc/src/snippets/qml/text/onLinkActivated.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: diff --git a/doc/src/snippets/declarative/texthandling.qml b/doc/src/snippets/qml/texthandling.qml index 03e5011202..03e5011202 100644 --- a/doc/src/snippets/declarative/texthandling.qml +++ b/doc/src/snippets/qml/texthandling.qml diff --git a/doc/src/snippets/declarative/transition-from-to-modified.qml b/doc/src/snippets/qml/transition-from-to-modified.qml index 184e95afe2..184e95afe2 100644 --- a/doc/src/snippets/declarative/transition-from-to-modified.qml +++ b/doc/src/snippets/qml/transition-from-to-modified.qml diff --git a/doc/src/snippets/declarative/transition-from-to.qml b/doc/src/snippets/qml/transition-from-to.qml index c876f5cb9c..c876f5cb9c 100644 --- a/doc/src/snippets/declarative/transition-from-to.qml +++ b/doc/src/snippets/qml/transition-from-to.qml diff --git a/doc/src/snippets/declarative/transition-reversible.qml b/doc/src/snippets/qml/transition-reversible.qml index 4f7ae83468..4f7ae83468 100644 --- a/doc/src/snippets/declarative/transition-reversible.qml +++ b/doc/src/snippets/qml/transition-reversible.qml diff --git a/doc/src/snippets/declarative/transition.qml b/doc/src/snippets/qml/transition.qml index 614c5d364f..614c5d364f 100644 --- a/doc/src/snippets/declarative/transition.qml +++ b/doc/src/snippets/qml/transition.qml diff --git a/doc/src/snippets/declarative/transitions-list.qml b/doc/src/snippets/qml/transitions-list.qml index f2ba768559..f2ba768559 100644 --- a/doc/src/snippets/declarative/transitions-list.qml +++ b/doc/src/snippets/qml/transitions-list.qml diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-basic.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-basic.qml index 8a05491ee1..8a05491ee1 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-basic.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-basic.qml diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-delayedbyindex.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-delayedbyindex.qml index 79d00d2d1c..79d00d2d1c 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-delayedbyindex.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-delayedbyindex.qml diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-intermediatemove.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-intermediatemove.qml index a43d3a8b7f..a43d3a8b7f 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-intermediatemove.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-intermediatemove.qml diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-interruptedgood.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-interruptedgood.qml index 1355268710..1355268710 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-interruptedgood.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-interruptedgood.qml diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-pathanim.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-pathanim.qml index 3d075c4367..3d075c4367 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-pathanim.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-pathanim.qml diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactionbad.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactionbad.qml index 03348356e1..03348356e1 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactionbad.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactionbad.qml diff --git a/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactiongood.qml b/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactiongood.qml index eda5c35479..eda5c35479 100644 --- a/doc/src/snippets/declarative/viewtransitions/viewtransitions-scriptactiongood.qml +++ b/doc/src/snippets/qml/viewtransitions/viewtransitions-scriptactiongood.qml diff --git a/doc/src/snippets/declarative/visualdatagroup.qml b/doc/src/snippets/qml/visualdatagroup.qml index 46ac9a3d7a..46ac9a3d7a 100644 --- a/doc/src/snippets/declarative/visualdatagroup.qml +++ b/doc/src/snippets/qml/visualdatagroup.qml diff --git a/doc/src/snippets/declarative/visualdatamodel.qml b/doc/src/snippets/qml/visualdatamodel.qml index 87b836e224..87b836e224 100644 --- a/doc/src/snippets/declarative/visualdatamodel.qml +++ b/doc/src/snippets/qml/visualdatamodel.qml diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp b/doc/src/snippets/qml/visualdatamodel_rootindex/main.cpp index 206828e883..4468d06db4 100644 --- a/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp +++ b/doc/src/snippets/qml/visualdatamodel_rootindex/main.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** -** This file is part of the QtDeclarative module of the Qt Toolkit. +** This file is part of the QtQml module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -37,8 +37,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include <QDeclarativeView> -#include <QDeclarativeContext> +#include <QQuickView> +#include <QQmlContext> #include <QApplication> #include <QDirModel> @@ -48,7 +48,7 @@ int main(int argc, char ** argv) { QApplication app(argc, argv); - QDeclarativeView view; + QQuickView view; QDirModel model; view.rootContext()->setContextProperty("dirModel", &model); diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml b/doc/src/snippets/qml/visualdatamodel_rootindex/view.qml index 24d6b47f8d..24d6b47f8d 100644 --- a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml +++ b/doc/src/snippets/qml/visualdatamodel_rootindex/view.qml diff --git a/doc/src/snippets/declarative/workerscript.qml b/doc/src/snippets/qml/workerscript.qml index 6af6b47766..6af6b47766 100644 --- a/doc/src/snippets/declarative/workerscript.qml +++ b/doc/src/snippets/qml/workerscript.qml diff --git a/doc/src/snippets/declarative/xmlrole.qml b/doc/src/snippets/qml/xmlrole.qml index 34868fb76d..34868fb76d 100644 --- a/doc/src/snippets/declarative/xmlrole.qml +++ b/doc/src/snippets/qml/xmlrole.qml diff --git a/doc/src/snippets/declarative/xmlrole.xml b/doc/src/snippets/qml/xmlrole.xml index c9f999e523..c9f999e523 100644 --- a/doc/src/snippets/declarative/xmlrole.xml +++ b/doc/src/snippets/qml/xmlrole.xml diff --git a/doc/src/snippets/qtjavascript/evaluation/main.cpp b/doc/src/snippets/qtjavascript/evaluation/main.cpp index 8d1cbf0484..3d3e3bfda2 100644 --- a/doc/src/snippets/qtjavascript/evaluation/main.cpp +++ b/doc/src/snippets/qtjavascript/evaluation/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtDeclarative> +#include <QtQml> int main(int argc, char *argv[]) { diff --git a/doc/src/snippets/qtjavascript/registeringobjects/main.cpp b/doc/src/snippets/qtjavascript/registeringobjects/main.cpp index 27d696da63..f34c1061fe 100644 --- a/doc/src/snippets/qtjavascript/registeringobjects/main.cpp +++ b/doc/src/snippets/qtjavascript/registeringobjects/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <QObject> -#include <QtDeclarative> +#include <QtQml> #include "myobject.h" int main(int argc, char *argv[]) diff --git a/doc/src/snippets/qtjavascript/registeringvalues/main.cpp b/doc/src/snippets/qtjavascript/registeringvalues/main.cpp index be2d293cf7..f168f4f554 100644 --- a/doc/src/snippets/qtjavascript/registeringvalues/main.cpp +++ b/doc/src/snippets/qtjavascript/registeringvalues/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtDeclarative> +#include <QtQml> int main(int argc, char *argv[]) { |