diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-09 12:15:59 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 12:44:43 +0100 |
commit | 3146dcbdc768c90a03b58eed3f42630604443093 (patch) | |
tree | 10e234460c5f57012b346cdbe6304002ad0a446d | |
parent | a7ea2afffd61e2a89f7bb2c586b4b733c4996bb5 (diff) | |
parent | 722725cf24e45e86a2844810b90787a29df8a4a9 (diff) |
Merge branch 'stable' into dev
Conflicts:
sync.profile
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
-rw-r--r-- | .gitignore | 7 | ||||
-rw-r--r-- | .qmake.conf | 1 | ||||
-rw-r--r-- | dist/changes-5.0.1 | 51 | ||||
-rw-r--r-- | doc/src/qml-folderlistmodel.qdoc | 135 | ||||
-rw-r--r-- | examples/declarative/animation/animation.pro | 6 | ||||
-rw-r--r-- | examples/declarative/animation/basics/color-animation/color-animation.pro | 4 | ||||
-rw-r--r-- | examples/declarative/animation/basics/property-animation/property-animation.pro | 4 | ||||
-rw-r--r-- | examples/declarative/animation/behaviors/behavior-example/behavior-example.pro | 4 | ||||
-rw-r--r-- | examples/declarative/animation/behaviors/wigglytext/wigglytext.pro | 13 | ||||
-rw-r--r-- | examples/declarative/animation/easing/easing.pro | 4 | ||||
-rw-r--r-- | examples/declarative/animation/states/states.pro | 4 | ||||
-rw-r--r-- | examples/declarative/calculator/calculator.desktop (renamed from examples/demos/calculator/calculator.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/calculator.pro (renamed from examples/demos/calculator/calculator.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/calculator/calculator.qmlproject (renamed from examples/demos/calculator/calculator.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/calculator.svg (renamed from examples/demos/calculator/calculator.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/calculator64.png (renamed from examples/demos/calculator/calculator64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/calculator/calculator80.png (renamed from examples/demos/calculator/calculator80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/calculator/calculator_harmattan.desktop (renamed from examples/demos/calculator/calculator_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/main.cpp (renamed from examples/demos/calculator/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/Button.qml (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/Display.qml (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/Display.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/calculator.js (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/calculator.js) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-.png (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/images/button-.png) | bin | 1288 -> 1288 bytes | |||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-blue.png (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/images/button-blue.png) | bin | 1565 -> 1565 bytes | |||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-green.png (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/images/button-green.png) | bin | 1543 -> 1543 bytes | |||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-purple.png (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/images/button-purple.png) | bin | 1566 -> 1566 bytes | |||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-red.png (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/images/button-red.png) | bin | 1586 -> 1586 bytes | |||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/images/display.png (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/images/display.png) | bin | 998 -> 998 bytes | |||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/CalculatorCore/qmldir (renamed from examples/demos/calculator/qml/calculator/CalculatorCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/calculator/qml/calculator/calculator.qml (renamed from examples/demos/calculator/qml/calculator/calculator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/cppextensions/cppextensions.pro | 5 | ||||
-rw-r--r-- | examples/declarative/cppextensions/imageprovider/imageprovider.pro | 19 | ||||
-rw-r--r-- | examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro | 4 | ||||
-rw-r--r-- | examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml | 2 | ||||
-rw-r--r-- | examples/declarative/cppextensions/plugins/plugins.pro | 14 | ||||
-rw-r--r-- | examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro | 4 | ||||
-rw-r--r-- | examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro | 4 | ||||
-rw-r--r-- | examples/declarative/cppextensions/qwidgets/qwidgets.pro | 13 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/adding/adding.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/attached/attached.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/binding/binding.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/default/default.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/extended/extended.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/methods/methods.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/properties/properties.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/signal/signal.pro | 6 | ||||
-rw-r--r-- | examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro | 6 | ||||
-rw-r--r-- | examples/declarative/declarative.pro | 49 | ||||
-rw-r--r-- | examples/declarative/flickr/flickr.desktop (renamed from examples/demos/flickr/flickr.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/flickr.pro (renamed from examples/demos/flickr/flickr.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/flickr/flickr.qmlproject (renamed from examples/demos/flickr/flickr.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/flickr.svg (renamed from examples/demos/flickr/flickr.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/flickr64.png (renamed from examples/demos/flickr/flickr64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/flickr/flickr80.png (renamed from examples/demos/flickr/flickr80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/flickr/flickr_harmattan.desktop (renamed from examples/demos/flickr/flickr_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/main.cpp (renamed from examples/demos/flickr/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/common/Progress.qml (renamed from examples/demos/flickr/qml/flickr/common/Progress.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/common/RssModel.qml (renamed from examples/demos/flickr/qml/flickr/common/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/common/ScrollBar.qml (renamed from examples/demos/flickr/qml/flickr/common/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/common/Slider.qml (renamed from examples/demos/flickr/qml/flickr/common/Slider.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/common/qmldir (renamed from examples/demos/flickr/qml/flickr/common/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/flickr-90.qml (renamed from examples/demos/flickr/qml/flickr/flickr-90.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/flickr.qml (renamed from examples/demos/flickr/qml/flickr/flickr.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/Button.qml (renamed from examples/demos/flickr/qml/flickr/mobile/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/GridDelegate.qml (renamed from examples/demos/flickr/qml/flickr/mobile/GridDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/ImageDetails.qml (renamed from examples/demos/flickr/qml/flickr/mobile/ImageDetails.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/ListDelegate.qml (renamed from examples/demos/flickr/qml/flickr/mobile/ListDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/TitleBar.qml (renamed from examples/demos/flickr/qml/flickr/mobile/TitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/ToolBar.qml (renamed from examples/demos/flickr/qml/flickr/mobile/ToolBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/gloss.png (renamed from examples/demos/flickr/qml/flickr/mobile/images/gloss.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/lineedit.png (renamed from examples/demos/flickr/qml/flickr/mobile/images/lineedit.png) | bin | 1415 -> 1415 bytes | |||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/lineedit.sci (renamed from examples/demos/flickr/qml/flickr/mobile/images/lineedit.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/quit.png (renamed from examples/demos/flickr/qml/flickr/mobile/images/quit.png) | bin | 2369 -> 2369 bytes | |||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/stripes.png (renamed from examples/demos/flickr/qml/flickr/mobile/images/stripes.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/titlebar.png (renamed from examples/demos/flickr/qml/flickr/mobile/images/titlebar.png) | bin | 1436 -> 1436 bytes | |||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/titlebar.sci (renamed from examples/demos/flickr/qml/flickr/mobile/images/titlebar.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/toolbutton.png (renamed from examples/demos/flickr/qml/flickr/mobile/images/toolbutton.png) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | examples/declarative/flickr/qml/flickr/mobile/images/toolbutton.sci (renamed from examples/demos/flickr/qml/flickr/mobile/images/toolbutton.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/helper/deployment.pri (renamed from examples/helper/deployment.pri) | 0 | ||||
-rw-r--r-- | examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.cpp (renamed from examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.h (renamed from examples/helper/qmlapplicationviewer/qmlapplicationviewer.h) | 0 | ||||
-rw-r--r-- | examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.pri (renamed from examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri) | 0 | ||||
-rw-r--r-- | examples/declarative/i18n/i18n.pro | 4 | ||||
-rw-r--r-- | examples/declarative/imageelements/borderimage/borderimage.pro | 4 | ||||
-rw-r--r-- | examples/declarative/imageelements/image/image.pro | 4 | ||||
-rw-r--r-- | examples/declarative/imageelements/imageelements.pro | 5 | ||||
-rw-r--r-- | examples/declarative/imageelements/shadows/shadows.pro | 4 | ||||
-rw-r--r-- | examples/declarative/keyinteraction/focus/focus.pro | 4 | ||||
-rw-r--r-- | examples/declarative/minehunt/README (renamed from examples/demos/minehunt/README) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/main.cpp (renamed from examples/demos/minehunt/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.cpp (renamed from examples/demos/minehunt/minehunt.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.h (renamed from examples/demos/minehunt/minehunt.h) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.pro (renamed from examples/demos/minehunt/minehunt.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.qmlproject (renamed from examples/demos/minehunt/minehunt.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/minehunt.qrc (renamed from examples/demos/minehunt/minehunt.qrc) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/Explosion.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/Tile.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/back.png) | bin | 558 -> 558 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/background.png) | bin | 313930 -> 313930 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png) | bin | 284 -> 284 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png) | bin | 535 -> 535 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png) | bin | 14844 -> 14844 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png) | bin | 13810 -> 13810 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png) | bin | 15408 -> 15408 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png) | bin | 219 -> 219 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag.png) | bin | 196 -> 196 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/front.png) | bin | 580 -> 580 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/quit.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png (renamed from examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/star.png) | bin | 2677 -> 2677 bytes | |||
-rw-r--r-- | examples/declarative/minehunt/qml/minehunt/minehunt.qml (renamed from examples/demos/minehunt/qml/minehunt/minehunt.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/gridview/gridview.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/listview/highlight/highlight.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/listview/highlightranges/highlightranges.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/listview/listview.pro | 5 | ||||
-rw-r--r-- | examples/declarative/modelviews/listview/sections/sections.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/modelviews.pro | 5 | ||||
-rw-r--r-- | examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/package/package.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/parallax/parallax.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/pathview/pathview.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro | 4 | ||||
-rw-r--r-- | examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro | 4 | ||||
-rw-r--r-- | examples/declarative/photoviewer/main.cpp (renamed from examples/demos/photoviewer/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer.desktop (renamed from examples/demos/photoviewer/photoviewer.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer.pro (renamed from examples/demos/photoviewer/photoviewer.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer.qmlproject (renamed from examples/demos/photoviewer/photoviewer.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer.svg (renamed from examples/demos/photoviewer/photoviewer.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer64.png (renamed from examples/demos/photoviewer/photoviewer64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer80.png (renamed from examples/demos/photoviewer/photoviewer80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/photoviewer_harmattan.desktop (renamed from examples/demos/photoviewer/photoviewer_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png) | bin | 588 -> 588 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png) | bin | 2629 -> 2629 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png) | bin | 8844 -> 8844 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js (renamed from examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/i18n/base.ts (renamed from examples/demos/photoviewer/qml/photoviewer/i18n/base.ts) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.qm (renamed from examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.qm) | bin | 268 -> 268 bytes | |||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.ts (renamed from examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.ts) | 0 | ||||
-rw-r--r-- | examples/declarative/photoviewer/qml/photoviewer/photoviewer.qml (renamed from examples/demos/photoviewer/qml/photoviewer/photoviewer.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/positioners/positioners.pro | 4 | ||||
-rw-r--r-- | examples/declarative/righttoleft/layoutdirection/layoutdirection.pro | 16 | ||||
-rw-r--r-- | examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro | 16 | ||||
-rw-r--r-- | examples/declarative/righttoleft/righttoleft.pro | 6 | ||||
-rw-r--r-- | examples/declarative/righttoleft/textalignment/textalignment.pro | 16 | ||||
-rw-r--r-- | examples/declarative/rssnews/main.cpp (renamed from examples/demos/rssnews/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml (renamed from examples/demos/rssnews/qml/rssnews/content/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml (renamed from examples/demos/rssnews/qml/rssnews/content/CategoryDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml (renamed from examples/demos/rssnews/qml/rssnews/content/NewsDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/qml/rssnews/content/RssFeeds.qml (renamed from examples/demos/rssnews/qml/rssnews/content/RssFeeds.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/qml/rssnews/content/ScrollBar.qml (renamed from examples/demos/rssnews/qml/rssnews/content/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/qml/rssnews/content/images/busy.png (renamed from examples/demos/rssnews/qml/rssnews/content/images/busy.png) | bin | 2629 -> 2629 bytes | |||
-rw-r--r-- | examples/declarative/rssnews/qml/rssnews/content/images/scrollbar.png (renamed from examples/demos/rssnews/qml/rssnews/content/images/scrollbar.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | examples/declarative/rssnews/qml/rssnews/rssnews.qml (renamed from examples/demos/rssnews/qml/rssnews/rssnews.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/rssnews.desktop (renamed from examples/demos/rssnews/rssnews.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/rssnews.pro (renamed from examples/demos/rssnews/rssnews.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/rssnews/rssnews.qmlproject (renamed from examples/demos/rssnews/rssnews.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/rssnews.svg (renamed from examples/demos/rssnews/rssnews.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/rssnews/rssnews64.png (renamed from examples/demos/rssnews/rssnews64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/rssnews/rssnews80.png (renamed from examples/demos/rssnews/rssnews80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/rssnews/rssnews_harmattan.desktop (renamed from examples/demos/rssnews/rssnews_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/main.cpp (renamed from examples/demos/samegame/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml (renamed from examples/demos/samegame/qml/samegame/SamegameCore/BoomBlock.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/Button.qml (renamed from examples/demos/samegame/qml/samegame/SamegameCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml (renamed from examples/demos/samegame/qml/samegame/SamegameCore/Dialog.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/background.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/background.png) | bin | 313930 -> 313930 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStar.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStar.png) | bin | 278 -> 278 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStone.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStone.png) | bin | 3054 -> 3054 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStar.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStar.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStone.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStone.png) | bin | 2932 -> 2932 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStar.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/redStar.png) | bin | 274 -> 274 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStone.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/redStone.png) | bin | 2902 -> 2902 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/star.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/star.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/pics/yellowStone.png (renamed from examples/demos/samegame/qml/samegame/SamegameCore/pics/yellowStone.png) | bin | 3056 -> 3056 bytes | |||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/qmldir (renamed from examples/demos/samegame/qml/samegame/SamegameCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/SamegameCore/samegame.js (renamed from examples/demos/samegame/qml/samegame/SamegameCore/samegame.js) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/highscores/README (renamed from examples/demos/samegame/qml/samegame/highscores/README) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/highscores/score_data.xml (renamed from examples/demos/samegame/qml/samegame/highscores/score_data.xml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/highscores/score_style.xsl (renamed from examples/demos/samegame/qml/samegame/highscores/score_style.xsl) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/highscores/scores.php (renamed from examples/demos/samegame/qml/samegame/highscores/scores.php) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/qml/samegame/samegame.qml (renamed from examples/demos/samegame/qml/samegame/samegame.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/samegame.desktop (renamed from examples/demos/samegame/samegame.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/samegame.pro (renamed from examples/demos/samegame/samegame.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/samegame/samegame.qmlproject (renamed from examples/demos/samegame/samegame.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/samegame.svg (renamed from examples/demos/samegame/samegame.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/samegame/samegame64.png (renamed from examples/demos/samegame/samegame64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/samegame/samegame80.png (renamed from examples/demos/samegame/samegame80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/samegame/samegame_harmattan.desktop (renamed from examples/demos/samegame/samegame_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/shadereffects/shadereffects.pro | 8 | ||||
-rw-r--r-- | examples/declarative/snake/main.cpp (renamed from examples/demos/snake/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/Button.qml (renamed from examples/demos/snake/qml/snake/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/Cookie.qml (renamed from examples/demos/snake/qml/snake/content/Cookie.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/HighScoreModel.qml (renamed from examples/demos/snake/qml/snake/content/HighScoreModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/Link.qml (renamed from examples/demos/snake/qml/snake/content/Link.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/Skull.qml (renamed from examples/demos/snake/qml/snake/content/Skull.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/README (renamed from examples/demos/snake/qml/snake/content/pics/README) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/background.png (renamed from examples/demos/snake/qml/snake/content/pics/background.png) | bin | 144508 -> 144508 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/blueStar.png (renamed from examples/demos/snake/qml/snake/content/pics/blueStar.png) | bin | 272 -> 272 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/blueStone.png (renamed from examples/demos/snake/qml/snake/content/pics/blueStone.png) | bin | 3139 -> 3139 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/cookie.png (renamed from examples/demos/snake/qml/snake/content/pics/cookie.png) | bin | 2729 -> 2729 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/eyes.svg (renamed from examples/demos/snake/qml/snake/content/pics/eyes.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/head.png (renamed from examples/demos/snake/qml/snake/content/pics/head.png) | bin | 3473 -> 3473 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/head.svg (renamed from examples/demos/snake/qml/snake/content/pics/head.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/pause.png (renamed from examples/demos/snake/qml/snake/content/pics/pause.png) | bin | 4327 -> 4327 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/redStar.png (renamed from examples/demos/snake/qml/snake/content/pics/redStar.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/redStone.png (renamed from examples/demos/snake/qml/snake/content/pics/redStone.png) | bin | 3456 -> 3456 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/skull.png (renamed from examples/demos/snake/qml/snake/content/pics/skull.png) | bin | 2543 -> 2543 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/snake.jpg (renamed from examples/demos/snake/qml/snake/content/pics/snake.jpg) | bin | 663901 -> 663901 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/star.png (renamed from examples/demos/snake/qml/snake/content/pics/star.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/stoneShadow.png (renamed from examples/demos/snake/qml/snake/content/pics/stoneShadow.png) | bin | 1699 -> 1699 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/yellowStar.png (renamed from examples/demos/snake/qml/snake/content/pics/yellowStar.png) | bin | 276 -> 276 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/pics/yellowStone.png (renamed from examples/demos/snake/qml/snake/content/pics/yellowStone.png) | bin | 2667 -> 2667 bytes | |||
-rw-r--r-- | examples/declarative/snake/qml/snake/content/snake.js (renamed from examples/demos/snake/qml/snake/content/snake.js) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/qml/snake/snake.qml (renamed from examples/demos/snake/qml/snake/snake.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/snake.desktop (renamed from examples/demos/snake/snake.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/snake.pro (renamed from examples/demos/snake/snake.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/snake/snake.qmlproject (renamed from examples/demos/snake/snake.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/snake.svg (renamed from examples/demos/snake/snake.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/snake/snake64.png (renamed from examples/demos/snake/snake64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/snake/snake80.png (renamed from examples/demos/snake/snake80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/snake/snake_harmattan.desktop (renamed from examples/demos/snake/snake_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/sqllocalstorage/sqllocalstorage.pro | 4 | ||||
-rw-r--r-- | examples/declarative/text/fonts/availableFonts/availableFonts.pro | 4 | ||||
-rw-r--r-- | examples/declarative/text/fonts/banner/banner.pro | 4 | ||||
-rw-r--r-- | examples/declarative/text/fonts/fonts.pro | 5 | ||||
-rw-r--r-- | examples/declarative/text/fonts/fonts/fonts.pro | 4 | ||||
-rw-r--r-- | examples/declarative/text/fonts/hello/hello.pro | 4 | ||||
-rw-r--r-- | examples/declarative/text/text.pro | 5 | ||||
-rw-r--r-- | examples/declarative/text/textselection/textselection.pro | 4 | ||||
-rw-r--r-- | examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro | 4 | ||||
-rw-r--r-- | examples/declarative/threading/threading.pro | 5 | ||||
-rw-r--r-- | examples/declarative/threading/workerscript/workerscript.pro | 4 | ||||
-rw-r--r-- | examples/declarative/touchinteraction/gestures/experimental-gestures/experimental-gestures.pro (renamed from examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro (renamed from examples/declarative/toys/tic-tac-toe/tictactoe.pro) | 5 | ||||
-rw-r--r-- | examples/declarative/touchinteraction/pincharea/pincharea.pro | 4 | ||||
-rw-r--r-- | examples/declarative/touchinteraction/touchinteraction.pro | 9 | ||||
-rw-r--r-- | examples/declarative/toys/clocks/clocks.pro | 4 | ||||
-rw-r--r-- | examples/declarative/toys/corkboards/corkboards.pro | 4 | ||||
-rw-r--r-- | examples/declarative/toys/dynamicscene/dynamicscene.pro | 4 | ||||
-rw-r--r-- | examples/declarative/toys/tic-tac-toe/tic-tac-toe.pro (renamed from examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro) | 6 | ||||
-rw-r--r-- | examples/declarative/toys/toys.pro | 7 | ||||
-rw-r--r-- | examples/declarative/toys/tvtennis/tvtennis.pro | 4 | ||||
-rw-r--r-- | examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro | 9 | ||||
-rw-r--r-- | examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro | 9 | ||||
-rw-r--r-- | examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro | 9 | ||||
-rw-r--r-- | examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro | 9 | ||||
-rw-r--r-- | examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro | 9 | ||||
-rw-r--r-- | examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro | 15 | ||||
-rw-r--r-- | examples/declarative/tutorials/extending/extending.pro | 6 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/dialogPlugin.cpp (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/dialogPlugin.h (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/directory.cpp (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/directory.h (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/directory.h) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/file.cpp (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/file.h (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/file.h) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/filedialog.json (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.json) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/filedialog.pro | 22 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/filedialog/qmldir (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gettingStarted.pro | 11 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gettingStarted.qml (renamed from examples/tutorials/gettingStarted/gsQml/texteditor.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/core/button.qml (renamed from examples/tutorials/gettingStarted/gsQml/core/button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/core/editMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/core/editMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/core/fileDialog.qml (renamed from examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/core/fileMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/core/menuBar.qml (renamed from examples/tutorials/gettingStarted/gsQml/core/menuBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/core/qmldir (renamed from examples/tutorials/gettingStarted/gsQml/core/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/core/textArea.qml (renamed from examples/tutorials/gettingStarted/gsQml/core/textArea.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp | 51 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h | 58 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/directory.cpp | 224 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/directory.h | 107 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/file.cpp | 57 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/file.h | 67 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/filedialog.json (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.json) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro) | 2 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/filedialog/qmldir (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/images/arrow.png (renamed from examples/tutorials/gettingStarted/gsQml/images/arrow.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part0/Button.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part0/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/Button.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_button.png (renamed from doc/src/images/qml-texteditor1_button.png) | bin | 1670 -> 1670 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_editmenu.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_editmenu.png) | bin | 6177 -> 6177 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_filemenu.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_filemenu.png) | bin | 6062 -> 6062 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_simplebutton.png (renamed from doc/src/images/qml-texteditor1_simplebutton.png) | bin | 1055 -> 1055 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/qml-texteditor.qmlproject (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/qml-texteditor.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/Button.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part2/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/pics/qml-texteditor2_menubar.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part2/pics/qml-texteditor2_menubar.png) | bin | 6079 -> 6079 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/qml-texteditor2.qmlproject (renamed from examples/tutorials/gettingStarted/gsQml/parts/part2/qml-texteditor2.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/Button.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/images/arrow.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/images/arrow.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/pics/qml-texteditor3_texteditor.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/pics/qml-texteditor3_texteditor.png) | bin | 59345 -> 59345 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/qml-texteditor3.qmlproject (renamed from examples/tutorials/gettingStarted/gsQml/parts/part3/qml-texteditor3.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/Button.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/images/arrow.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/images/arrow.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/pics/qml-texteditor4_texteditor.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/pics/qml-texteditor4_texteditor.png) | bin | 63629 -> 63629 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/qml-texteditor4.qmlproject (renamed from examples/tutorials/gettingStarted/gsQml/parts/part4/qml-texteditor4.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.cpp (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.h (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.h) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.cpp (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.h (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.h) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.json | 1 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro) | 2 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir | 1 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/images/arrow.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/images/arrow.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_editmenu.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_editmenu.png) | bin | 65123 -> 65123 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_filemenu.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_filemenu.png) | bin | 21367 -> 21367 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_newfile.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_newfile.png) | bin | 76693 -> 76693 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/qml-texteditor5.qmlproject (renamed from examples/tutorials/gettingStarted/gsQml/parts/part5/qml-texteditor5.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png (renamed from examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png) | bin | 65123 -> 65123 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png (renamed from examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png) | bin | 21367 -> 21367 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png (renamed from examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png) | bin | 76693 -> 76693 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/texteditor.pro (renamed from examples/tutorials/gettingStarted/gsQml/texteditor.pro) | 0 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/gsQml/texteditor.qml | 132 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/images/arrow.png | bin | 0 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml | 55 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/Button.qml | 97 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/EditMenu.qml | 76 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/FileMenu.qml | 91 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/SimpleButton.qml | 73 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_button.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_button.png) | bin | 1670 -> 1670 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_editmenu.png | bin | 0 -> 6177 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_filemenu.png | bin | 0 -> 6062 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_simplebutton.png (renamed from examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_simplebutton.png) | bin | 1055 -> 1055 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part1/qml-texteditor.qmlproject | 16 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part2/Button.qml | 99 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part2/EditMenu.qml | 77 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part2/FileMenu.qml | 92 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part2/MenuBar.qml | 140 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part2/pics/qml-texteditor2_menubar.png | bin | 0 -> 6079 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part2/qml-texteditor2.qmlproject | 16 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/Button.qml | 99 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/EditMenu.qml | 77 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/FileMenu.qml | 92 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/MenuBar.qml | 140 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/TextArea.qml | 80 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/TextEditor.qml | 68 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/images/arrow.png | bin | 0 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/pics/qml-texteditor3_texteditor.png | bin | 0 -> 59345 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part3/qml-texteditor3.qmlproject | 16 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/Button.qml | 109 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/EditMenu.qml | 81 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/FileMenu.qml | 96 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/MenuBar.qml | 146 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/SimpleButton.qml | 59 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/TextArea.qml | 80 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/TextEditor.qml | 146 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/images/arrow.png | bin | 0 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/pics/qml-texteditor4_texteditor.png | bin | 0 -> 63629 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part4/qml-texteditor4.qmlproject | 16 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/TextEditor.qml | 127 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.cpp | 54 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.h | 58 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp | 219 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.h | 108 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.cpp | 56 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.h | 67 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.json | 1 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro | 17 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/qmldir | 1 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/images/arrow.png | bin | 0 -> 583 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_editmenu.png | bin | 0 -> 65123 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_filemenu.png | bin | 0 -> 21367 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_newfile.png | bin | 0 -> 76693 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/parts/part5/qml-texteditor5.qmlproject | 18 | ||||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_editmenu.png | bin | 0 -> 65123 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_filemenu.png | bin | 0 -> 21367 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_newfile.png | bin | 0 -> 76693 bytes | |||
-rw-r--r-- | examples/declarative/tutorials/tutorials.pro | 10 | ||||
-rw-r--r-- | examples/declarative/twitter/main.cpp (renamed from examples/demos/twitter/main.cpp) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/Button.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/FatDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/Input.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/Input.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/Loading.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/Loading.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/SearchView.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/TitleBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/ToolBar.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml (renamed from examples/demos/twitter/qml/twitter/TwitterCore/UserModel.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/gloss.png (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/gloss.png) | bin | 1236 -> 1236 bytes | |||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.png (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.png) | bin | 1415 -> 1415 bytes | |||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.sci (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/loading.png (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/loading.png) | bin | 813 -> 813 bytes | |||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/quit.png (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/quit.png) | bin | 2369 -> 2369 bytes | |||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/stripes.png (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/stripes.png) | bin | 257 -> 257 bytes | |||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.png (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.png) | bin | 1436 -> 1436 bytes | |||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.sci (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.png (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.png) | bin | 2550 -> 2550 bytes | |||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.sci (renamed from examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.sci) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/TwitterCore/qmldir (renamed from examples/demos/twitter/qml/twitter/TwitterCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/qml/twitter/twitter.qml (renamed from examples/demos/twitter/qml/twitter/twitter.qml) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/twitter.desktop (renamed from examples/demos/twitter/twitter.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/twitter.pro (renamed from examples/demos/twitter/twitter.pro) | 4 | ||||
-rw-r--r-- | examples/declarative/twitter/twitter.qmlproject (renamed from examples/demos/twitter/twitter.qmlproject) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/twitter.svg (renamed from examples/demos/twitter/twitter.svg) | 0 | ||||
-rw-r--r-- | examples/declarative/twitter/twitter64.png (renamed from examples/demos/twitter/twitter64.png) | bin | 3400 -> 3400 bytes | |||
-rw-r--r-- | examples/declarative/twitter/twitter80.png (renamed from examples/demos/twitter/twitter80.png) | bin | 4945 -> 4945 bytes | |||
-rw-r--r-- | examples/declarative/twitter/twitter_harmattan.desktop (renamed from examples/demos/twitter/twitter_harmattan.desktop) | 0 | ||||
-rw-r--r-- | examples/declarative/ui-components/dialcontrol/dialcontrol.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/flipable/flipable.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/main/main.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/progressbar/progressbar.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/scrollbar/scrollbar.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/searchbox/searchbox.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/slideswitch/slideswitch.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/spinner/spinner.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/tabwidget/tabwidget.pro | 4 | ||||
-rw-r--r-- | examples/declarative/ui-components/ui-components.pro | 5 | ||||
-rw-r--r-- | examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro | 4 | ||||
-rw-r--r-- | examples/demos/demos.pro | 17 | ||||
-rw-r--r-- | examples/demos/doc/images/qml-calculator-example.png (renamed from doc/src/images/qml-calculator-example.png) | bin | 33892 -> 33892 bytes | |||
-rw-r--r-- | examples/demos/doc/images/qml-minehunt-demo.png (renamed from doc/src/images/qml-minehunt-demo.png) | bin | 170648 -> 170648 bytes | |||
-rw-r--r-- | examples/demos/doc/images/qml-photoviewer-demo.png (renamed from doc/src/images/qml-photoviewer-demo.png) | bin | 473306 -> 473306 bytes | |||
-rw-r--r-- | examples/demos/doc/images/qml-rssnews-demo.png (renamed from doc/src/images/qml-rssnews-demo.png) | bin | 128307 -> 128307 bytes | |||
-rw-r--r-- | examples/demos/doc/images/qml-samegame-demo.png (renamed from doc/src/images/qml-samegame-demo.png) | bin | 213137 -> 213137 bytes | |||
-rw-r--r-- | examples/demos/doc/images/qml-snake-demo.png (renamed from doc/src/images/qml-snake-demo.png) | bin | 105053 -> 105053 bytes | |||
-rw-r--r-- | examples/demos/doc/images/qml-twitter-demo.png (renamed from doc/src/images/qml-twitter-demo.png) | bin | 95812 -> 95812 bytes | |||
-rw-r--r-- | examples/demos/doc/src/qml-calculator.qdoc | 37 | ||||
-rw-r--r-- | examples/demos/doc/src/qml-minehunt.qdoc | 38 | ||||
-rw-r--r-- | examples/demos/doc/src/qml-photoviewer.qdoc | 37 | ||||
-rw-r--r-- | examples/demos/doc/src/qml-rssnews.qdoc | 37 | ||||
-rw-r--r-- | examples/demos/doc/src/qml-samegame.qdoc | 38 | ||||
-rw-r--r-- | examples/demos/doc/src/qml-snake.qdoc | 38 | ||||
-rw-r--r-- | examples/demos/doc/src/qml-twitter.qdoc | 38 | ||||
-rw-r--r-- | examples/examples.pro | 4 | ||||
-rw-r--r-- | examples/helper/helper.pro | 9 | ||||
-rw-r--r-- | src/declarative/declarative.pro | 1 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativeitem.cpp | 22 | ||||
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativepathview.cpp | 95 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 16 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 3 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 2 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeexpression.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativeexpression_p.h | 2 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativefastproperties_p.h | 2 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativemetatype.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativevaluetype.cpp | 12 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 2 | ||||
-rw-r--r-- | src/declarative/qml/qdeclarativexmlhttprequest.cpp | 2 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativeanimation_p.h | 11 | ||||
-rw-r--r-- | src/declarative/util/qdeclarativefontloader.cpp | 4 | ||||
-rw-r--r-- | src/doc/doc.pro | 2 | ||||
-rw-r--r-- | src/doc/qtdeclarative.qdocconf | 31 | ||||
-rw-r--r-- | src/doc/src/declarative/advtutorial.qdoc (renamed from doc/src/declarative/advtutorial.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/anchor-layout.qdoc (renamed from doc/src/declarative/anchor-layout.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/animation.qdoc (renamed from doc/src/declarative/animation.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/basicelements.qdoc (renamed from doc/src/declarative/basicelements.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/basictypes.qdoc (renamed from doc/src/declarative/basictypes.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/behaviors-and-states.qdoc (renamed from doc/src/declarative/behaviors-and-states.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/codingconventions.qdoc (renamed from doc/src/declarative/codingconventions.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/declarativeui.qdoc (renamed from doc/src/declarative/declarativeui.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/dynamicobjects.qdoc (renamed from doc/src/declarative/dynamicobjects.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/elements.qdoc (renamed from doc/src/declarative/elements.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/example-slideswitch.qdoc (renamed from doc/src/declarative/example-slideswitch.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/examples.qdoc (renamed from doc/src/declarative/examples.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/extending-tutorial.qdoc (renamed from doc/src/declarative/extending-tutorial.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/extending.qdoc (renamed from doc/src/declarative/extending.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/focus.qdoc (renamed from doc/src/declarative/focus.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/globalobject.qdoc (renamed from doc/src/declarative/globalobject.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/integrating.qdoc (renamed from doc/src/declarative/integrating.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/javascriptblocks.qdoc (renamed from doc/src/declarative/javascriptblocks.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/modules.qdoc (renamed from doc/src/declarative/modules.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/mouseevents.qdoc (renamed from doc/src/declarative/mouseevents.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/network.qdoc (renamed from doc/src/declarative/network.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/pics/3d-axis.png (renamed from doc/src/declarative/pics/3d-axis.png) | bin | 13840 -> 13840 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/3d-rotation-axis.png (renamed from doc/src/declarative/pics/3d-rotation-axis.png) | bin | 11078 -> 11078 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/BorderImage.png (renamed from doc/src/declarative/pics/BorderImage.png) | bin | 8094 -> 8094 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/ListViewHighlight.png (renamed from doc/src/declarative/pics/ListViewHighlight.png) | bin | 3582 -> 3582 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/ListViewHorizontal.png (renamed from doc/src/declarative/pics/ListViewHorizontal.png) | bin | 5802 -> 5802 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/ListViewVertical.png (renamed from doc/src/declarative/pics/ListViewVertical.png) | bin | 2424 -> 2424 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/anatomy-component.png (renamed from doc/src/declarative/pics/anatomy-component.png) | bin | 4902 -> 4902 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/anchorchanges.png (renamed from doc/src/declarative/pics/anchorchanges.png) | bin | 566 -> 566 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/anchors.svg (renamed from doc/src/declarative/pics/anchors.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/pics/animatedimageitem.gif (renamed from doc/src/declarative/pics/animatedimageitem.gif) | bin | 9997 -> 9997 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/axisrotation.png (renamed from doc/src/declarative/pics/axisrotation.png) | bin | 8891 -> 8891 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/blur_example.png (renamed from doc/src/declarative/pics/blur_example.png) | bin | 64019 -> 64019 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/content.png (renamed from doc/src/declarative/pics/content.png) | bin | 1978 -> 1978 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/declarative-adv-tutorial1.png (renamed from doc/src/declarative/pics/declarative-adv-tutorial1.png) | bin | 203229 -> 203229 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/declarative-adv-tutorial2.png (renamed from doc/src/declarative/pics/declarative-adv-tutorial2.png) | bin | 249451 -> 249451 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/declarative-adv-tutorial3.png (renamed from doc/src/declarative/pics/declarative-adv-tutorial3.png) | bin | 283378 -> 283378 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/declarative-adv-tutorial4.gif (renamed from doc/src/declarative/pics/declarative-adv-tutorial4.gif) | bin | 1687445 -> 1687445 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/declarative-qmlfocus1.png (renamed from doc/src/declarative/pics/declarative-qmlfocus1.png) | bin | 22047 -> 22047 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/declarative-qmlfocus2.png (renamed from doc/src/declarative/pics/declarative-qmlfocus2.png) | bin | 24225 -> 24225 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/declarative-qmlfocus3.png (renamed from doc/src/declarative/pics/declarative-qmlfocus3.png) | bin | 26300 -> 26300 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/declarative-qmlfocus4.png (renamed from doc/src/declarative/pics/declarative-qmlfocus4.png) | bin | 21401 -> 21401 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/dial-example.gif (renamed from doc/src/declarative/pics/dial-example.gif) | bin | 566465 -> 566465 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/edge1.png (renamed from doc/src/declarative/pics/edge1.png) | bin | 3423 -> 3423 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/edge2.png (renamed from doc/src/declarative/pics/edge2.png) | bin | 3436 -> 3436 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/edge3.png (renamed from doc/src/declarative/pics/edge3.png) | bin | 3854 -> 3854 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/edge4.png (renamed from doc/src/declarative/pics/edge4.png) | bin | 5152 -> 5152 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/edges.png (renamed from doc/src/declarative/pics/edges.png) | bin | 15226 -> 15226 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/edges.svg (renamed from doc/src/declarative/pics/edges.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/pics/edges_examples.svg (renamed from doc/src/declarative/pics/edges_examples.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/pics/edges_qml.png (renamed from doc/src/declarative/pics/edges_qml.png) | bin | 21731 -> 21731 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/edges_qml.svg (renamed from doc/src/declarative/pics/edges_qml.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/pics/extending-tutorial-chapter1.png (renamed from doc/src/declarative/pics/extending-tutorial-chapter1.png) | bin | 6687 -> 6687 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/extending-tutorial-chapter2.png (renamed from doc/src/declarative/pics/extending-tutorial-chapter2.png) | bin | 7318 -> 7318 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/extending-tutorial-chapter3.png (renamed from doc/src/declarative/pics/extending-tutorial-chapter3.png) | bin | 8145 -> 8145 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/extending-tutorial-chapter5.png (renamed from doc/src/declarative/pics/extending-tutorial-chapter5.png) | bin | 5557 -> 5557 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/flickable.gif (renamed from doc/src/declarative/pics/flickable.gif) | bin | 185221 -> 185221 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/flipable.gif (renamed from doc/src/declarative/pics/flipable.gif) | bin | 131710 -> 131710 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/gridLayout_example.png (renamed from doc/src/declarative/pics/gridLayout_example.png) | bin | 437 -> 437 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/gridview-highlight.png (renamed from doc/src/declarative/pics/gridview-highlight.png) | bin | 11806 -> 11806 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/gridview-simple.png (renamed from doc/src/declarative/pics/gridview-simple.png) | bin | 10149 -> 10149 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/highlight.gif (renamed from doc/src/declarative/pics/highlight.gif) | bin | 18259 -> 18259 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/horizontalpositioner_example.png (renamed from doc/src/declarative/pics/horizontalpositioner_example.png) | bin | 292 -> 292 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/imageprovider.png (renamed from doc/src/declarative/pics/imageprovider.png) | bin | 420 -> 420 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/layoutmirroring.png (renamed from doc/src/declarative/pics/layoutmirroring.png) | bin | 2542 -> 2542 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/listmodel-nested.png (renamed from doc/src/declarative/pics/listmodel-nested.png) | bin | 7493 -> 7493 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/listmodel.png (renamed from doc/src/declarative/pics/listmodel.png) | bin | 3407 -> 3407 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/listview-highlight.png (renamed from doc/src/declarative/pics/listview-highlight.png) | bin | 5918 -> 5918 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/listview-simple.png (renamed from doc/src/declarative/pics/listview-simple.png) | bin | 5351 -> 5351 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/margins_qml.png (renamed from doc/src/declarative/pics/margins_qml.png) | bin | 18476 -> 18476 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/margins_qml.svg (renamed from doc/src/declarative/pics/margins_qml.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/pics/parentchange.png (renamed from doc/src/declarative/pics/parentchange.png) | bin | 509 -> 509 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/particles.gif (renamed from doc/src/declarative/pics/particles.gif) | bin | 163068 -> 163068 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/pathview.gif (renamed from doc/src/declarative/pics/pathview.gif) | bin | 90512 -> 90512 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/positioner-add.gif (renamed from doc/src/declarative/pics/positioner-add.gif) | bin | 7821 -> 7821 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/positioner-move.gif (renamed from doc/src/declarative/pics/positioner-move.gif) | bin | 6154 -> 6154 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/positioner-remove.gif (renamed from doc/src/declarative/pics/positioner-remove.gif) | bin | 5610 -> 5610 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/propanim.gif (renamed from doc/src/declarative/pics/propanim.gif) | bin | 74909 -> 74909 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/qml-context-object.png (renamed from doc/src/declarative/pics/qml-context-object.png) | bin | 23602 -> 23602 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/qml-context-tree.png (renamed from doc/src/declarative/pics/qml-context-tree.png) | bin | 10337 -> 10337 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/qml-context.png (renamed from doc/src/declarative/pics/qml-context.png) | bin | 61465 -> 61465 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/qml-extending-types.png (renamed from doc/src/declarative/pics/qml-extending-types.png) | bin | 738 -> 738 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/qml-gradient.png (renamed from doc/src/declarative/pics/qml-gradient.png) | bin | 364 -> 364 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/qml-scope.png (renamed from doc/src/declarative/pics/qml-scope.png) | bin | 47564 -> 47564 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/qtlogo.png (renamed from doc/src/declarative/pics/qtlogo.png) | bin | 2738 -> 2738 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/rect-border-width.png (renamed from doc/src/declarative/pics/rect-border-width.png) | bin | 374 -> 374 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/rect-color.png (renamed from doc/src/declarative/pics/rect-color.png) | bin | 570 -> 570 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/rect-smooth.png (renamed from doc/src/declarative/pics/rect-smooth.png) | bin | 24241 -> 24241 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/reflection_example.png (renamed from doc/src/declarative/pics/reflection_example.png) | bin | 30919 -> 30919 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/repeater-index.png (renamed from doc/src/declarative/pics/repeater-index.png) | bin | 3024 -> 3024 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/repeater-modeldata.png (renamed from doc/src/declarative/pics/repeater-modeldata.png) | bin | 3394 -> 3394 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/repeater-simple.png (renamed from doc/src/declarative/pics/repeater-simple.png) | bin | 404 -> 404 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/repeater.png (renamed from doc/src/declarative/pics/repeater.png) | bin | 800 -> 800 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/scalegrid.svg (renamed from doc/src/declarative/pics/scalegrid.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/pics/shaderexample.png (renamed from doc/src/declarative/pics/shaderexample.png) | bin | 3941 -> 3941 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/shadow_example.png (renamed from doc/src/declarative/pics/shadow_example.png) | bin | 4775 -> 4775 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/squish-transform.png (renamed from doc/src/declarative/pics/squish-transform.png) | bin | 9652 -> 9652 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/squish.png (renamed from doc/src/declarative/pics/squish.png) | bin | 8590 -> 8590 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/switch-example.gif (renamed from doc/src/declarative/pics/switch-example.gif) | bin | 25270 -> 25270 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/translate.png (renamed from doc/src/declarative/pics/translate.png) | bin | 398 -> 398 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/verticalpositioner_example.png (renamed from doc/src/declarative/pics/verticalpositioner_example.png) | bin | 385 -> 385 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/verticalpositioner_transition.gif (renamed from doc/src/declarative/pics/verticalpositioner_transition.gif) | bin | 12641 -> 12641 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/visualitemmodel.png (renamed from doc/src/declarative/pics/visualitemmodel.png) | bin | 347 -> 347 bytes | |||
-rw-r--r-- | src/doc/src/declarative/pics/webview.png (renamed from doc/src/declarative/pics/webview.png) | bin | 126662 -> 126662 bytes | |||
-rw-r--r-- | src/doc/src/declarative/positioners.qdoc (renamed from doc/src/declarative/positioners.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/propertybinding.qdoc (renamed from doc/src/declarative/propertybinding.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativedebugging.qdoc (renamed from doc/src/declarative/qdeclarativedebugging.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativedocument.qdoc (renamed from doc/src/declarative/qdeclarativedocument.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativei18n.qdoc (renamed from doc/src/declarative/qdeclarativei18n.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativeintro.qdoc (renamed from doc/src/declarative/qdeclarativeintro.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativemodels.qdoc (renamed from doc/src/declarative/qdeclarativemodels.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativeperformance.qdoc (renamed from doc/src/declarative/qdeclarativeperformance.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativesecurity.qdoc (renamed from doc/src/declarative/qdeclarativesecurity.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qdeclarativestates.qdoc (renamed from doc/src/declarative/qdeclarativestates.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmlevents.qdoc (renamed from doc/src/declarative/qmlevents.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmlinuse.qdoc (renamed from doc/src/declarative/qmlinuse.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmlreusablecomponents.qdoc (renamed from doc/src/declarative/qmlreusablecomponents.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmlruntime.qdoc (renamed from doc/src/declarative/qmlruntime.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmlsyntax.qdoc (renamed from doc/src/declarative/qmlsyntax.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmltexthandling.qdoc (renamed from doc/src/declarative/qmltexthandling.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmlviewer.qdoc (renamed from doc/src/declarative/qmlviewer.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmlviews.qdoc (renamed from doc/src/declarative/qmlviews.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qmlwebkit.qdoc (renamed from doc/src/declarative/qmlwebkit.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qtbinding.qdoc (renamed from doc/src/declarative/qtbinding.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qtdeclarative.qdoc (renamed from doc/src/declarative/qtdeclarative.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qtprogrammers.qdoc (renamed from doc/src/declarative/qtprogrammers.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/qtquick-intro.qdoc (renamed from doc/src/declarative/qtquick-intro.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/righttoleft.qdoc (renamed from doc/src/declarative/righttoleft.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/scope.qdoc (renamed from doc/src/declarative/scope.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/tutorial.qdoc (renamed from doc/src/declarative/tutorial.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/declarative/whatsnew.qdoc (renamed from doc/src/declarative/whatsnew.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/demos/qml-qtbubblelevel.qdoc (renamed from doc/src/demos/qml-qtbubblelevel.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-calculator.qdoc (renamed from doc/src/examples/qml-calculator.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-examples.qdoc (renamed from doc/src/examples/qml-examples.qdoc) | 365 | ||||
-rw-r--r-- | src/doc/src/examples/qml-extending.qdoc (renamed from doc/src/examples/qml-extending.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-flickr.qdoc (renamed from doc/src/examples/qml-flickr.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-folderlistmodel.qdoc (renamed from doc/src/examples/qml-folderlistmodel.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-minehunt.qdoc (renamed from doc/src/examples/qml-minehunt.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-photoviewer.qdoc (renamed from doc/src/examples/qml-photoviewer.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-rssnews.qdoc (renamed from doc/src/examples/qml-rssnews.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-samegame.qdoc (renamed from doc/src/examples/qml-samegame.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-snake.qdoc (renamed from doc/src/examples/qml-snake.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-twitter.qdoc (renamed from doc/src/examples/qml-twitter.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/examples/qml-webbrowser.qdoc (renamed from doc/src/examples/qml-webbrowser.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/getting-started/gettingstartedqml.qdoc (renamed from doc/src/getting-started/gettingstartedqml.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc (renamed from doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/howtos/qmlbestpractices/qmlbestpractices-datatypes.qdoc (renamed from doc/src/howtos/qmlbestpractices/qmlbestpractices-datatypes.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/images/declarative-anchors_example.png (renamed from doc/src/images/declarative-anchors_example.png) | bin | 3654 -> 3654 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-anchors_example2.png (renamed from doc/src/images/declarative-anchors_example2.png) | bin | 3819 -> 3819 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-colors.png (renamed from doc/src/images/declarative-colors.png) | bin | 4993 -> 4993 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-examples.png (renamed from doc/src/images/declarative-examples.png) | bin | 39074 -> 39074 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-folderlistmodel.png (renamed from doc/src/images/declarative-folderlistmodel.png) | bin | 14963 -> 14963 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-image_tile.png (renamed from doc/src/images/declarative-image_tile.png) | bin | 396 -> 396 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-item_opacity1.png (renamed from doc/src/images/declarative-item_opacity1.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-item_opacity2.png (renamed from doc/src/images/declarative-item_opacity2.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-item_stacking1.png (renamed from doc/src/images/declarative-item_stacking1.png) | bin | 460 -> 460 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-item_stacking2.png (renamed from doc/src/images/declarative-item_stacking2.png) | bin | 461 -> 461 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-item_stacking3.png (renamed from doc/src/images/declarative-item_stacking3.png) | bin | 464 -> 464 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-item_stacking4.png (renamed from doc/src/images/declarative-item_stacking4.png) | bin | 463 -> 463 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-nopercent.png (renamed from doc/src/images/declarative-nopercent.png) | bin | 553 -> 553 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-pathattribute.png (renamed from doc/src/images/declarative-pathattribute.png) | bin | 7207 -> 7207 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-pathcubic.png (renamed from doc/src/images/declarative-pathcubic.png) | bin | 1261 -> 1261 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-pathquad.png (renamed from doc/src/images/declarative-pathquad.png) | bin | 1517 -> 1517 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-percent.png (renamed from doc/src/images/declarative-percent.png) | bin | 530 -> 530 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qmlfocus1.png (renamed from doc/src/images/declarative-qmlfocus1.png) | bin | 1890 -> 1890 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qmlfocus2.png (renamed from doc/src/images/declarative-qmlfocus2.png) | bin | 2756 -> 2756 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qmlfocus3.png (renamed from doc/src/images/declarative-qmlfocus3.png) | bin | 2743 -> 2743 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qmlfocus4.png (renamed from doc/src/images/declarative-qmlfocus4.png) | bin | 4137 -> 4137 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qmlfocus5.png (renamed from doc/src/images/declarative-qmlfocus5.png) | bin | 1376 -> 1376 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qtlogo-preserveaspectcrop.png (renamed from doc/src/images/declarative-qtlogo-preserveaspectcrop.png) | bin | 6440 -> 6440 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qtlogo-preserveaspectfit.png (renamed from doc/src/images/declarative-qtlogo-preserveaspectfit.png) | bin | 4076 -> 4076 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qtlogo-stretch.png (renamed from doc/src/images/declarative-qtlogo-stretch.png) | bin | 5584 -> 5584 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qtlogo-tile.png (renamed from doc/src/images/declarative-qtlogo-tile.png) | bin | 3940 -> 3940 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qtlogo-tilehorizontally.png (renamed from doc/src/images/declarative-qtlogo-tilehorizontally.png) | bin | 5544 -> 5544 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qtlogo-tilevertically.png (renamed from doc/src/images/declarative-qtlogo-tilevertically.png) | bin | 6288 -> 6288 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-qtlogo.png (renamed from doc/src/images/declarative-qtlogo.png) | bin | 3436 -> 3436 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-rect.png (renamed from doc/src/images/declarative-rect.png) | bin | 674 -> 674 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-rect_gradient.png (renamed from doc/src/images/declarative-rect_gradient.png) | bin | 873 -> 873 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-rect_tint.png (renamed from doc/src/images/declarative-rect_tint.png) | bin | 363 -> 363 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-removebutton-close.png (renamed from doc/src/images/declarative-removebutton-close.png) | bin | 3973 -> 3973 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-removebutton-open.png (renamed from doc/src/images/declarative-removebutton-open.png) | bin | 5413 -> 5413 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-removebutton.gif (renamed from doc/src/images/declarative-removebutton.gif) | bin | 183008 -> 183008 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-removebutton.png (renamed from doc/src/images/declarative-removebutton.png) | bin | 6725 -> 6725 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-reuse-1.png (renamed from doc/src/images/declarative-reuse-1.png) | bin | 3489 -> 3489 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-reuse-2.png (renamed from doc/src/images/declarative-reuse-2.png) | bin | 3700 -> 3700 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-reuse-3.png (renamed from doc/src/images/declarative-reuse-3.png) | bin | 8829 -> 8829 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-reuse-bluerect.png (renamed from doc/src/images/declarative-reuse-bluerect.png) | bin | 1474 -> 1474 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-reuse-focus.png (renamed from doc/src/images/declarative-reuse-focus.png) | bin | 8026 -> 8026 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-rotation.png (renamed from doc/src/images/declarative-rotation.png) | bin | 667 -> 667 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-roundrect.png (renamed from doc/src/images/declarative-roundrect.png) | bin | 3058 -> 3058 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-samegame.png (renamed from doc/src/images/declarative-samegame.png) | bin | 124904 -> 124904 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-scale.png (renamed from doc/src/images/declarative-scale.png) | bin | 336 -> 336 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-scalegrid.png (renamed from doc/src/images/declarative-scalegrid.png) | bin | 4228 -> 4228 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-text.png (renamed from doc/src/images/declarative-text.png) | bin | 3289 -> 3289 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-textedit.gif (renamed from doc/src/images/declarative-textedit.gif) | bin | 15286 -> 15286 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-textformat.png (renamed from doc/src/images/declarative-textformat.png) | bin | 11498 -> 11498 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-textstyle.png (renamed from doc/src/images/declarative-textstyle.png) | bin | 6825 -> 6825 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-transformorigin.png (renamed from doc/src/images/declarative-transformorigin.png) | bin | 8927 -> 8927 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-tutorial-list-closed.png (renamed from doc/src/images/declarative-tutorial-list-closed.png) | bin | 11854 -> 11854 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-tutorial-list-open.png (renamed from doc/src/images/declarative-tutorial-list-open.png) | bin | 14745 -> 14745 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-tutorial-list.png (renamed from doc/src/images/declarative-tutorial-list.png) | bin | 10723 -> 10723 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-tutorial1.png (renamed from doc/src/images/declarative-tutorial1.png) | bin | 3577 -> 3577 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-tutorial2.png (renamed from doc/src/images/declarative-tutorial2.png) | bin | 3913 -> 3913 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-tutorial3.gif (renamed from doc/src/images/declarative-tutorial3.gif) | bin | 3317 -> 3317 bytes | |||
-rw-r--r-- | src/doc/src/images/declarative-tutorial3_animation.gif (renamed from doc/src/images/declarative-tutorial3_animation.gif) | bin | 301974 -> 301974 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-abstractitemmodel-example.png (renamed from doc/src/images/qml-abstractitemmodel-example.png) | bin | 4478 -> 4478 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-behaviors-example.png (renamed from doc/src/images/qml-behaviors-example.png) | bin | 6367 -> 6367 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-borderimage-example.png (renamed from doc/src/images/qml-borderimage-example.png) | bin | 25204 -> 25204 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-borderimage-normal-image.png (renamed from doc/src/images/qml-borderimage-normal-image.png) | bin | 5282 -> 5282 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-borderimage-scaled.png (renamed from doc/src/images/qml-borderimage-scaled.png) | bin | 5580 -> 5580 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-borderimage-shadows-example.png (renamed from doc/src/images/qml-borderimage-shadows-example.png) | bin | 2606 -> 2606 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-borderimage-tiled.png (renamed from doc/src/images/qml-borderimage-tiled.png) | bin | 5889 -> 5889 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-calculator-example-small.png (renamed from doc/src/images/qml-calculator-example-small.png) | bin | 16575 -> 16575 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-calculator-example.png | bin | 0 -> 33892 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-clocks-example.png (renamed from doc/src/images/qml-clocks-example.png) | bin | 40742 -> 40742 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-coloranim-example.png (renamed from doc/src/images/qml-coloranim-example.png) | bin | 6184 -> 6184 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-column.png (renamed from doc/src/images/qml-column.png) | bin | 6264 -> 6264 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-corkboards-example.png (renamed from doc/src/images/qml-corkboards-example.png) | bin | 179625 -> 179625 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-dialcontrol-example.png (renamed from doc/src/images/qml-dialcontrol-example.png) | bin | 33569 -> 33569 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-dynamicscene-example.png (renamed from doc/src/images/qml-dynamicscene-example.png) | bin | 71620 -> 71620 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-easing-example.png (renamed from doc/src/images/qml-easing-example.png) | bin | 29397 -> 29397 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-flickr-demo-small.png (renamed from doc/src/images/qml-flickr-demo-small.png) | bin | 40934 -> 40934 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-flickr-demo.png (renamed from doc/src/images/qml-flickr-demo.png) | bin | 280730 -> 280730 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-flipable-example.png (renamed from doc/src/images/qml-flipable-example.png) | bin | 13301 -> 13301 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-flow-snippet.png (renamed from doc/src/images/qml-flow-snippet.png) | bin | 11465 -> 11465 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-flow-text1.png (renamed from doc/src/images/qml-flow-text1.png) | bin | 9647 -> 9647 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-flow-text2.png (renamed from doc/src/images/qml-flow-text2.png) | bin | 10870 -> 10870 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-focus-example.png (renamed from doc/src/images/qml-focus-example.png) | bin | 31370 -> 31370 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-fonts-availableFonts-example.png (renamed from doc/src/images/qml-fonts-availableFonts-example.png) | bin | 33674 -> 33674 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-fonts-banner-example.png (renamed from doc/src/images/qml-fonts-banner-example.png) | bin | 8502 -> 8502 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-fonts-fonts-example.png (renamed from doc/src/images/qml-fonts-fonts-example.png) | bin | 41568 -> 41568 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-fonts-hello-example.png (renamed from doc/src/images/qml-fonts-hello-example.png) | bin | 3213 -> 3213 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-grid-no-spacing.png (renamed from doc/src/images/qml-grid-no-spacing.png) | bin | 416 -> 416 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-grid-spacing.png (renamed from doc/src/images/qml-grid-spacing.png) | bin | 421 -> 421 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-gridview-example.png (renamed from doc/src/images/qml-gridview-example.png) | bin | 24321 -> 24321 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-guitartuner-example.png (renamed from doc/src/images/qml-guitartuner-example.png) | bin | 46135 -> 46135 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-i18n-example.png (renamed from doc/src/images/qml-i18n-example.png) | bin | 7683 -> 7683 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-image-example.png (renamed from doc/src/images/qml-image-example.png) | bin | 49584 -> 49584 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-imageprovider-example.png (renamed from doc/src/images/qml-imageprovider-example.png) | bin | 2259 -> 2259 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-layoutitem-example.png (renamed from doc/src/images/qml-layoutitem-example.png) | bin | 3817 -> 3817 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-listview-dynamiclist-example.png (renamed from doc/src/images/qml-listview-dynamiclist-example.png) | bin | 33091 -> 33091 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-listview-expandingdelegates-example.png (renamed from doc/src/images/qml-listview-expandingdelegates-example.png) | bin | 46012 -> 46012 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-listview-highlight-example.png (renamed from doc/src/images/qml-listview-highlight-example.png) | bin | 14216 -> 14216 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-listview-highlightranges-example.png (renamed from doc/src/images/qml-listview-highlightranges-example.png) | bin | 44290 -> 44290 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-listview-sections-example.png (renamed from doc/src/images/qml-listview-sections-example.png) | bin | 5491 -> 5491 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-listview-snippet.png (renamed from doc/src/images/qml-listview-snippet.png) | bin | 2048 -> 2048 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-minehunt-demo-small.png (renamed from doc/src/images/qml-minehunt-demo-small.png) | bin | 26977 -> 26977 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-minehunt-demo.png | bin | 0 -> 170648 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-mousearea-example.png (renamed from doc/src/images/qml-mousearea-example.png) | bin | 6969 -> 6969 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-mousearea-snippet.png (renamed from doc/src/images/qml-mousearea-snippet.png) | bin | 780 -> 780 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-objectlistmodel-example.png (renamed from doc/src/images/qml-objectlistmodel-example.png) | bin | 1618 -> 1618 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-package-example.png (renamed from doc/src/images/qml-package-example.png) | bin | 4597 -> 4597 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-parallax-example.png (renamed from doc/src/images/qml-parallax-example.png) | bin | 145854 -> 145854 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-pathview-example.png (renamed from doc/src/images/qml-pathview-example.png) | bin | 22077 -> 22077 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-photoviewer-demo-small.png (renamed from doc/src/images/qml-photoviewer-demo-small.png) | bin | 35633 -> 35633 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-photoviewer-demo.png | bin | 0 -> 473306 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-plugins-example.png (renamed from doc/src/images/qml-plugins-example.png) | bin | 15773 -> 15773 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-positioners-example.png (renamed from doc/src/images/qml-positioners-example.png) | bin | 26813 -> 26813 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-positioners-layoutdirection-example.png (renamed from doc/src/images/qml-positioners-layoutdirection-example.png) | bin | 13019 -> 13019 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-progressbar-example.png (renamed from doc/src/images/qml-progressbar-example.png) | bin | 15188 -> 15188 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-propertyanim-example.png (renamed from doc/src/images/qml-propertyanim-example.png) | bin | 5028 -> 5028 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-qgraphicsgridlayout-example.png (renamed from doc/src/images/qml-qgraphicsgridlayout-example.png) | bin | 34384 -> 34384 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-qgraphicslinearlayout-example.png (renamed from doc/src/images/qml-qgraphicslinearlayout-example.png) | bin | 21677 -> 21677 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-qtbubblelevel-demo.png (renamed from doc/src/images/qml-qtbubblelevel-demo.png) | bin | 72591 -> 72591 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-qwidgets-example.png (renamed from doc/src/images/qml-qwidgets-example.png) | bin | 13394 -> 13394 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-repeater-grid-index.png (renamed from doc/src/images/qml-repeater-grid-index.png) | bin | 17964 -> 17964 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-righttoleft-layoutdirection-example.png (renamed from doc/src/images/qml-righttoleft-layoutdirection-example.png) | bin | 23327 -> 23327 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-righttoleft-layoutmirroring-example.png (renamed from doc/src/images/qml-righttoleft-layoutmirroring-example.png) | bin | 38982 -> 38982 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-row.png (renamed from doc/src/images/qml-row.png) | bin | 3090 -> 3090 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-rssnews-demo-small.png (renamed from doc/src/images/qml-rssnews-demo-small.png) | bin | 19489 -> 19489 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-rssnews-demo.png | bin | 0 -> 128307 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-samegame-demo-small.png (renamed from doc/src/images/qml-samegame-demo-small.png) | bin | 36596 -> 36596 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-samegame-demo.png | bin | 0 -> 213137 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-scrollbar-example.png (renamed from doc/src/images/qml-scrollbar-example.png) | bin | 266986 -> 266986 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-searchbox-example.png (renamed from doc/src/images/qml-searchbox-example.png) | bin | 8170 -> 8170 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-shadereffects-example.png (renamed from doc/src/images/qml-shadereffects-example.png) | bin | 271264 -> 271264 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-slideswitch-example.png (renamed from doc/src/images/qml-slideswitch-example.png) | bin | 8298 -> 8298 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-snake-demo-small.png (renamed from doc/src/images/qml-snake-demo-small.png) | bin | 17895 -> 17895 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-snake-demo.png | bin | 0 -> 105053 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-spinner-example.png (renamed from doc/src/images/qml-spinner-example.png) | bin | 5637 -> 5637 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-states-example.png (renamed from doc/src/images/qml-states-example.png) | bin | 4344 -> 4344 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-stringlistmodel-example.png (renamed from doc/src/images/qml-stringlistmodel-example.png) | bin | 1612 -> 1612 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-tabwidget-example.png (renamed from doc/src/images/qml-tabwidget-example.png) | bin | 5298 -> 5298 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor1_button.png | bin | 0 -> 1670 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor1_editmenu.png (renamed from doc/src/images/qml-texteditor1_editmenu.png) | bin | 7358 -> 7358 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor1_filemenu.png (renamed from doc/src/images/qml-texteditor1_filemenu.png) | bin | 7078 -> 7078 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor1_simplebutton.png | bin | 0 -> 1055 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor2_menubar.png (renamed from doc/src/images/qml-texteditor2_menubar.png) | bin | 7975 -> 7975 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor3_textarea.png (renamed from doc/src/images/qml-texteditor3_textarea.png) | bin | 10417 -> 10417 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor3_texteditor.png (renamed from doc/src/images/qml-texteditor3_texteditor.png) | bin | 61353 -> 61353 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor4_texteditor.png (renamed from doc/src/images/qml-texteditor4_texteditor.png) | bin | 75600 -> 75600 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor5_editmenu.png (renamed from doc/src/images/qml-texteditor5_editmenu.png) | bin | 31834 -> 31834 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor5_filemenu.png (renamed from doc/src/images/qml-texteditor5_filemenu.png) | bin | 21688 -> 21688 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-texteditor5_newfile.png (renamed from doc/src/images/qml-texteditor5_newfile.png) | bin | 92794 -> 92794 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-textselection-example.png (renamed from doc/src/images/qml-textselection-example.png) | bin | 21889 -> 21889 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-tic-tac-toe-example.png (renamed from doc/src/images/qml-tic-tac-toe-example.png) | bin | 24275 -> 24275 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-transitions-example.png (renamed from doc/src/images/qml-transitions-example.png) | bin | 4377 -> 4377 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-tvtennis-example.png (renamed from doc/src/images/qml-tvtennis-example.png) | bin | 1385 -> 1385 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-twitter-demo-small.png (renamed from doc/src/images/qml-twitter-demo-small.png) | bin | 19807 -> 19807 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-twitter-demo.png | bin | 0 -> 95812 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-visualitemmodel-example.png (renamed from doc/src/images/qml-visualitemmodel-example.png) | bin | 2166 -> 2166 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-webbrowser-demo-small.png (renamed from doc/src/images/qml-webbrowser-demo-small.png) | bin | 20924 -> 20924 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-webbrowser-demo.png (renamed from doc/src/images/qml-webbrowser-demo.png) | bin | 85107 -> 85107 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-webview-alert-example.png (renamed from doc/src/images/qml-webview-alert-example.png) | bin | 5417 -> 5417 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-webview-autosize-example.png (renamed from doc/src/images/qml-webview-autosize-example.png) | bin | 11370 -> 11370 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-webview-googlemaps-example.png (renamed from doc/src/images/qml-webview-googlemaps-example.png) | bin | 133411 -> 133411 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-webview-inlinehtml-example.png (renamed from doc/src/images/qml-webview-inlinehtml-example.png) | bin | 3877 -> 3877 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-webview-newwindows-example.png (renamed from doc/src/images/qml-webview-newwindows-example.png) | bin | 6152 -> 6152 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-xmlhttprequest-example.png (renamed from doc/src/images/qml-xmlhttprequest-example.png) | bin | 20934 -> 20934 bytes | |||
-rw-r--r-- | src/doc/src/images/qml-xmllistmodel-example.png (renamed from doc/src/images/qml-xmllistmodel-example.png) | bin | 5252 -> 5252 bytes | |||
-rw-r--r-- | src/doc/src/images/qml.png (renamed from doc/src/images/qml.png) | bin | 8662 -> 8662 bytes | |||
-rw-r--r-- | src/doc/src/images/qmldesigner-visual-editor.png (renamed from doc/src/images/qmldesigner-visual-editor.png) | bin | 102238 -> 102238 bytes | |||
-rw-r--r-- | src/doc/src/images/quick_screens.png (renamed from doc/src/images/quick_screens.png) | bin | 128730 -> 128730 bytes | |||
-rw-r--r-- | src/doc/src/legal/qtdeclarativelicense.qdoc (renamed from doc/src/legal/qtdeclarativelicense.qdoc) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/Button.qml (renamed from doc/src/snippets/declarative/Button.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/SelfDestroyingRect.qml (renamed from doc/src/snippets/declarative/SelfDestroyingRect.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/Sprite.qml (renamed from doc/src/snippets/declarative/Sprite.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/anchoranimation.qml (renamed from doc/src/snippets/declarative/anchoranimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/anchorchanges.qml (renamed from doc/src/snippets/declarative/anchorchanges.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/animatedimage.qml (renamed from doc/src/snippets/declarative/animatedimage.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/animation.qml (renamed from doc/src/snippets/declarative/animation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/application.qml (renamed from doc/src/snippets/declarative/application.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/arrow.png (renamed from doc/src/snippets/declarative/arrow.png) | bin | 454 -> 454 bytes | |||
-rw-r--r-- | src/doc/src/snippets/declarative/behavior.qml (renamed from doc/src/snippets/declarative/behavior.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/bestpractices/group.qml (renamed from doc/src/snippets/declarative/bestpractices/group.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml (renamed from doc/src/snippets/declarative/borderimage/borderimage-defaults.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml (renamed from doc/src/snippets/declarative/borderimage/borderimage-scaled.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml (renamed from doc/src/snippets/declarative/borderimage/borderimage-tiled.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/borderimage/normal-image.qml (renamed from doc/src/snippets/declarative/borderimage/normal-image.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/borderimage/pics/borderframe.png (renamed from doc/src/snippets/declarative/borderimage/pics/borderframe.png) | bin | 3411 -> 3411 bytes | |||
-rw-r--r-- | src/doc/src/snippets/declarative/borderimage/pics/borderframe.svg (renamed from doc/src/snippets/declarative/borderimage/pics/borderframe.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/codingconventions/dotproperties.qml (renamed from doc/src/snippets/declarative/codingconventions/dotproperties.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/codingconventions/javascript-imports.qml (renamed from doc/src/snippets/declarative/codingconventions/javascript-imports.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/codingconventions/javascript.qml (renamed from doc/src/snippets/declarative/codingconventions/javascript.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/codingconventions/lists.qml (renamed from doc/src/snippets/declarative/codingconventions/lists.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/codingconventions/myscript.js (renamed from doc/src/snippets/declarative/codingconventions/myscript.js) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/codingconventions/photo.qml (renamed from doc/src/snippets/declarative/codingconventions/photo.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/codingconventions/private.qml (renamed from doc/src/snippets/declarative/codingconventions/private.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/coloranimation.qml (renamed from doc/src/snippets/declarative/coloranimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/colors.qml (renamed from doc/src/snippets/declarative/colors.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/column/column.qml (renamed from doc/src/snippets/declarative/column/column.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/column/vertical-positioner-transition.qml (renamed from doc/src/snippets/declarative/column/vertical-positioner-transition.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/column/vertical-positioner.qml (renamed from doc/src/snippets/declarative/column/vertical-positioner.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/comments.qml (renamed from doc/src/snippets/declarative/comments.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/component.qml (renamed from doc/src/snippets/declarative/component.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/componentCreation.js (renamed from doc/src/snippets/declarative/componentCreation.js) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/createComponent-simple.qml (renamed from doc/src/snippets/declarative/createComponent-simple.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/createComponent.qml (renamed from doc/src/snippets/declarative/createComponent.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/createQmlObject.qml (renamed from doc/src/snippets/declarative/createQmlObject.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/dynamicObjects-destroy.qml (renamed from doc/src/snippets/declarative/dynamicObjects-destroy.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/events.qml (renamed from doc/src/snippets/declarative/events.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/flickable.qml (renamed from doc/src/snippets/declarative/flickable.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/flickableScrollbar.qml (renamed from doc/src/snippets/declarative/flickableScrollbar.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/flipable/flipable.qml (renamed from doc/src/snippets/declarative/flipable/flipable.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/flow-diagram.qml (renamed from doc/src/snippets/declarative/flow-diagram.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/flow.qml (renamed from doc/src/snippets/declarative/flow.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/advancedFocus.qml (renamed from doc/src/snippets/declarative/focus/advancedFocus.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/basicwidget.qml (renamed from doc/src/snippets/declarative/focus/basicwidget.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/clickablewidget.qml (renamed from doc/src/snippets/declarative/focus/clickablewidget.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/focusColumn.qml (renamed from doc/src/snippets/declarative/focus/focusColumn.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/focusscopewidget.qml (renamed from doc/src/snippets/declarative/focus/focusscopewidget.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/myclickablewidget.qml (renamed from doc/src/snippets/declarative/focus/myclickablewidget.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/myfocusscopewidget.qml (renamed from doc/src/snippets/declarative/focus/myfocusscopewidget.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/mywidget.qml (renamed from doc/src/snippets/declarative/focus/mywidget.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/qmldir (renamed from doc/src/snippets/declarative/focus/qmldir) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/rectangle.qml (renamed from doc/src/snippets/declarative/focus/rectangle.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focus/widget.qml (renamed from doc/src/snippets/declarative/focus/widget.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/focusscopes.qml (renamed from doc/src/snippets/declarative/focusscopes.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/folderlistmodel.qml (renamed from doc/src/snippets/declarative/folderlistmodel.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/gradient.qml (renamed from doc/src/snippets/declarative/gradient.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/grid-spacing.qml (renamed from doc/src/snippets/declarative/grid-spacing.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/grid/grid-items.qml (renamed from doc/src/snippets/declarative/grid/grid-items.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/grid/grid-no-spacing.qml (renamed from doc/src/snippets/declarative/grid/grid-no-spacing.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/grid/grid-spacing.qml (renamed from doc/src/snippets/declarative/grid/grid-spacing.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/grid/grid.qml (renamed from doc/src/snippets/declarative/grid/grid.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/gridview/ContactModel.qml (renamed from doc/src/snippets/declarative/gridview/ContactModel.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/gridview/gridview.qml (renamed from doc/src/snippets/declarative/gridview/gridview.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/gridview/pics/portrait.png (renamed from doc/src/snippets/declarative/gridview/pics/portrait.png) | bin | 3126 -> 3126 bytes | |||
-rw-r--r-- | src/doc/src/snippets/declarative/image.qml (renamed from doc/src/snippets/declarative/image.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/imports/best-practices.qml (renamed from doc/src/snippets/declarative/imports/best-practices.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/imports/chart.qml (renamed from doc/src/snippets/declarative/imports/chart.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/imports/installed-module.qml (renamed from doc/src/snippets/declarative/imports/installed-module.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/imports/merged-named-imports.qml (renamed from doc/src/snippets/declarative/imports/merged-named-imports.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/imports/named-imports.qml (renamed from doc/src/snippets/declarative/imports/named-imports.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/imports/network-imports.qml (renamed from doc/src/snippets/declarative/imports/network-imports.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/imports/qtquick-1.0.qml (renamed from doc/src/snippets/declarative/imports/qtquick-1.0.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/imports/timeexample.qml (renamed from doc/src/snippets/declarative/imports/timeexample.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/integrating-javascript/connectjs.qml (renamed from doc/src/snippets/declarative/integrating-javascript/connectjs.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml (renamed from doc/src/snippets/declarative/integrating-javascript/includejs/app.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js (renamed from doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/integrating-javascript/includejs/script.js (renamed from doc/src/snippets/declarative/integrating-javascript/includejs/script.js) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/integrating-javascript/script.js (renamed from doc/src/snippets/declarative/integrating-javascript/script.js) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/keynavigation.qml (renamed from doc/src/snippets/declarative/keynavigation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/keys/keys-handler.qml (renamed from doc/src/snippets/declarative/keys/keys-handler.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/keys/keys-pressed.qml (renamed from doc/src/snippets/declarative/keys/keys-pressed.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/layoutmirroring.qml (renamed from doc/src/snippets/declarative/layoutmirroring.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listmodel-modify.qml (renamed from doc/src/snippets/declarative/listmodel-modify.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listmodel-nested.qml (renamed from doc/src/snippets/declarative/listmodel-nested.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listmodel-simple.qml (renamed from doc/src/snippets/declarative/listmodel-simple.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listmodel.qml (renamed from doc/src/snippets/declarative/listmodel.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listview-decorations.qml (renamed from doc/src/snippets/declarative/listview-decorations.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listview-sections.qml (renamed from doc/src/snippets/declarative/listview-sections.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listview.qml (renamed from doc/src/snippets/declarative/listview.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listview/ContactModel.qml (renamed from doc/src/snippets/declarative/listview/ContactModel.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listview/listview-snippet.qml (renamed from doc/src/snippets/declarative/listview/listview-snippet.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/listview/listview.qml (renamed from doc/src/snippets/declarative/listview/listview.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/loader/KeyReader.qml (renamed from doc/src/snippets/declarative/loader/KeyReader.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/loader/MyItem.qml (renamed from doc/src/snippets/declarative/loader/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/loader/connections.qml (renamed from doc/src/snippets/declarative/loader/connections.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/loader/focus.qml (renamed from doc/src/snippets/declarative/loader/focus.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/loader/simple.qml (renamed from doc/src/snippets/declarative/loader/simple.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/loader/sizeitem.qml (renamed from doc/src/snippets/declarative/loader/sizeitem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/loader/sizeloader.qml (renamed from doc/src/snippets/declarative/loader/sizeloader.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/models/views-models-delegates.qml (renamed from doc/src/snippets/declarative/models/views-models-delegates.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/models/visual-model-and-view.qml (renamed from doc/src/snippets/declarative/models/visual-model-and-view.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml (renamed from doc/src/snippets/declarative/mousearea/mousearea-snippet.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/mousearea/mousearea.qml (renamed from doc/src/snippets/declarative/mousearea/mousearea.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml (renamed from doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/numberanimation.qml (renamed from doc/src/snippets/declarative/numberanimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/parallelanimation.qml (renamed from doc/src/snippets/declarative/parallelanimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/parentanimation.qml (renamed from doc/src/snippets/declarative/parentanimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/parentchange.qml (renamed from doc/src/snippets/declarative/parentchange.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/pathview/ContactModel.qml (renamed from doc/src/snippets/declarative/pathview/ContactModel.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/pathview/pathattributes.qml (renamed from doc/src/snippets/declarative/pathview/pathattributes.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/pathview/pathview.qml (renamed from doc/src/snippets/declarative/pathview/pathview.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/pathview/pics/qtlogo.png (renamed from doc/src/snippets/declarative/pathview/pics/qtlogo.png) | bin | 2991 -> 2991 bytes | |||
-rw-r--r-- | src/doc/src/snippets/declarative/pics/checker.svg (renamed from doc/src/snippets/declarative/pics/checker.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/pics/qt.png (renamed from doc/src/snippets/declarative/pics/qt.png) | bin | 2991 -> 2991 bytes | |||
-rw-r--r-- | src/doc/src/snippets/declarative/pics/qtlogo.png (renamed from doc/src/snippets/declarative/pics/qtlogo.png) | bin | 2991 -> 2991 bytes | |||
-rw-r--r-- | src/doc/src/snippets/declarative/properties.qml (renamed from doc/src/snippets/declarative/properties.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/propertyaction-sequential.qml (renamed from doc/src/snippets/declarative/propertyaction-sequential.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/propertyaction.qml (renamed from doc/src/snippets/declarative/propertyaction.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/propertyanimation.qml (renamed from doc/src/snippets/declarative/propertyanimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/propertychanges.qml (renamed from doc/src/snippets/declarative/propertychanges.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml (renamed from doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-data-models/listelements.qml (renamed from doc/src/snippets/declarative/qml-data-models/listelements.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml (renamed from doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-documents/inline-component.qml (renamed from doc/src/snippets/declarative/qml-documents/inline-component.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-documents/inline-text-component.qml (renamed from doc/src/snippets/declarative/qml-documents/inline-text-component.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-documents/non-trivial.qml (renamed from doc/src/snippets/declarative/qml-documents/non-trivial.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-documents/qmldocuments.qml (renamed from doc/src/snippets/declarative/qml-documents/qmldocuments.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/components/Button.qml (renamed from doc/src/snippets/declarative/qml-extending-types/components/Button.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/components/application.qml (renamed from doc/src/snippets/declarative/qml-extending-types/components/application.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/methods/app.qml (renamed from doc/src/snippets/declarative/qml-extending-types/methods/app.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml (renamed from doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml (renamed from doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml (renamed from doc/src/snippets/declarative/qml-extending-types/properties/alias.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml (renamed from doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml (renamed from doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/properties/application.qml (renamed from doc/src/snippets/declarative/qml-extending-types/properties/application.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml (renamed from doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml (renamed from doc/src/snippets/declarative/qml-extending-types/signals/Button.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml (renamed from doc/src/snippets/declarative/qml-extending-types/signals/basic.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml (renamed from doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml (renamed from doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml (renamed from doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml (renamed from doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg (renamed from doc/src/snippets/declarative/qml-intro/images/qt-logo.svg) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/context/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/context/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/context/context.pro (renamed from doc/src/snippets/declarative/qtbinding/context/context.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/context/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/context/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/enums/enums.pro (renamed from doc/src/snippets/declarative/qtbinding/enums/enums.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h (renamed from doc/src/snippets/declarative/qtbinding/enums/imageviewer.h) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/enums/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/enums/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/enums/standalone.qml (renamed from doc/src/snippets/declarative/qtbinding/enums/standalone.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro (renamed from doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h (renamed from doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro (renamed from doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/loading/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/loading/loading.pro (renamed from doc/src/snippets/declarative/qtbinding/loading/loading.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/loading/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/loading/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h (renamed from doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/newelements/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/newelements/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/newelements/newelements.pro (renamed from doc/src/snippets/declarative/qtbinding/newelements/newelements.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml (renamed from doc/src/snippets/declarative/qtbinding/newelements/standalone.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h (renamed from doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro (renamed from doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro (renamed from doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/resources/example.qrc (renamed from doc/src/snippets/declarative/qtbinding/resources/example.qrc) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/resources/images/background.png (renamed from doc/src/snippets/declarative/qtbinding/resources/images/background.png) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/resources/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/resources/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/resources/main.qml (renamed from doc/src/snippets/declarative/qtbinding/resources/main.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/resources/resources.pro (renamed from doc/src/snippets/declarative/qtbinding/resources/resources.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml (renamed from doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h (renamed from doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro (renamed from doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml (renamed from doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp (renamed from doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtbinding/variantlistmap/variantlistmap.pro (renamed from doc/src/snippets/declarative/qtbinding/variantlistmap/variantlistmap.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/qtobject.qml (renamed from doc/src/snippets/declarative/qtobject.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/rectangle/rect-border-width.qml (renamed from doc/src/snippets/declarative/rectangle/rect-border-width.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/rectangle/rectangle-colors.qml (renamed from doc/src/snippets/declarative/rectangle/rectangle-colors.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml (renamed from doc/src/snippets/declarative/rectangle/rectangle-gradient.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml (renamed from doc/src/snippets/declarative/rectangle/rectangle-smooth.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/rectangle/rectangle.qml (renamed from doc/src/snippets/declarative/rectangle/rectangle.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml (renamed from doc/src/snippets/declarative/repeaters/repeater-grid-index.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/repeaters/repeater.qml (renamed from doc/src/snippets/declarative/repeaters/repeater.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/reusablecomponents/Button.qml (renamed from doc/src/snippets/declarative/reusablecomponents/Button.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/reusablecomponents/application.qml (renamed from doc/src/snippets/declarative/reusablecomponents/application.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/reusablecomponents/component.qml (renamed from doc/src/snippets/declarative/reusablecomponents/component.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/reusablecomponents/focusbutton.qml (renamed from doc/src/snippets/declarative/reusablecomponents/focusbutton.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/reusablecomponents/qmldir (renamed from doc/src/snippets/declarative/reusablecomponents/qmldir) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/righttoleft.qml (renamed from doc/src/snippets/declarative/righttoleft.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/righttoleft/Child.qml (renamed from doc/src/snippets/declarative/righttoleft/Child.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/rotation.qml (renamed from doc/src/snippets/declarative/rotation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/rotationanimation.qml (renamed from doc/src/snippets/declarative/rotationanimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/row.qml (renamed from doc/src/snippets/declarative/row.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/row/row.qml (renamed from doc/src/snippets/declarative/row/row.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/script.js (renamed from doc/src/snippets/declarative/script.js) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/sequentialanimation.qml (renamed from doc/src/snippets/declarative/sequentialanimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/smoothedanimation.qml (renamed from doc/src/snippets/declarative/smoothedanimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/springanimation.qml (renamed from doc/src/snippets/declarative/springanimation.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/state-when.qml (renamed from doc/src/snippets/declarative/state-when.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/state.qml (renamed from doc/src/snippets/declarative/state.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/states.qml (renamed from doc/src/snippets/declarative/states.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/states/statechangescript.qml (renamed from doc/src/snippets/declarative/states/statechangescript.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/systempalette.qml (renamed from doc/src/snippets/declarative/systempalette.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/text/onLinkActivated.qml (renamed from doc/src/snippets/declarative/text/onLinkActivated.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/texteditor.qml (renamed from doc/src/snippets/declarative/texteditor.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/texthandling.qml (renamed from doc/src/snippets/declarative/texthandling.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/transition-from-to-modified.qml (renamed from doc/src/snippets/declarative/transition-from-to-modified.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/transition-from-to.qml (renamed from doc/src/snippets/declarative/transition-from-to.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/transition-reversible.qml (renamed from doc/src/snippets/declarative/transition-reversible.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/transition.qml (renamed from doc/src/snippets/declarative/transition.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/transitions-list.qml (renamed from doc/src/snippets/declarative/transitions-list.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/visualdatamodel.qml (renamed from doc/src/snippets/declarative/visualdatamodel.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp (renamed from doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml (renamed from doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro (renamed from doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/webview/webview.qml (renamed from doc/src/snippets/declarative/webview/webview.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/workerscript.qml (renamed from doc/src/snippets/declarative/workerscript.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/xmlrole.qml (renamed from doc/src/snippets/declarative/xmlrole.qml) | 0 | ||||
-rw-r--r-- | src/doc/src/snippets/declarative/xmlrole.xml (renamed from doc/src/snippets/declarative/xmlrole.xml) | 0 | ||||
-rw-r--r-- | src/plugins/qdeclarativeview/qdeclarativeview.pro | 1 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro | 1 | ||||
-rw-r--r-- | src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro | 1 | ||||
-rw-r--r-- | src/src.pro | 3 | ||||
-rw-r--r-- | tests/auto/declarative/examples/tst_examples.cpp | 3 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/a.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/b.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/c.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/d.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/e.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/f.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/g.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/h.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/i.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/importOrderJs.qml | 30 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/j.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/k.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/l.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/m.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/n.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/o.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/p.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/q.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/r.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/s.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/t.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/u.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/v.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/w.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/x.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/y.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/data/z.js | 1 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro | 14 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativeimportorder/tst_qdeclarativeimportorder.cpp | 99 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/LocalLast.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/PrivateType.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/qmldir (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/qmldir (renamed from tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir) | 0 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/data/localOrderTest.qml | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp | 156 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativepathview/data/initialCurrentIndex.qml | 60 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp | 367 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro | 3 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 139 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro | 2 | ||||
-rw-r--r-- | tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp | 62 | ||||
-rw-r--r-- | tests/auto/declarative/symbianlibs.pri | 9 | ||||
-rw-r--r-- | tests/auto/headersclean/headersclean.pro | 8 | ||||
-rw-r--r-- | tests/auto/headersclean/qt_headersclean_headers.h | 47 | ||||
-rw-r--r-- | tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro | 1 | ||||
-rw-r--r-- | tools/qml/main.cpp | 4 | ||||
-rw-r--r-- | tools/qml/qdeclarativetester.cpp | 24 | ||||
-rw-r--r-- | tools/qml/qml.pro | 2 | ||||
-rw-r--r-- | tools/qmlplugindump/main.cpp | 2 | ||||
-rw-r--r-- | tools/qmlplugindump/qmlplugindump.pro | 2 |
1096 files changed, 5359 insertions, 1005 deletions
@@ -6,8 +6,8 @@ examples/*/*/* !examples/*/*/README examples/*/*/*[.]app !examples/declarative/* -!examples/tutorials/* -!examples/tutorials/*/* +!examples/declarative/tutorials/* +!examples/declarative/tutorials/*/* !examples/ja_JP/*/* demos/*/* !demos/spectrum/* @@ -268,3 +268,6 @@ tests/auto/*/*.moc tests/auto/*/*/*.o tests/auto/*/*/*.moc src/declarative/generated/ + +# Generated static plugin import sources +*_plugin_import.cpp diff --git a/.qmake.conf b/.qmake.conf index 42ba8e45..5de255cb 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1 +1,2 @@ load(qt_build_config) +CONFIG += qt_example_installs diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 new file mode 100644 index 00000000..cc5a6704 --- /dev/null +++ b/dist/changes-5.0.1 @@ -0,0 +1,51 @@ +Qt 5.0.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.0.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.0/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + +General Improvements +-------------------- + +Third party components +---------------------- + +**************************************************************************** +* Library * +**************************************************************************** + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Compiler Specific Changes * +**************************************************************************** + + +**************************************************************************** +* Tools * +**************************************************************************** + + +**************************************************************************** +* Plugins * +**************************************************************************** + diff --git a/doc/src/qml-folderlistmodel.qdoc b/doc/src/qml-folderlistmodel.qdoc new file mode 100644 index 00000000..9ee6b692 --- /dev/null +++ b/doc/src/qml-folderlistmodel.qdoc @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + +\title FolderListModel - a C++ model plugin +\example src/imports/folderlistmodel + +This plugin shows how to make a C++ model available to QML. It presents +a simple file list for a single folder (directory) and allows the presented +folder to be changed. + +\image declarative-folderlistmodel.png The FolderListModel used to choose a QML file + +We do not explain the model implementation in detail, but rather focus on the mechanics of +making the model available to QML. + +\section1 Usage from QML + +The FolderListModel can be used from QML like this: + +\snippet qml/folderlistmodel.qml 0 + +This displays a list of all subfolders and QML files in the current folder. + +The FolderListModel \c folder property can be set to change the folder that +is currently displayed. + +\section1 Defining the Model + +We are subclassing QAbstractListModel which will allow us to give data to QML and +send notifications when the data changes: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h class begin + +As you see, we also inherit the QDeclarativeParserStatus interface, so that we +can delay initial processing until we have all properties set (via componentComplete() below). + +The first thing to do when devising a new type for QML is to define the properties +you want the type to have: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h class props + +The purposes of each of these should be pretty obvious - in QML we will set the folder +to display (a file: URL), and the kinds of files we want to show in the view of the model. + +Next are the constructor, destructor, and standard QAbstractListModel subclassing requirements: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h abslistmodel + +The data() function is where we provide model values. The rowCount() function +is also a standard part of the QAbstractListModel interface, but we also want to provide +a simpler count property: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h count + +Then we have the functions for the remaining properties which we defined above: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h prop funcs + +Imperative actions upon the model are made available to QML via a Q_INVOKABLE tag on +a normal member function. The isFolder(index) function says whether the value at \e index +is a folder: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h isfolder + +Then we have the QDeclarativeParserStatus interface: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h parserstatus + +Then the NOTIFY function for the folders property. The implementation will emit this +when the folder property is changed. + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h notifier + +The class ends with some implementation details: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h class end + +Lastly, the boilerplare to declare the type for QML use: + +\snippet src/imports/folderlistmodel/qdeclarativefolderlistmodel.h qml decl + +\section1 Connecting the Model to QML + +To make this class available to QML, we only need to make a simple subclass of QDeclarativeExtensionPlugin: + +\snippet src/imports/folderlistmodel/plugin.cpp class decl + +and then use the standard Qt plugin export macro: + +\snippet src/imports/folderlistmodel/plugin.cpp plugin export decl + +Finally, in order for QML to connect the "import" statement to our plugin, we list it in the qmldir file: + +\l{src/imports/folderlistmodel/qmldir} + +This qmldir file and the compiled plugin will be installed in \c $QTDIR/imports/Qt/labs/folderlistmodel/ where +the QML engine will find it (since \c $QTDIR/imports is the value of QLibraryInf::libraryPath()). + +\section1 Implementing the Model + +We'll not discuss the model implementation in detail, as it is not specific to QML - any Qt C++ model +can be interfaced to QML. +This implementation is basically just takes the krufty old QDirModel, +which is a tree with lots of detailed roles and re-presents it as a simpler list model where +each item is just a fileName and a filePath (as a file: URL rather than a plain file, since QML +works with URLs for all content). + +\l{src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp} +*/ diff --git a/examples/declarative/animation/animation.pro b/examples/declarative/animation/animation.pro index 6ac1b645..c9dca1de 100644 --- a/examples/declarative/animation/animation.pro +++ b/examples/declarative/animation/animation.pro @@ -5,9 +5,5 @@ SUBDIRS += \ basics/color-animation \ easing \ behaviors/behavior-example \ + behaviors/wigglytext \ states - -# install -sources.files = animation.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation -INSTALLS += sources diff --git a/examples/declarative/animation/basics/color-animation/color-animation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro index 11dd9d13..f0e805e5 100644 --- a/examples/declarative/animation/basics/color-animation/color-animation.pro +++ b/examples/declarative/animation/basics/color-animation/color-animation.pro @@ -23,9 +23,9 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/color-animation +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/color-animation exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() OTHER_FILES += \ diff --git a/examples/declarative/animation/basics/property-animation/property-animation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro index 28e7ebc3..0c2dcdb1 100644 --- a/examples/declarative/animation/basics/property-animation/property-animation.pro +++ b/examples/declarative/animation/basics/property-animation/property-animation.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/property-animation +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/property-animation exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro index b1b3cd6b..7430b0fc 100644 --- a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro +++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/behaviors/behavior-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/behaviors/behavior-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro index 4c46a119..f8c2b129 100644 --- a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro +++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro @@ -12,15 +12,6 @@ QML_IMPORT_PATH = # Needs to be defined for Symbian #DEFINES += NETWORKACCESS -symbian:TARGET.UID3 = 0xEB6022A4 - -# Smart Installer package's UID -# This UID is from the protected range -# and therefore the package will fail to install if self-signed -# By default qmake uses the unprotected range value if unprotected UID is defined for the application -# and 0x2002CCCF value if protected UID is given to the application -#symbian:DEPLOYMENT.installer_header = 0x2002CCCF - # Define QMLJSDEBUGGER to allow debugging of QML in debug builds # (This might significantly increase build time) # DEFINES += QMLJSDEBUGGER @@ -35,7 +26,7 @@ symbian:TARGET.UID3 = 0xEB6022A4 SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/wigglytext/wigglytext +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/wigglytext/wigglytext exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro index ac80ef7a..63769634 100644 --- a/examples/declarative/animation/easing/easing.pro +++ b/examples/declarative/animation/easing/easing.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/easing +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/easing exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro index 9a469a68..7e9f48d3 100644 --- a/examples/declarative/animation/states/states.pro +++ b/examples/declarative/animation/states/states.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/states +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/states exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/calculator/calculator.desktop b/examples/declarative/calculator/calculator.desktop index 854120f2..854120f2 100644 --- a/examples/demos/calculator/calculator.desktop +++ b/examples/declarative/calculator/calculator.desktop diff --git a/examples/demos/calculator/calculator.pro b/examples/declarative/calculator/calculator.pro index 7db59b96..3591af05 100644 --- a/examples/demos/calculator/calculator.pro +++ b/examples/declarative/calculator/calculator.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/calculator +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/calculator exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/calculator/calculator.qmlproject b/examples/declarative/calculator/calculator.qmlproject index 88ca3caa..88ca3caa 100644 --- a/examples/demos/calculator/calculator.qmlproject +++ b/examples/declarative/calculator/calculator.qmlproject diff --git a/examples/demos/calculator/calculator.svg b/examples/declarative/calculator/calculator.svg index 566acfad..566acfad 100644 --- a/examples/demos/calculator/calculator.svg +++ b/examples/declarative/calculator/calculator.svg diff --git a/examples/demos/calculator/calculator64.png b/examples/declarative/calculator/calculator64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/demos/calculator/calculator64.png +++ b/examples/declarative/calculator/calculator64.png diff --git a/examples/demos/calculator/calculator80.png b/examples/declarative/calculator/calculator80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/demos/calculator/calculator80.png +++ b/examples/declarative/calculator/calculator80.png diff --git a/examples/demos/calculator/calculator_harmattan.desktop b/examples/declarative/calculator/calculator_harmattan.desktop index 574521d8..574521d8 100644 --- a/examples/demos/calculator/calculator_harmattan.desktop +++ b/examples/declarative/calculator/calculator_harmattan.desktop diff --git a/examples/demos/calculator/main.cpp b/examples/declarative/calculator/main.cpp index 9d2d4168..9d2d4168 100644 --- a/examples/demos/calculator/main.cpp +++ b/examples/declarative/calculator/main.cpp diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/Button.qml b/examples/declarative/calculator/qml/calculator/CalculatorCore/Button.qml index a6126b00..a6126b00 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/Button.qml +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/Button.qml diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/Display.qml b/examples/declarative/calculator/qml/calculator/CalculatorCore/Display.qml index 9e7653fd..9e7653fd 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/Display.qml +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/Display.qml diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/calculator.js b/examples/declarative/calculator/qml/calculator/CalculatorCore/calculator.js index 7c363c7f..7c363c7f 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/calculator.js +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/calculator.js diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-.png b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-.png Binary files differindex 544e5145..544e5145 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-.png +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-.png diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-blue.png b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-blue.png Binary files differindex 5f92de32..5f92de32 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-blue.png +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-blue.png diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-green.png b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-green.png Binary files differindex 36c93914..36c93914 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-green.png +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-green.png diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-purple.png b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-purple.png Binary files differindex 347cbbea..347cbbea 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-purple.png +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-purple.png diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-red.png b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-red.png Binary files differindex 3b335891..3b335891 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-red.png +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/button-red.png diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/images/display.png b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/display.png Binary files differindex 9507f438..9507f438 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/images/display.png +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/images/display.png diff --git a/examples/demos/calculator/qml/calculator/CalculatorCore/qmldir b/examples/declarative/calculator/qml/calculator/CalculatorCore/qmldir index a926b93f..a926b93f 100644 --- a/examples/demos/calculator/qml/calculator/CalculatorCore/qmldir +++ b/examples/declarative/calculator/qml/calculator/CalculatorCore/qmldir diff --git a/examples/demos/calculator/qml/calculator/calculator.qml b/examples/declarative/calculator/qml/calculator/calculator.qml index 5c7c5e5d..5c7c5e5d 100644 --- a/examples/demos/calculator/qml/calculator/calculator.qml +++ b/examples/declarative/calculator/qml/calculator/calculator.qml diff --git a/examples/declarative/cppextensions/cppextensions.pro b/examples/declarative/cppextensions/cppextensions.pro index 96550307..c81eb13f 100644 --- a/examples/declarative/cppextensions/cppextensions.pro +++ b/examples/declarative/cppextensions/cppextensions.pro @@ -7,8 +7,3 @@ SUBDIRS += \ qwidgets \ qgraphicslayouts \ referenceexamples - -# install -sources.files = cppextensions.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions -INSTALLS += sources diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index 9e698d88..66beb308 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin QT += declarative DESTDIR = ImageProviderCore @@ -7,16 +7,11 @@ TARGET = qmlimageproviderplugin SOURCES += imageprovider.cpp -OTHER_FILES += imageprovider.json +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore +qml.files = imageprovider-example.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider +qml2.files = ImageProviderCore/qmldir +qml2.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/imageprovider/ImageProviderCore -sources.files = $$SOURCES imageprovider.qml imageprovider.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore - -ImageProviderCore_sources.files = \ - ImageProviderCore/qmldir -ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore - -INSTALLS = sources ImageProviderCore_sources target +INSTALLS = qml qml2 target diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 4048dfd9..0f3e4e43 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -21,7 +21,7 @@ SOURCES += main.cpp RESOURCES += networkaccessmanagerfactory.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/networkaccessmanagerfactory +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/networkaccessmanagerfactory exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml b/examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml index 4257965c..a13fadd3 100644 --- a/examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml +++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/qml/networkaccessmanagerfactory/view.qml @@ -43,5 +43,5 @@ import QtQuick 1.0 Image { width: 100 height: 100 - source: "http://qt.nokia.com/logo.png" + source: "http://planet.qt-project.org/images/logo.png" } diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index 053e6c44..476a58e6 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin QT += widgets declarative DESTDIR = com/nokia/TimeExample @@ -7,7 +7,7 @@ TARGET = qmlqtimeexampleplugin SOURCES += plugin.cpp -OTHER_FILES += "plugin.json" +target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample qdeclarativesources.files += \ com/nokia/TimeExample/qmldir \ @@ -16,12 +16,10 @@ qdeclarativesources.files += \ com/nokia/TimeExample/Clock.qml \ com/nokia/TimeExample/hour.png \ com/nokia/TimeExample/minute.png +qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/com/nokia/TimeExample -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample +qml.files += plugins.qml +qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins -sources.files += plugins.pro plugin.cpp plugins.qml README -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample - -INSTALLS += qdeclarativesources sources target +INSTALLS += target qdeclarativesources qml diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro index 794979c4..e60ef3cc 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro @@ -28,8 +28,8 @@ RESOURCES += \ gridlayout.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro index da9b9939..49dbc405 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro @@ -28,7 +28,7 @@ RESOURCES += \ linearlayout.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 3c0c865a..d7fe5a2b 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin QT += widgets declarative DESTDIR = QWidgets @@ -7,11 +7,12 @@ TARGET = qmlqwidgetsplugin SOURCES += qwidgets.cpp -OTHER_FILES += qwidgets.json +qml.files = qwidgets.qml +qml.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/qwidgets +qml2.files = QWidgets/qmldir +qml2.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins/QWidgets -sources.files += qwidgets.pro qwidgets.cpp qwidgets.qml -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins +target.path += $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/plugins -INSTALLS += sources target +INSTALLS += target qml qml2 diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro index 57179384..bc17d41c 100644 --- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro +++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro @@ -5,7 +5,5 @@ SOURCES += main.cpp \ HEADERS += person.h RESOURCES += adding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/adding +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro index 2c24fcbd..32f01468 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro +++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += attached.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/attached +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro index 7b269491..64bcd0ef 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro +++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro @@ -9,7 +9,5 @@ HEADERS += person.h \ happybirthdaysong.h RESOURCES += binding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/binding +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro index 29b905ca..17f67be4 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro +++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += coercion.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/coercion +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro index 235aa317..b045061d 100644 --- a/examples/declarative/cppextensions/referenceexamples/default/default.pro +++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += default.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/default +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro index 8acc21de..3956f7ab 100644 --- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro +++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro @@ -5,7 +5,5 @@ SOURCES += main.cpp \ HEADERS += lineedit.h RESOURCES += extended.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/extended +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro index 3d98260a..3a3830fb 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro +++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += grouped.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/grouped +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro index 105007a0..1d42fcac 100644 --- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro +++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += methods.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/methods +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro index d6c547a2..509bf3b6 100644 --- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro +++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += properties.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/properties +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro index d62fb200..11465c38 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro +++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += signal.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/signal +INSTALLS += target diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro index 1af33152..ada2ad76 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro @@ -9,7 +9,5 @@ HEADERS += person.h \ happybirthdaysong.h RESOURCES += valuesource.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/cppextensions/referenceexamples/valuesource +INSTALLS += target diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index c2e93d55..4079afc2 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -2,29 +2,36 @@ TEMPLATE = subdirs # These examples contain some C++ and need to be built SUBDIRS = \ - animation \ - cppextensions \ - modelviews \ - i18n \ - imageelements \ - keyinteraction/focus \ - positioners \ - sqllocalstorage \ - text \ - threading \ - tutorials \ - touchinteraction \ - toys \ - ui-components + animation \ + calculator \ + cppextensions \ + flickr \ + i18n \ + imageelements \ + keyinteraction/focus \ + minehunt \ + modelviews \ + photoviewer \ + positioners \ + righttoleft \ + rssnews \ + samegame \ + shadereffects \ + snake \ + sqllocalstorage \ + text \ + threading \ + touchinteraction \ + toys \ + tutorials \ + twitter \ + ui-components # OpenGL shader examples requires opengl and they contain some C++ and need to be built contains(QT_CONFIG, opengl): SUBDIRS += shadereffects # These examples contain no C++ and can simply be copied -sources.files = \ - cppextensions \ - xml \ - declarative.pro - -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative -INSTALLS += sources +EXAMPLE_FILES = \ + helper \ + screenorientation \ + xml diff --git a/examples/demos/flickr/flickr.desktop b/examples/declarative/flickr/flickr.desktop index 8467f39b..8467f39b 100644 --- a/examples/demos/flickr/flickr.desktop +++ b/examples/declarative/flickr/flickr.desktop diff --git a/examples/demos/flickr/flickr.pro b/examples/declarative/flickr/flickr.pro index 625b2a57..cfc3afc5 100644 --- a/examples/demos/flickr/flickr.pro +++ b/examples/declarative/flickr/flickr.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/flickr +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/flickr exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/flickr/flickr.qmlproject b/examples/declarative/flickr/flickr.qmlproject index 3a6d8210..3a6d8210 100644 --- a/examples/demos/flickr/flickr.qmlproject +++ b/examples/declarative/flickr/flickr.qmlproject diff --git a/examples/demos/flickr/flickr.svg b/examples/declarative/flickr/flickr.svg index 566acfad..566acfad 100644 --- a/examples/demos/flickr/flickr.svg +++ b/examples/declarative/flickr/flickr.svg diff --git a/examples/demos/flickr/flickr64.png b/examples/declarative/flickr/flickr64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/demos/flickr/flickr64.png +++ b/examples/declarative/flickr/flickr64.png diff --git a/examples/demos/flickr/flickr80.png b/examples/declarative/flickr/flickr80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/demos/flickr/flickr80.png +++ b/examples/declarative/flickr/flickr80.png diff --git a/examples/demos/flickr/flickr_harmattan.desktop b/examples/declarative/flickr/flickr_harmattan.desktop index 19cf6264..19cf6264 100644 --- a/examples/demos/flickr/flickr_harmattan.desktop +++ b/examples/declarative/flickr/flickr_harmattan.desktop diff --git a/examples/demos/flickr/main.cpp b/examples/declarative/flickr/main.cpp index 62e3246e..62e3246e 100644 --- a/examples/demos/flickr/main.cpp +++ b/examples/declarative/flickr/main.cpp diff --git a/examples/demos/flickr/qml/flickr/common/Progress.qml b/examples/declarative/flickr/qml/flickr/common/Progress.qml index 1781497f..1781497f 100644 --- a/examples/demos/flickr/qml/flickr/common/Progress.qml +++ b/examples/declarative/flickr/qml/flickr/common/Progress.qml diff --git a/examples/demos/flickr/qml/flickr/common/RssModel.qml b/examples/declarative/flickr/qml/flickr/common/RssModel.qml index f7070f43..f7070f43 100644 --- a/examples/demos/flickr/qml/flickr/common/RssModel.qml +++ b/examples/declarative/flickr/qml/flickr/common/RssModel.qml diff --git a/examples/demos/flickr/qml/flickr/common/ScrollBar.qml b/examples/declarative/flickr/qml/flickr/common/ScrollBar.qml index 409cfb7e..409cfb7e 100644 --- a/examples/demos/flickr/qml/flickr/common/ScrollBar.qml +++ b/examples/declarative/flickr/qml/flickr/common/ScrollBar.qml diff --git a/examples/demos/flickr/qml/flickr/common/Slider.qml b/examples/declarative/flickr/qml/flickr/common/Slider.qml index dfb4ac11..dfb4ac11 100644 --- a/examples/demos/flickr/qml/flickr/common/Slider.qml +++ b/examples/declarative/flickr/qml/flickr/common/Slider.qml diff --git a/examples/demos/flickr/qml/flickr/common/qmldir b/examples/declarative/flickr/qml/flickr/common/qmldir index adc2479b..adc2479b 100644 --- a/examples/demos/flickr/qml/flickr/common/qmldir +++ b/examples/declarative/flickr/qml/flickr/common/qmldir diff --git a/examples/demos/flickr/qml/flickr/flickr-90.qml b/examples/declarative/flickr/qml/flickr/flickr-90.qml index 6acc92cb..6acc92cb 100644 --- a/examples/demos/flickr/qml/flickr/flickr-90.qml +++ b/examples/declarative/flickr/qml/flickr/flickr-90.qml diff --git a/examples/demos/flickr/qml/flickr/flickr.qml b/examples/declarative/flickr/qml/flickr/flickr.qml index fa303e76..fa303e76 100644 --- a/examples/demos/flickr/qml/flickr/flickr.qml +++ b/examples/declarative/flickr/qml/flickr/flickr.qml diff --git a/examples/demos/flickr/qml/flickr/mobile/Button.qml b/examples/declarative/flickr/qml/flickr/mobile/Button.qml index a993d7d9..a993d7d9 100644 --- a/examples/demos/flickr/qml/flickr/mobile/Button.qml +++ b/examples/declarative/flickr/qml/flickr/mobile/Button.qml diff --git a/examples/demos/flickr/qml/flickr/mobile/GridDelegate.qml b/examples/declarative/flickr/qml/flickr/mobile/GridDelegate.qml index d6df1d0c..d6df1d0c 100644 --- a/examples/demos/flickr/qml/flickr/mobile/GridDelegate.qml +++ b/examples/declarative/flickr/qml/flickr/mobile/GridDelegate.qml diff --git a/examples/demos/flickr/qml/flickr/mobile/ImageDetails.qml b/examples/declarative/flickr/qml/flickr/mobile/ImageDetails.qml index 27a8f44c..27a8f44c 100644 --- a/examples/demos/flickr/qml/flickr/mobile/ImageDetails.qml +++ b/examples/declarative/flickr/qml/flickr/mobile/ImageDetails.qml diff --git a/examples/demos/flickr/qml/flickr/mobile/ListDelegate.qml b/examples/declarative/flickr/qml/flickr/mobile/ListDelegate.qml index 0165ffb0..0165ffb0 100644 --- a/examples/demos/flickr/qml/flickr/mobile/ListDelegate.qml +++ b/examples/declarative/flickr/qml/flickr/mobile/ListDelegate.qml diff --git a/examples/demos/flickr/qml/flickr/mobile/TitleBar.qml b/examples/declarative/flickr/qml/flickr/mobile/TitleBar.qml index 82370212..82370212 100644 --- a/examples/demos/flickr/qml/flickr/mobile/TitleBar.qml +++ b/examples/declarative/flickr/qml/flickr/mobile/TitleBar.qml diff --git a/examples/demos/flickr/qml/flickr/mobile/ToolBar.qml b/examples/declarative/flickr/qml/flickr/mobile/ToolBar.qml index 7e268303..7e268303 100644 --- a/examples/demos/flickr/qml/flickr/mobile/ToolBar.qml +++ b/examples/declarative/flickr/qml/flickr/mobile/ToolBar.qml diff --git a/examples/demos/flickr/qml/flickr/mobile/images/gloss.png b/examples/declarative/flickr/qml/flickr/mobile/images/gloss.png Binary files differindex 5d370cd9..5d370cd9 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/gloss.png +++ b/examples/declarative/flickr/qml/flickr/mobile/images/gloss.png diff --git a/examples/demos/flickr/qml/flickr/mobile/images/lineedit.png b/examples/declarative/flickr/qml/flickr/mobile/images/lineedit.png Binary files differindex 2cc38dc3..2cc38dc3 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/lineedit.png +++ b/examples/declarative/flickr/qml/flickr/mobile/images/lineedit.png diff --git a/examples/demos/flickr/qml/flickr/mobile/images/lineedit.sci b/examples/declarative/flickr/qml/flickr/mobile/images/lineedit.sci index 054bff78..054bff78 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/lineedit.sci +++ b/examples/declarative/flickr/qml/flickr/mobile/images/lineedit.sci diff --git a/examples/demos/flickr/qml/flickr/mobile/images/quit.png b/examples/declarative/flickr/qml/flickr/mobile/images/quit.png Binary files differindex 5bda1b6e..5bda1b6e 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/quit.png +++ b/examples/declarative/flickr/qml/flickr/mobile/images/quit.png diff --git a/examples/demos/flickr/qml/flickr/mobile/images/stripes.png b/examples/declarative/flickr/qml/flickr/mobile/images/stripes.png Binary files differindex 9f36727e..9f36727e 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/stripes.png +++ b/examples/declarative/flickr/qml/flickr/mobile/images/stripes.png diff --git a/examples/demos/flickr/qml/flickr/mobile/images/titlebar.png b/examples/declarative/flickr/qml/flickr/mobile/images/titlebar.png Binary files differindex 51c90082..51c90082 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/titlebar.png +++ b/examples/declarative/flickr/qml/flickr/mobile/images/titlebar.png diff --git a/examples/demos/flickr/qml/flickr/mobile/images/titlebar.sci b/examples/declarative/flickr/qml/flickr/mobile/images/titlebar.sci index 0418d94c..0418d94c 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/titlebar.sci +++ b/examples/declarative/flickr/qml/flickr/mobile/images/titlebar.sci diff --git a/examples/demos/flickr/qml/flickr/mobile/images/toolbutton.png b/examples/declarative/flickr/qml/flickr/mobile/images/toolbutton.png Binary files differindex 11310013..11310013 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/toolbutton.png +++ b/examples/declarative/flickr/qml/flickr/mobile/images/toolbutton.png diff --git a/examples/demos/flickr/qml/flickr/mobile/images/toolbutton.sci b/examples/declarative/flickr/qml/flickr/mobile/images/toolbutton.sci index 9e4f9653..9e4f9653 100644 --- a/examples/demos/flickr/qml/flickr/mobile/images/toolbutton.sci +++ b/examples/declarative/flickr/qml/flickr/mobile/images/toolbutton.sci diff --git a/examples/helper/deployment.pri b/examples/declarative/helper/deployment.pri index 8dba8025..8dba8025 100644 --- a/examples/helper/deployment.pri +++ b/examples/declarative/helper/deployment.pri diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.cpp index 05d481be..05d481be 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp +++ b/examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.cpp diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h b/examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.h index be12f6a8..be12f6a8 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.h +++ b/examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.h diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.pri index 3218a12d..3218a12d 100644 --- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.pri +++ b/examples/declarative/helper/qmlapplicationviewer/qmlapplicationviewer.pri diff --git a/examples/declarative/i18n/i18n.pro b/examples/declarative/i18n/i18n.pro index abae210e..bfb628a8 100644 --- a/examples/declarative/i18n/i18n.pro +++ b/examples/declarative/i18n/i18n.pro @@ -23,8 +23,8 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/i18n +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/i18n exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/imageelements/borderimage/borderimage.pro b/examples/declarative/imageelements/borderimage/borderimage.pro index 5cfc2e5b..72ca4bb5 100644 --- a/examples/declarative/imageelements/borderimage/borderimage.pro +++ b/examples/declarative/imageelements/borderimage/borderimage.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/borderimage +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/imageelements/borderimage exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/imageelements/image/image.pro b/examples/declarative/imageelements/image/image.pro index d19b6fde..0eba8390 100644 --- a/examples/declarative/imageelements/image/image.pro +++ b/examples/declarative/imageelements/image/image.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/image +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/imageelements/image exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/imageelements/imageelements.pro b/examples/declarative/imageelements/imageelements.pro index 7c1d576a..8aa99203 100644 --- a/examples/declarative/imageelements/imageelements.pro +++ b/examples/declarative/imageelements/imageelements.pro @@ -4,8 +4,3 @@ SUBDIRS += \ borderimage \ image \ shadows - -# install -sources.files = imageelements.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements -INSTALLS += sources diff --git a/examples/declarative/imageelements/shadows/shadows.pro b/examples/declarative/imageelements/shadows/shadows.pro index 035a06a6..4f5d91fa 100644 --- a/examples/declarative/imageelements/shadows/shadows.pro +++ b/examples/declarative/imageelements/shadows/shadows.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/shadows +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/imageelements/shadows exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/keyinteraction/focus/focus.pro b/examples/declarative/keyinteraction/focus/focus.pro index 584a80bf..e18ffa8e 100644 --- a/examples/declarative/keyinteraction/focus/focus.pro +++ b/examples/declarative/keyinteraction/focus/focus.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/keyinteraction/focus +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/keyinteraction/focus exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/minehunt/README b/examples/declarative/minehunt/README index 3849ca5f..3849ca5f 100644 --- a/examples/demos/minehunt/README +++ b/examples/declarative/minehunt/README diff --git a/examples/demos/minehunt/main.cpp b/examples/declarative/minehunt/main.cpp index cfe36f0b..cfe36f0b 100644 --- a/examples/demos/minehunt/main.cpp +++ b/examples/declarative/minehunt/main.cpp diff --git a/examples/demos/minehunt/minehunt.cpp b/examples/declarative/minehunt/minehunt.cpp index 3527cc17..3527cc17 100644 --- a/examples/demos/minehunt/minehunt.cpp +++ b/examples/declarative/minehunt/minehunt.cpp diff --git a/examples/demos/minehunt/minehunt.h b/examples/declarative/minehunt/minehunt.h index f949ffd7..f949ffd7 100644 --- a/examples/demos/minehunt/minehunt.h +++ b/examples/declarative/minehunt/minehunt.h diff --git a/examples/demos/minehunt/minehunt.pro b/examples/declarative/minehunt/minehunt.pro index 2a43a11f..6a630a1f 100644 --- a/examples/demos/minehunt/minehunt.pro +++ b/examples/declarative/minehunt/minehunt.pro @@ -19,7 +19,7 @@ SOURCES += main.cpp minehunt.cpp RESOURCES = minehunt.qrc # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/minehunt +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/minehunt exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/minehunt/minehunt.qmlproject b/examples/declarative/minehunt/minehunt.qmlproject index 1f8b659f..1f8b659f 100644 --- a/examples/demos/minehunt/minehunt.qmlproject +++ b/examples/declarative/minehunt/minehunt.qmlproject diff --git a/examples/demos/minehunt/minehunt.qrc b/examples/declarative/minehunt/minehunt.qrc index 4694beb1..4694beb1 100644 --- a/examples/demos/minehunt/minehunt.qrc +++ b/examples/declarative/minehunt/minehunt.qrc diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/Explosion.qml b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml index f096c26c..f096c26c 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/Explosion.qml +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/Tile.qml b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml index 15b8f871..15b8f871 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/Tile.qml +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/back.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png Binary files differindex f6b3f0b4..f6b3f0b4 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/back.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/background.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png Binary files differindex 3734a277..3734a277 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/background.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png Binary files differindex 61ad0a92..61ad0a92 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png Binary files differindex a9925755..a9925755 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png Binary files differindex cf00aafe..cf00aafe 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png Binary files differindex f9c2335d..f9c2335d 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png Binary files differindex 3d66d725..3d66d725 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png Binary files differindex aadad0f1..aadad0f1 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png Binary files differindex 39cde4df..39cde4df 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/front.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png Binary files differindex 834331bd..834331bd 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/front.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/quit.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png Binary files differindex b822057d..b822057d 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/quit.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png diff --git a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/star.png b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png Binary files differindex 37723591..37723591 100644 --- a/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/star.png +++ b/examples/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png diff --git a/examples/demos/minehunt/qml/minehunt/minehunt.qml b/examples/declarative/minehunt/qml/minehunt/minehunt.qml index 2c0911a2..2c0911a2 100644 --- a/examples/demos/minehunt/qml/minehunt/minehunt.qml +++ b/examples/declarative/minehunt/qml/minehunt/minehunt.qml diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro index 7ba55ba6..8bf11423 100644 --- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro +++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro @@ -21,7 +21,7 @@ SOURCES = main.cpp model.cpp HEADERS = model.h # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/abstractitemmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/abstractitemmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/gridview/gridview.pro b/examples/declarative/modelviews/gridview/gridview.pro index 6d7ffc37..f83458da 100644 --- a/examples/declarative/modelviews/gridview/gridview.pro +++ b/examples/declarative/modelviews/gridview/gridview.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/gridview +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/gridview exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro index c37afe45..243d9ace 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro +++ b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/dynamiclist +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/dynamiclist exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro index 1ddbb46f..e3d3cd01 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro +++ b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/expandingdelegates +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/expandingdelegates exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/highlight/highlight.pro b/examples/declarative/modelviews/listview/highlight/highlight.pro index 062de0a7..2ef2c0fb 100644 --- a/examples/declarative/modelviews/listview/highlight/highlight.pro +++ b/examples/declarative/modelviews/listview/highlight/highlight.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlight +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/highlight exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro index b27e2c06..1cb417d1 100644 --- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro +++ b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlightranges +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/highlightranges exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/listview/listview.pro b/examples/declarative/modelviews/listview/listview.pro index fa7def33..877eb7cd 100644 --- a/examples/declarative/modelviews/listview/listview.pro +++ b/examples/declarative/modelviews/listview/listview.pro @@ -6,8 +6,3 @@ SUBDIRS += \ highlight \ highlightranges \ sections - -# install -sources.files = listview.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview -INSTALLS += sources diff --git a/examples/declarative/modelviews/listview/sections/sections.pro b/examples/declarative/modelviews/listview/sections/sections.pro index edad3e58..5f08fb97 100644 --- a/examples/declarative/modelviews/listview/sections/sections.pro +++ b/examples/declarative/modelviews/listview/sections/sections.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/sections +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/listview/sections exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/modelviews.pro b/examples/declarative/modelviews/modelviews.pro index ee05704c..c50dd742 100644 --- a/examples/declarative/modelviews/modelviews.pro +++ b/examples/declarative/modelviews/modelviews.pro @@ -10,8 +10,3 @@ SUBDIRS += \ pathview \ stringlistmodel \ visualitemmodel - -# install -sources.files = modelviews.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews -INSTALLS += sources diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro index d37bd87b..fb401bd0 100644 --- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro +++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro @@ -22,7 +22,7 @@ SOURCES += main.cpp \ HEADERS += dataobject.h # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/objectlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/objectlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/package/package.pro b/examples/declarative/modelviews/package/package.pro index d68cdcc8..fbb0408a 100644 --- a/examples/declarative/modelviews/package/package.pro +++ b/examples/declarative/modelviews/package/package.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/package +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/package exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/parallax/parallax.pro b/examples/declarative/modelviews/parallax/parallax.pro index cf21b699..6b1d258b 100644 --- a/examples/declarative/modelviews/parallax/parallax.pro +++ b/examples/declarative/modelviews/parallax/parallax.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/parallax +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/parallax exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/pathview/pathview.pro b/examples/declarative/modelviews/pathview/pathview.pro index e88bbc67..2e4138e4 100644 --- a/examples/declarative/modelviews/pathview/pathview.pro +++ b/examples/declarative/modelviews/pathview/pathview.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/pathview +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/pathview exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro index 8d326922..da3b9608 100644 --- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro +++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro @@ -20,7 +20,7 @@ QT += widgets SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/stringlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/stringlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro index 7309eea1..07a33b3d 100644 --- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro +++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/visualitemmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/visualitemmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/photoviewer/main.cpp b/examples/declarative/photoviewer/main.cpp index ba976b2d..ba976b2d 100644 --- a/examples/demos/photoviewer/main.cpp +++ b/examples/declarative/photoviewer/main.cpp diff --git a/examples/demos/photoviewer/photoviewer.desktop b/examples/declarative/photoviewer/photoviewer.desktop index 4246b9f3..4246b9f3 100644 --- a/examples/demos/photoviewer/photoviewer.desktop +++ b/examples/declarative/photoviewer/photoviewer.desktop diff --git a/examples/demos/photoviewer/photoviewer.pro b/examples/declarative/photoviewer/photoviewer.pro index 694aeb36..5e7849f9 100644 --- a/examples/demos/photoviewer/photoviewer.pro +++ b/examples/declarative/photoviewer/photoviewer.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/photoviewer +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/photoviewer exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/photoviewer/photoviewer.qmlproject b/examples/declarative/photoviewer/photoviewer.qmlproject index 025a3a8f..025a3a8f 100644 --- a/examples/demos/photoviewer/photoviewer.qmlproject +++ b/examples/declarative/photoviewer/photoviewer.qmlproject diff --git a/examples/demos/photoviewer/photoviewer.svg b/examples/declarative/photoviewer/photoviewer.svg index 566acfad..566acfad 100644 --- a/examples/demos/photoviewer/photoviewer.svg +++ b/examples/declarative/photoviewer/photoviewer.svg diff --git a/examples/demos/photoviewer/photoviewer64.png b/examples/declarative/photoviewer/photoviewer64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/demos/photoviewer/photoviewer64.png +++ b/examples/declarative/photoviewer/photoviewer64.png diff --git a/examples/demos/photoviewer/photoviewer80.png b/examples/declarative/photoviewer/photoviewer80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/demos/photoviewer/photoviewer80.png +++ b/examples/declarative/photoviewer/photoviewer80.png diff --git a/examples/demos/photoviewer/photoviewer_harmattan.desktop b/examples/declarative/photoviewer/photoviewer_harmattan.desktop index 2dced148..2dced148 100644 --- a/examples/demos/photoviewer/photoviewer_harmattan.desktop +++ b/examples/declarative/photoviewer/photoviewer_harmattan.desktop diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml index 1b6e522b..1b6e522b 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml index 3cfeaf83..3cfeaf83 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml index 29635d5a..29635d5a 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml index de98a515..de98a515 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml index bf7d92ee..bf7d92ee 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml index 2e3e2fa8..2e3e2fa8 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml index 3bbcb5ab..3bbcb5ab 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml index 8f783d40..8f783d40 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png Binary files differindex 431af854..431af854 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png Binary files differindex 664c2b14..664c2b14 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png Binary files differindex 1847ab52..1847ab52 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir index d3c247f2..d3c247f2 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir diff --git a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js index e8ef93a8..e8ef93a8 100644 --- a/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js +++ b/examples/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js diff --git a/examples/demos/photoviewer/qml/photoviewer/i18n/base.ts b/examples/declarative/photoviewer/qml/photoviewer/i18n/base.ts index 1accfd2f..1accfd2f 100644 --- a/examples/demos/photoviewer/qml/photoviewer/i18n/base.ts +++ b/examples/declarative/photoviewer/qml/photoviewer/i18n/base.ts diff --git a/examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.qm b/examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.qm Binary files differindex c24fcbc4..c24fcbc4 100644 --- a/examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.qm +++ b/examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.qm diff --git a/examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.ts b/examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.ts index 9f892db6..9f892db6 100644 --- a/examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.ts +++ b/examples/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.ts diff --git a/examples/demos/photoviewer/qml/photoviewer/photoviewer.qml b/examples/declarative/photoviewer/qml/photoviewer/photoviewer.qml index 9c07e3ce..9c07e3ce 100644 --- a/examples/demos/photoviewer/qml/photoviewer/photoviewer.qml +++ b/examples/declarative/photoviewer/qml/photoviewer/photoviewer.qml diff --git a/examples/declarative/positioners/positioners.pro b/examples/declarative/positioners/positioners.pro index 1991997a..39732285 100644 --- a/examples/declarative/positioners/positioners.pro +++ b/examples/declarative/positioners/positioners.pro @@ -23,8 +23,8 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/positioners +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/positioners exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro index 402d8344..901a05e7 100644 --- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro +++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.pro @@ -6,18 +6,6 @@ DEPLOYMENTFOLDERS = folder_01 # Additional import path used to resolve QML modules in Creator's code model QML_IMPORT_PATH = -symbian:TARGET.UID3 = 0xE12C9D9E - -# Smart Installer package's UID -# This UID is from the protected range and therefore the package will -# fail to install if self-signed. By default qmake uses the unprotected -# range value if unprotected UID is defined for the application and -# 0x2002CCCF value if protected UID is given to the application -#symbian:DEPLOYMENT.installer_header = 0x2002CCCF - -# Allow network access on Symbian -symbian:TARGET.CAPABILITY += NetworkServices - # If your application uses the Qt Mobility libraries, uncomment the following # lines and add the respective components to the MOBILITY variable. # CONFIG += mobility @@ -33,7 +21,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/layoutdirection +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/righttoleft/layoutdirection exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro index eb6ab5c5..83d1641b 100644 --- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro +++ b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.pro @@ -6,18 +6,6 @@ DEPLOYMENTFOLDERS = folder_01 # Additional import path used to resolve QML modules in Creator's code model QML_IMPORT_PATH = -symbian:TARGET.UID3 = 0xE2EC19CA - -# Smart Installer package's UID -# This UID is from the protected range and therefore the package will -# fail to install if self-signed. By default qmake uses the unprotected -# range value if unprotected UID is defined for the application and -# 0x2002CCCF value if protected UID is given to the application -#symbian:DEPLOYMENT.installer_header = 0x2002CCCF - -# Allow network access on Symbian -symbian:TARGET.CAPABILITY += NetworkServices - # If your application uses the Qt Mobility libraries, uncomment the following # lines and add the respective components to the MOBILITY variable. # CONFIG += mobility @@ -33,7 +21,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/layoutmirroring +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/righttoleft/layoutmirroring exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/righttoleft/righttoleft.pro b/examples/declarative/righttoleft/righttoleft.pro new file mode 100644 index 00000000..fc5b82fd --- /dev/null +++ b/examples/declarative/righttoleft/righttoleft.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs + +SUBDIRS = \ + layoutdirection \ + layoutmirroring \ + textalignment diff --git a/examples/declarative/righttoleft/textalignment/textalignment.pro b/examples/declarative/righttoleft/textalignment/textalignment.pro index fd2ee263..a66ca6c5 100644 --- a/examples/declarative/righttoleft/textalignment/textalignment.pro +++ b/examples/declarative/righttoleft/textalignment/textalignment.pro @@ -6,18 +6,6 @@ DEPLOYMENTFOLDERS = folder_01 # Additional import path used to resolve QML modules in Creator's code model QML_IMPORT_PATH = -symbian:TARGET.UID3 = 0xE061C700 - -# Smart Installer package's UID -# This UID is from the protected range and therefore the package will -# fail to install if self-signed. By default qmake uses the unprotected -# range value if unprotected UID is defined for the application and -# 0x2002CCCF value if protected UID is given to the application -#symbian:DEPLOYMENT.installer_header = 0x2002CCCF - -# Allow network access on Symbian -symbian:TARGET.CAPABILITY += NetworkServices - # If your application uses the Qt Mobility libraries, uncomment the following # lines and add the respective components to the MOBILITY variable. # CONFIG += mobility @@ -33,7 +21,7 @@ symbian:TARGET.CAPABILITY += NetworkServices SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/righttoleft/textalignment +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/righttoleft/textalignment exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/rssnews/main.cpp b/examples/declarative/rssnews/main.cpp index fb6cd05e..fb6cd05e 100644 --- a/examples/demos/rssnews/main.cpp +++ b/examples/declarative/rssnews/main.cpp diff --git a/examples/demos/rssnews/qml/rssnews/content/BusyIndicator.qml b/examples/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml index e3671cf8..e3671cf8 100644 --- a/examples/demos/rssnews/qml/rssnews/content/BusyIndicator.qml +++ b/examples/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml diff --git a/examples/demos/rssnews/qml/rssnews/content/CategoryDelegate.qml b/examples/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml index fff34953..fff34953 100644 --- a/examples/demos/rssnews/qml/rssnews/content/CategoryDelegate.qml +++ b/examples/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml diff --git a/examples/demos/rssnews/qml/rssnews/content/NewsDelegate.qml b/examples/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml index 030f1d88..030f1d88 100644 --- a/examples/demos/rssnews/qml/rssnews/content/NewsDelegate.qml +++ b/examples/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml diff --git a/examples/demos/rssnews/qml/rssnews/content/RssFeeds.qml b/examples/declarative/rssnews/qml/rssnews/content/RssFeeds.qml index 7aaa5ea8..7aaa5ea8 100644 --- a/examples/demos/rssnews/qml/rssnews/content/RssFeeds.qml +++ b/examples/declarative/rssnews/qml/rssnews/content/RssFeeds.qml diff --git a/examples/demos/rssnews/qml/rssnews/content/ScrollBar.qml b/examples/declarative/rssnews/qml/rssnews/content/ScrollBar.qml index 0e2275fb..0e2275fb 100644 --- a/examples/demos/rssnews/qml/rssnews/content/ScrollBar.qml +++ b/examples/declarative/rssnews/qml/rssnews/content/ScrollBar.qml diff --git a/examples/demos/rssnews/qml/rssnews/content/images/busy.png b/examples/declarative/rssnews/qml/rssnews/content/images/busy.png Binary files differindex 664c2b14..664c2b14 100644 --- a/examples/demos/rssnews/qml/rssnews/content/images/busy.png +++ b/examples/declarative/rssnews/qml/rssnews/content/images/busy.png diff --git a/examples/demos/rssnews/qml/rssnews/content/images/scrollbar.png b/examples/declarative/rssnews/qml/rssnews/content/images/scrollbar.png Binary files differindex 0228dcf9..0228dcf9 100644 --- a/examples/demos/rssnews/qml/rssnews/content/images/scrollbar.png +++ b/examples/declarative/rssnews/qml/rssnews/content/images/scrollbar.png diff --git a/examples/demos/rssnews/qml/rssnews/rssnews.qml b/examples/declarative/rssnews/qml/rssnews/rssnews.qml index 18ea2ed0..18ea2ed0 100644 --- a/examples/demos/rssnews/qml/rssnews/rssnews.qml +++ b/examples/declarative/rssnews/qml/rssnews/rssnews.qml diff --git a/examples/demos/rssnews/rssnews.desktop b/examples/declarative/rssnews/rssnews.desktop index 7d02ed5f..7d02ed5f 100644 --- a/examples/demos/rssnews/rssnews.desktop +++ b/examples/declarative/rssnews/rssnews.desktop diff --git a/examples/demos/rssnews/rssnews.pro b/examples/declarative/rssnews/rssnews.pro index 14002fb1..57b81fe6 100644 --- a/examples/demos/rssnews/rssnews.pro +++ b/examples/declarative/rssnews/rssnews.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/rssnews +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/rssnews exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/rssnews/rssnews.qmlproject b/examples/declarative/rssnews/rssnews.qmlproject index 608be8d3..608be8d3 100644 --- a/examples/demos/rssnews/rssnews.qmlproject +++ b/examples/declarative/rssnews/rssnews.qmlproject diff --git a/examples/demos/rssnews/rssnews.svg b/examples/declarative/rssnews/rssnews.svg index 566acfad..566acfad 100644 --- a/examples/demos/rssnews/rssnews.svg +++ b/examples/declarative/rssnews/rssnews.svg diff --git a/examples/demos/rssnews/rssnews64.png b/examples/declarative/rssnews/rssnews64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/demos/rssnews/rssnews64.png +++ b/examples/declarative/rssnews/rssnews64.png diff --git a/examples/demos/rssnews/rssnews80.png b/examples/declarative/rssnews/rssnews80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/demos/rssnews/rssnews80.png +++ b/examples/declarative/rssnews/rssnews80.png diff --git a/examples/demos/rssnews/rssnews_harmattan.desktop b/examples/declarative/rssnews/rssnews_harmattan.desktop index df6303ff..df6303ff 100644 --- a/examples/demos/rssnews/rssnews_harmattan.desktop +++ b/examples/declarative/rssnews/rssnews_harmattan.desktop diff --git a/examples/demos/samegame/main.cpp b/examples/declarative/samegame/main.cpp index f6e2b732..f6e2b732 100644 --- a/examples/demos/samegame/main.cpp +++ b/examples/declarative/samegame/main.cpp diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/BoomBlock.qml b/examples/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml index 52cd54db..52cd54db 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/BoomBlock.qml +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/Button.qml b/examples/declarative/samegame/qml/samegame/SamegameCore/Button.qml index 91247233..91247233 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/Button.qml +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/Button.qml diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/Dialog.qml b/examples/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml index ba3e9c60..ba3e9c60 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/Dialog.qml +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/background.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/background.png Binary files differindex 3734a277..3734a277 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/background.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/background.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStar.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStar.png Binary files differindex ff9588f8..ff9588f8 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStar.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStar.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStone.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStone.png Binary files differindex 20e43c75..20e43c75 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStone.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/blueStone.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStar.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStar.png Binary files differindex cd068547..cd068547 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStar.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStar.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStone.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStone.png Binary files differindex b568a190..b568a190 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStone.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/greenStone.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/redStar.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStar.png Binary files differindex 0a4dffe5..0a4dffe5 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/redStar.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStar.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/redStone.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStone.png Binary files differindex 36b09a26..36b09a26 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/redStone.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/redStone.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/star.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/star.png Binary files differindex defbde53..defbde53 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/star.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/star.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/pics/yellowStone.png b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/yellowStone.png Binary files differindex b1ce7621..b1ce7621 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/pics/yellowStone.png +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/pics/yellowStone.png diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/qmldir b/examples/declarative/samegame/qml/samegame/SamegameCore/qmldir index e17b1f5d..e17b1f5d 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/qmldir +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/qmldir diff --git a/examples/demos/samegame/qml/samegame/SamegameCore/samegame.js b/examples/declarative/samegame/qml/samegame/SamegameCore/samegame.js index d7b827a1..d7b827a1 100644 --- a/examples/demos/samegame/qml/samegame/SamegameCore/samegame.js +++ b/examples/declarative/samegame/qml/samegame/SamegameCore/samegame.js diff --git a/examples/demos/samegame/qml/samegame/highscores/README b/examples/declarative/samegame/qml/samegame/highscores/README index eaa00fae..eaa00fae 100644 --- a/examples/demos/samegame/qml/samegame/highscores/README +++ b/examples/declarative/samegame/qml/samegame/highscores/README diff --git a/examples/demos/samegame/qml/samegame/highscores/score_data.xml b/examples/declarative/samegame/qml/samegame/highscores/score_data.xml index c3fd90d9..c3fd90d9 100644 --- a/examples/demos/samegame/qml/samegame/highscores/score_data.xml +++ b/examples/declarative/samegame/qml/samegame/highscores/score_data.xml diff --git a/examples/demos/samegame/qml/samegame/highscores/score_style.xsl b/examples/declarative/samegame/qml/samegame/highscores/score_style.xsl index 670354c9..670354c9 100644 --- a/examples/demos/samegame/qml/samegame/highscores/score_style.xsl +++ b/examples/declarative/samegame/qml/samegame/highscores/score_style.xsl diff --git a/examples/demos/samegame/qml/samegame/highscores/scores.php b/examples/declarative/samegame/qml/samegame/highscores/scores.php index 3cceb2d7..3cceb2d7 100644 --- a/examples/demos/samegame/qml/samegame/highscores/scores.php +++ b/examples/declarative/samegame/qml/samegame/highscores/scores.php diff --git a/examples/demos/samegame/qml/samegame/samegame.qml b/examples/declarative/samegame/qml/samegame/samegame.qml index 5356ab78..5356ab78 100644 --- a/examples/demos/samegame/qml/samegame/samegame.qml +++ b/examples/declarative/samegame/qml/samegame/samegame.qml diff --git a/examples/demos/samegame/samegame.desktop b/examples/declarative/samegame/samegame.desktop index 18ad2d98..18ad2d98 100644 --- a/examples/demos/samegame/samegame.desktop +++ b/examples/declarative/samegame/samegame.desktop diff --git a/examples/demos/samegame/samegame.pro b/examples/declarative/samegame/samegame.pro index 6342ba4a..baac5dc1 100644 --- a/examples/demos/samegame/samegame.pro +++ b/examples/declarative/samegame/samegame.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/samegame +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/samegame exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/samegame/samegame.qmlproject b/examples/declarative/samegame/samegame.qmlproject index c17ee1ee..c17ee1ee 100644 --- a/examples/demos/samegame/samegame.qmlproject +++ b/examples/declarative/samegame/samegame.qmlproject diff --git a/examples/demos/samegame/samegame.svg b/examples/declarative/samegame/samegame.svg index 566acfad..566acfad 100644 --- a/examples/demos/samegame/samegame.svg +++ b/examples/declarative/samegame/samegame.svg diff --git a/examples/demos/samegame/samegame64.png b/examples/declarative/samegame/samegame64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/demos/samegame/samegame64.png +++ b/examples/declarative/samegame/samegame64.png diff --git a/examples/demos/samegame/samegame80.png b/examples/declarative/samegame/samegame80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/demos/samegame/samegame80.png +++ b/examples/declarative/samegame/samegame80.png diff --git a/examples/demos/samegame/samegame_harmattan.desktop b/examples/declarative/samegame/samegame_harmattan.desktop index 1f35b8e3..1f35b8e3 100644 --- a/examples/demos/samegame/samegame_harmattan.desktop +++ b/examples/declarative/samegame/samegame_harmattan.desktop diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro index 742903e3..7a4f1a8b 100644 --- a/examples/declarative/shadereffects/shadereffects.pro +++ b/examples/declarative/shadereffects/shadereffects.pro @@ -19,13 +19,9 @@ QT += declarative opengl # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp -symbian { - DEFINES += SHADEREFFECTS_USE_OPENGL_GRAPHICSSYSTEM -} - # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/shadereffects +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/shadereffects exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/snake/main.cpp b/examples/declarative/snake/main.cpp index 7bd252f0..7bd252f0 100644 --- a/examples/demos/snake/main.cpp +++ b/examples/declarative/snake/main.cpp diff --git a/examples/demos/snake/qml/snake/content/Button.qml b/examples/declarative/snake/qml/snake/content/Button.qml index c1e0be5c..c1e0be5c 100644 --- a/examples/demos/snake/qml/snake/content/Button.qml +++ b/examples/declarative/snake/qml/snake/content/Button.qml diff --git a/examples/demos/snake/qml/snake/content/Cookie.qml b/examples/declarative/snake/qml/snake/content/Cookie.qml index 353bf508..353bf508 100644 --- a/examples/demos/snake/qml/snake/content/Cookie.qml +++ b/examples/declarative/snake/qml/snake/content/Cookie.qml diff --git a/examples/demos/snake/qml/snake/content/HighScoreModel.qml b/examples/declarative/snake/qml/snake/content/HighScoreModel.qml index 58695c6e..58695c6e 100644 --- a/examples/demos/snake/qml/snake/content/HighScoreModel.qml +++ b/examples/declarative/snake/qml/snake/content/HighScoreModel.qml diff --git a/examples/demos/snake/qml/snake/content/Link.qml b/examples/declarative/snake/qml/snake/content/Link.qml index 7ace4054..7ace4054 100644 --- a/examples/demos/snake/qml/snake/content/Link.qml +++ b/examples/declarative/snake/qml/snake/content/Link.qml diff --git a/examples/demos/snake/qml/snake/content/Skull.qml b/examples/declarative/snake/qml/snake/content/Skull.qml index 111e87b3..111e87b3 100644 --- a/examples/demos/snake/qml/snake/content/Skull.qml +++ b/examples/declarative/snake/qml/snake/content/Skull.qml diff --git a/examples/demos/snake/qml/snake/content/pics/README b/examples/declarative/snake/qml/snake/content/pics/README index 0215132c..0215132c 100644 --- a/examples/demos/snake/qml/snake/content/pics/README +++ b/examples/declarative/snake/qml/snake/content/pics/README diff --git a/examples/demos/snake/qml/snake/content/pics/background.png b/examples/declarative/snake/qml/snake/content/pics/background.png Binary files differindex 72dffaa8..72dffaa8 100644 --- a/examples/demos/snake/qml/snake/content/pics/background.png +++ b/examples/declarative/snake/qml/snake/content/pics/background.png diff --git a/examples/demos/snake/qml/snake/content/pics/blueStar.png b/examples/declarative/snake/qml/snake/content/pics/blueStar.png Binary files differindex ba7acabd..ba7acabd 100644 --- a/examples/demos/snake/qml/snake/content/pics/blueStar.png +++ b/examples/declarative/snake/qml/snake/content/pics/blueStar.png diff --git a/examples/demos/snake/qml/snake/content/pics/blueStone.png b/examples/declarative/snake/qml/snake/content/pics/blueStone.png Binary files differindex 356affdd..356affdd 100644 --- a/examples/demos/snake/qml/snake/content/pics/blueStone.png +++ b/examples/declarative/snake/qml/snake/content/pics/blueStone.png diff --git a/examples/demos/snake/qml/snake/content/pics/cookie.png b/examples/declarative/snake/qml/snake/content/pics/cookie.png Binary files differindex aec2957f..aec2957f 100644 --- a/examples/demos/snake/qml/snake/content/pics/cookie.png +++ b/examples/declarative/snake/qml/snake/content/pics/cookie.png diff --git a/examples/demos/snake/qml/snake/content/pics/eyes.svg b/examples/declarative/snake/qml/snake/content/pics/eyes.svg index 10786927..10786927 100644 --- a/examples/demos/snake/qml/snake/content/pics/eyes.svg +++ b/examples/declarative/snake/qml/snake/content/pics/eyes.svg diff --git a/examples/demos/snake/qml/snake/content/pics/head.png b/examples/declarative/snake/qml/snake/content/pics/head.png Binary files differindex 550e0026..550e0026 100644 --- a/examples/demos/snake/qml/snake/content/pics/head.png +++ b/examples/declarative/snake/qml/snake/content/pics/head.png diff --git a/examples/demos/snake/qml/snake/content/pics/head.svg b/examples/declarative/snake/qml/snake/content/pics/head.svg index 3bf0bd2f..3bf0bd2f 100644 --- a/examples/demos/snake/qml/snake/content/pics/head.svg +++ b/examples/declarative/snake/qml/snake/content/pics/head.svg diff --git a/examples/demos/snake/qml/snake/content/pics/pause.png b/examples/declarative/snake/qml/snake/content/pics/pause.png Binary files differindex 056d97dd..056d97dd 100644 --- a/examples/demos/snake/qml/snake/content/pics/pause.png +++ b/examples/declarative/snake/qml/snake/content/pics/pause.png diff --git a/examples/demos/snake/qml/snake/content/pics/redStar.png b/examples/declarative/snake/qml/snake/content/pics/redStar.png Binary files differindex cd068547..cd068547 100644 --- a/examples/demos/snake/qml/snake/content/pics/redStar.png +++ b/examples/declarative/snake/qml/snake/content/pics/redStar.png diff --git a/examples/demos/snake/qml/snake/content/pics/redStone.png b/examples/declarative/snake/qml/snake/content/pics/redStone.png Binary files differindex 9bb7fe42..9bb7fe42 100644 --- a/examples/demos/snake/qml/snake/content/pics/redStone.png +++ b/examples/declarative/snake/qml/snake/content/pics/redStone.png diff --git a/examples/demos/snake/qml/snake/content/pics/skull.png b/examples/declarative/snake/qml/snake/content/pics/skull.png Binary files differindex 63186167..63186167 100644 --- a/examples/demos/snake/qml/snake/content/pics/skull.png +++ b/examples/declarative/snake/qml/snake/content/pics/skull.png diff --git a/examples/demos/snake/qml/snake/content/pics/snake.jpg b/examples/declarative/snake/qml/snake/content/pics/snake.jpg Binary files differindex e91a784f..e91a784f 100644 --- a/examples/demos/snake/qml/snake/content/pics/snake.jpg +++ b/examples/declarative/snake/qml/snake/content/pics/snake.jpg diff --git a/examples/demos/snake/qml/snake/content/pics/star.png b/examples/declarative/snake/qml/snake/content/pics/star.png Binary files differindex defbde53..defbde53 100644 --- a/examples/demos/snake/qml/snake/content/pics/star.png +++ b/examples/declarative/snake/qml/snake/content/pics/star.png diff --git a/examples/demos/snake/qml/snake/content/pics/stoneShadow.png b/examples/declarative/snake/qml/snake/content/pics/stoneShadow.png Binary files differindex 1bd56afd..1bd56afd 100644 --- a/examples/demos/snake/qml/snake/content/pics/stoneShadow.png +++ b/examples/declarative/snake/qml/snake/content/pics/stoneShadow.png diff --git a/examples/demos/snake/qml/snake/content/pics/yellowStar.png b/examples/declarative/snake/qml/snake/content/pics/yellowStar.png Binary files differindex 52fb9c4b..52fb9c4b 100644 --- a/examples/demos/snake/qml/snake/content/pics/yellowStar.png +++ b/examples/declarative/snake/qml/snake/content/pics/yellowStar.png diff --git a/examples/demos/snake/qml/snake/content/pics/yellowStone.png b/examples/declarative/snake/qml/snake/content/pics/yellowStone.png Binary files differindex c56124a8..c56124a8 100644 --- a/examples/demos/snake/qml/snake/content/pics/yellowStone.png +++ b/examples/declarative/snake/qml/snake/content/pics/yellowStone.png diff --git a/examples/demos/snake/qml/snake/content/snake.js b/examples/declarative/snake/qml/snake/content/snake.js index 837b82ad..837b82ad 100644 --- a/examples/demos/snake/qml/snake/content/snake.js +++ b/examples/declarative/snake/qml/snake/content/snake.js diff --git a/examples/demos/snake/qml/snake/snake.qml b/examples/declarative/snake/qml/snake/snake.qml index 47e8501c..47e8501c 100644 --- a/examples/demos/snake/qml/snake/snake.qml +++ b/examples/declarative/snake/qml/snake/snake.qml diff --git a/examples/demos/snake/snake.desktop b/examples/declarative/snake/snake.desktop index fef60907..fef60907 100644 --- a/examples/demos/snake/snake.desktop +++ b/examples/declarative/snake/snake.desktop diff --git a/examples/demos/snake/snake.pro b/examples/declarative/snake/snake.pro index 0fa838d5..ce1e28e3 100644 --- a/examples/demos/snake/snake.pro +++ b/examples/declarative/snake/snake.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/snake +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/snake exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/snake/snake.qmlproject b/examples/declarative/snake/snake.qmlproject index 431d2a9e..431d2a9e 100644 --- a/examples/demos/snake/snake.qmlproject +++ b/examples/declarative/snake/snake.qmlproject diff --git a/examples/demos/snake/snake.svg b/examples/declarative/snake/snake.svg index 566acfad..566acfad 100644 --- a/examples/demos/snake/snake.svg +++ b/examples/declarative/snake/snake.svg diff --git a/examples/demos/snake/snake64.png b/examples/declarative/snake/snake64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/demos/snake/snake64.png +++ b/examples/declarative/snake/snake64.png diff --git a/examples/demos/snake/snake80.png b/examples/declarative/snake/snake80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/demos/snake/snake80.png +++ b/examples/declarative/snake/snake80.png diff --git a/examples/demos/snake/snake_harmattan.desktop b/examples/declarative/snake/snake_harmattan.desktop index 10b0f792..10b0f792 100644 --- a/examples/demos/snake/snake_harmattan.desktop +++ b/examples/declarative/snake/snake_harmattan.desktop diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.pro b/examples/declarative/sqllocalstorage/sqllocalstorage.pro index 631cff40..824f407a 100644 --- a/examples/declarative/sqllocalstorage/sqllocalstorage.pro +++ b/examples/declarative/sqllocalstorage/sqllocalstorage.pro @@ -19,8 +19,8 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/sqllocalstorage +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/sqllocalstorage exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/fonts/availableFonts/availableFonts.pro b/examples/declarative/text/fonts/availableFonts/availableFonts.pro index a175e3d5..3cd3f973 100644 --- a/examples/declarative/text/fonts/availableFonts/availableFonts.pro +++ b/examples/declarative/text/fonts/availableFonts/availableFonts.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/availableFonts +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/fonts/availableFonts exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/fonts/banner/banner.pro b/examples/declarative/text/fonts/banner/banner.pro index ab6f3e56..e21ee2e3 100644 --- a/examples/declarative/text/fonts/banner/banner.pro +++ b/examples/declarative/text/fonts/banner/banner.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/banner +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/fonts/banner exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/fonts/fonts.pro b/examples/declarative/text/fonts/fonts.pro index 33637ef4..2359918e 100644 --- a/examples/declarative/text/fonts/fonts.pro +++ b/examples/declarative/text/fonts/fonts.pro @@ -5,8 +5,3 @@ SUBDIRS += \ banner \ fonts \ hello - -# install -sources.files = fonts.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts -INSTALLS += sources diff --git a/examples/declarative/text/fonts/fonts/fonts.pro b/examples/declarative/text/fonts/fonts/fonts.pro index 1e10fc17..4fd22c68 100644 --- a/examples/declarative/text/fonts/fonts/fonts.pro +++ b/examples/declarative/text/fonts/fonts/fonts.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/fonts +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/fonts/fonts exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/fonts/hello/hello.pro b/examples/declarative/text/fonts/hello/hello.pro index 8a7752a8..db92f145 100644 --- a/examples/declarative/text/fonts/hello/hello.pro +++ b/examples/declarative/text/fonts/hello/hello.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/hello +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/fonts/hello exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/text/text.pro b/examples/declarative/text/text.pro index 755e811a..4e86deb3 100644 --- a/examples/declarative/text/text.pro +++ b/examples/declarative/text/text.pro @@ -3,8 +3,3 @@ TEMPLATE = subdirs SUBDIRS += \ fonts \ textselection - -# install -sources.files = text.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text -INSTALLS += sources diff --git a/examples/declarative/text/textselection/textselection.pro b/examples/declarative/text/textselection/textselection.pro index 327efad9..bd697106 100644 --- a/examples/declarative/text/textselection/textselection.pro +++ b/examples/declarative/text/textselection/textselection.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/textselection +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/text/textselection exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro index 35f203f1..a669ed41 100644 --- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro +++ b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/threadedlistmodel +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/threading/threadedlistmodel exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/threading/threading.pro b/examples/declarative/threading/threading.pro index d281a764..56508617 100644 --- a/examples/declarative/threading/threading.pro +++ b/examples/declarative/threading/threading.pro @@ -3,8 +3,3 @@ TEMPLATE = subdirs SUBDIRS = \ threadedlistmodel \ workerscript - -# install -sources.files = threading.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading -INSTALLS += sources diff --git a/examples/declarative/threading/workerscript/workerscript.pro b/examples/declarative/threading/workerscript/workerscript.pro index b92a2745..afd4d47b 100644 --- a/examples/declarative/threading/workerscript/workerscript.pro +++ b/examples/declarative/threading/workerscript/workerscript.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/workerscript +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/threading/workerscript exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimental-gestures.pro index db652cc3..396a59d8 100644 --- a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro +++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimental-gestures.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/gestures/experimental-gestures +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/touchinteraction/gestures/experimental-gestures exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/tic-tac-toe/tictactoe.pro b/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro index 4a669f6f..9d984146 100644 --- a/examples/declarative/toys/tic-tac-toe/tictactoe.pro +++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro @@ -1,5 +1,5 @@ # Add more folders to ship with the application, here -folder_01.source = qml/tic-tac-toe +folder_01.source = qml/mousearea-example folder_01.target = qml DEPLOYMENTFOLDERS = folder_01 @@ -19,12 +19,11 @@ DEFINES += ORIENTATIONLOCK # CONFIG += mobility # MOBILITY += -TARGET = tic-tac-toe # The .cpp file which was generated for your project. Feel free to hack it. SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tic-tac-toe +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/touchinteraction/mousearea/mousearea-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/touchinteraction/pincharea/pincharea.pro b/examples/declarative/touchinteraction/pincharea/pincharea.pro index 6a2e9dd3..15bf06be 100644 --- a/examples/declarative/touchinteraction/pincharea/pincharea.pro +++ b/examples/declarative/touchinteraction/pincharea/pincharea.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/pincharea +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/touchinteraction/pincharea exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/touchinteraction/touchinteraction.pro b/examples/declarative/touchinteraction/touchinteraction.pro index 1db70571..5ce0abe0 100644 --- a/examples/declarative/touchinteraction/touchinteraction.pro +++ b/examples/declarative/touchinteraction/touchinteraction.pro @@ -1,9 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = gestures/experimental-gestures/experimentalgestures.pro \ - mousearea/mousearea-example/mouseareaexample.pro \ +SUBDIRS = gestures/experimental-gestures \ + mousearea/mousearea-example \ pincharea - -# install -sources.files = touchinteraction.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction -INSTALLS += sources diff --git a/examples/declarative/toys/clocks/clocks.pro b/examples/declarative/toys/clocks/clocks.pro index 483924e1..3fc085ca 100644 --- a/examples/declarative/toys/clocks/clocks.pro +++ b/examples/declarative/toys/clocks/clocks.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/clocks +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/clocks exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/corkboards/corkboards.pro b/examples/declarative/toys/corkboards/corkboards.pro index 61e141fa..dbcfc859 100644 --- a/examples/declarative/toys/corkboards/corkboards.pro +++ b/examples/declarative/toys/corkboards/corkboards.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/corkboards +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/corkboards exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.pro b/examples/declarative/toys/dynamicscene/dynamicscene.pro index 5d19757b..c77e7374 100644 --- a/examples/declarative/toys/dynamicscene/dynamicscene.pro +++ b/examples/declarative/toys/dynamicscene/dynamicscene.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/dynamicscene +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/dynamicscene exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.pro index c55b883c..84045aa9 100644 --- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro +++ b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.pro @@ -1,5 +1,5 @@ # Add more folders to ship with the application, here -folder_01.source = qml/mousearea-example +folder_01.source = qml/tic-tac-toe folder_01.target = qml DEPLOYMENTFOLDERS = folder_01 @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/mousearea/mousearea-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/tic-tac-toe exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/toys/toys.pro b/examples/declarative/toys/toys.pro index 2e35b44a..5c7f70b0 100644 --- a/examples/declarative/toys/toys.pro +++ b/examples/declarative/toys/toys.pro @@ -4,10 +4,5 @@ SUBDIRS += \ clocks \ corkboards \ dynamicscene \ - tic-tac-toe/tictactoe.pro \ + tic-tac-toe \ tvtennis - -# install -sources.files = toys.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys -INSTALLS += sources diff --git a/examples/declarative/toys/tvtennis/tvtennis.pro b/examples/declarative/toys/tvtennis/tvtennis.pro index 2b4cc07e..1b934494 100644 --- a/examples/declarative/toys/tvtennis/tvtennis.pro +++ b/examples/declarative/toys/tvtennis/tvtennis.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tvtennis +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/toys/tvtennis exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro index 74ef3b66..b3ff1bfb 100644 --- a/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro +++ b/examples/declarative/tutorials/extending/chapter1-basics/chapter1-basics.pro @@ -4,8 +4,7 @@ HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter1-basics -sources.files = $$SOURCES $$HEADERS app.qml chapter1-basics.pro -sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter1-basics -INSTALLS += target sources +qml.files = app.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter1-basics +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter1-basics +INSTALLS += target qml diff --git a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro index 05b8e7dd..b5c8703e 100644 --- a/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro +++ b/examples/declarative/tutorials/extending/chapter2-methods/chapter2-methods.pro @@ -4,8 +4,7 @@ HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter2-methods -sources.files = $$SOURCES $$HEADERS app.qml chapter2-methods.pro -sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter2-methods -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter2-methods +qml.files = app.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter2-methods +INSTALLS += target qml diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro index 66a59503..cc37d591 100644 --- a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro +++ b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro @@ -4,8 +4,7 @@ HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter3-bindings -sources.files = $$SOURCES $$HEADERS app.qml chapter3-bindings.pro -sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter3-bindings -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter3-bindings +qml.files = app.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter3-bindings +INSTALLS += target qml diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 50583372..8152fcaf 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -6,8 +6,7 @@ SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter4-customPropertyTypes -sources.files = $$SOURCES $$HEADERS app.qml chapter4-customPropertyTypes.pro -sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter4-customPropertyTypes -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter4-customPropertyTypes +qml.files = app.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter4-customPropertyTypes +INSTALLS += target qml diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index e76d3807..ef45c8d3 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -6,8 +6,7 @@ SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter5-listproperties -sources.files = $$SOURCES $$HEADERS app.qml chapter5-listproperties.pro -sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter5-listproperties -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter5-listproperties +qml.files = app.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter5-listproperties +INSTALLS += target qml diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index f4013d5f..17986a6b 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin QT += declarative widgets DESTDIR = lib @@ -14,12 +14,7 @@ SOURCES += piechart.cpp \ pieslice.cpp \ chartsplugin.cpp -OTHER_FILES += chartsplugin.json - -maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri) - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending/chapter6-plugins -sources.files = $$SOURCES $$HEADERS $$OTHER_FILES app.qml chapter6-plugins.pro -sources.path = $$[QT_INSTALL_EXAMPLES]//qtquick1/declarative/tutorials/extending/chapter6-plugins -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter6-plugins +qml.files = app.qml qmldir +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/extending/chapter6-plugins +INSTALLS += target qml diff --git a/examples/declarative/tutorials/extending/extending.pro b/examples/declarative/tutorials/extending/extending.pro index 19bf40b9..fe9a5cc7 100644 --- a/examples/declarative/tutorials/extending/extending.pro +++ b/examples/declarative/tutorials/extending/extending.pro @@ -7,9 +7,3 @@ SUBDIRS += \ chapter4-customPropertyTypes \ chapter5-listproperties \ chapter6-plugins - -# install -sources.files = extending.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials/extending -INSTALLS += sources - diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/declarative/tutorials/gettingStarted/filedialog/dialogPlugin.cpp index bc711932..bc711932 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp +++ b/examples/declarative/tutorials/gettingStarted/filedialog/dialogPlugin.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/declarative/tutorials/gettingStarted/filedialog/dialogPlugin.h index e87b7e82..e87b7e82 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h +++ b/examples/declarative/tutorials/gettingStarted/filedialog/dialogPlugin.h diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp b/examples/declarative/tutorials/gettingStarted/filedialog/directory.cpp index fe5018b1..fe5018b1 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.cpp +++ b/examples/declarative/tutorials/gettingStarted/filedialog/directory.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h b/examples/declarative/tutorials/gettingStarted/filedialog/directory.h index 90e15781..90e15781 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/directory.h +++ b/examples/declarative/tutorials/gettingStarted/filedialog/directory.h diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp b/examples/declarative/tutorials/gettingStarted/filedialog/file.cpp index 7921489c..7921489c 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/file.cpp +++ b/examples/declarative/tutorials/gettingStarted/filedialog/file.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h b/examples/declarative/tutorials/gettingStarted/filedialog/file.h index ee93aa2e..ee93aa2e 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/file.h +++ b/examples/declarative/tutorials/gettingStarted/filedialog/file.h diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.json b/examples/declarative/tutorials/gettingStarted/filedialog/filedialog.json index 0967ef42..0967ef42 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.json +++ b/examples/declarative/tutorials/gettingStarted/filedialog/filedialog.json diff --git a/examples/declarative/tutorials/gettingStarted/filedialog/filedialog.pro b/examples/declarative/tutorials/gettingStarted/filedialog/filedialog.pro new file mode 100644 index 00000000..f7f6edd7 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/filedialog/filedialog.pro @@ -0,0 +1,22 @@ +TEMPLATE = lib +CONFIG += plugin +QT += declarative + +DESTDIR += ../plugins +OBJECTS_DIR = tmp +MOC_DIR = tmp + +TARGET = FileDialog + +HEADERS += directory.h \ + file.h \ + dialogPlugin.h + +SOURCES += directory.cpp \ + file.cpp \ + dialogPlugin.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/gettingStarted/filedialog +qml.files = qmldir +qml.path = $$[QT_INSTALL_EXAMPLES]/declarative/tutorials/gettingStarted/filedialog +INSTALLS += target qml diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir b/examples/declarative/tutorials/gettingStarted/filedialog/qmldir index c2b27dad..c2b27dad 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/qmldir +++ b/examples/declarative/tutorials/gettingStarted/filedialog/qmldir diff --git a/examples/declarative/tutorials/gettingStarted/gettingStarted.pro b/examples/declarative/tutorials/gettingStarted/gettingStarted.pro new file mode 100644 index 00000000..4fb010b8 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gettingStarted.pro @@ -0,0 +1,11 @@ +TEMPLATE = subdirs +SUBDIRS = \ + filedialog\ + + +EXAMPLE_FILES = \ + gettingStarted.qml \ + core \ + images \ + parts \ + pics diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/declarative/tutorials/gettingStarted/gettingStarted.qml index 84bb0c7d..84bb0c7d 100644 --- a/examples/tutorials/gettingStarted/gsQml/texteditor.qml +++ b/examples/declarative/tutorials/gettingStarted/gettingStarted.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/button.qml b/examples/declarative/tutorials/gettingStarted/gsQml/core/button.qml index 1c31f661..1c31f661 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/button.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/core/button.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/core/editMenu.qml index 8dc7b246..8dc7b246 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/editMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/core/editMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml b/examples/declarative/tutorials/gettingStarted/gsQml/core/fileDialog.qml index b2f845c3..b2f845c3 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/fileDialog.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/core/fileDialog.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/core/fileMenu.qml index 87391893..87391893 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/fileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/core/fileMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml b/examples/declarative/tutorials/gettingStarted/gsQml/core/menuBar.qml index 8ddb03ae..8ddb03ae 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/menuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/core/menuBar.qml diff --git a/examples/tutorials/gettingStarted/gsQml/core/qmldir b/examples/declarative/tutorials/gettingStarted/gsQml/core/qmldir index 32dc8071..32dc8071 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/qmldir +++ b/examples/declarative/tutorials/gettingStarted/gsQml/core/qmldir diff --git a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml b/examples/declarative/tutorials/gettingStarted/gsQml/core/textArea.qml index 6e392ac9..6e392ac9 100644 --- a/examples/tutorials/gettingStarted/gsQml/core/textArea.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/core/textArea.qml diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp new file mode 100644 index 00000000..bc711932 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.cpp @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "dialogPlugin.h" +#include "directory.h" +#include "file.h" +#include <QtDeclarative/qdeclarative.h> + +void DialogPlugin::registerTypes(const char *uri) +{ + //register the class Directory into QML as a "Directory" element version 1.0 + qmlRegisterType<Directory>(uri, 1, 0, "Directory"); + qmlRegisterType<File>(uri,1,0,"File"); +} diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h new file mode 100644 index 00000000..e87b7e82 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/dialogPlugin.h @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIALOGPLUGIN_H +#define DIALOGPLUGIN_H + +#include <QtDeclarative/QDeclarativeExtensionPlugin> + +class DialogPlugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "filedialog.json") + + public: + //registerTypes is inherited from QDeclarativeExtensionPlugin + void registerTypes(const char *uri); + +}; + +#endif + diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/directory.cpp b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/directory.cpp new file mode 100644 index 00000000..fe5018b1 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/directory.cpp @@ -0,0 +1,224 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "directory.h" +#include <QDebug> + +/* +Directory constructor + +Initialize the saves directory and creates the file list +*/ +Directory::Directory(QObject *parent) : QObject(parent) +{ + m_dir.cd( QDir::currentPath() ); + + //go to the saved directory. if not found, create save directory + m_saveDir = "saves"; + if ( m_dir.cd(m_saveDir) == 0 ) { + m_dir.mkdir(m_saveDir); + m_dir.cd(m_saveDir); + } + m_filterList << "*.txt"; + refresh(); +} + +/* +Directory::filesNumber +Return the number of Files +*/ +int Directory::filesCount() const +{ + return m_fileList.size(); +} + +/* +Function called to append data onto list property +*/ +void appendFiles(QDeclarativeListProperty<File> * property, File * file) +{ + Q_UNUSED(property); + Q_UNUSED(file); + //Do nothing. can't add to a directory using this method +} + +/* +Function called to retrieve file in the list using an index +*/ +File* fileAt(QDeclarativeListProperty<File> * property, int index) +{ + return static_cast< QList<File *> *>(property->data)->at(index); +} + +/* +Returns the number of files in the list +*/ +int filesSize(QDeclarativeListProperty<File> * property) +{ + return static_cast< QList<File *> *>(property->data)->size(); +} + +/* +Function called to empty the list property contents +*/ +void clearFilesPtr(QDeclarativeListProperty<File> *property) +{ + return static_cast< QList<File *> *>(property->data)->clear(); +} + +/* +Returns the list of files as a QDeclarativeListProperty. +*/ +QDeclarativeListProperty<File> Directory::files() +{ + refresh(); + return QDeclarativeListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt, &clearFilesPtr ); +} + +/* +Return the name of the currently selected file +*/ +QString Directory::filename() const +{ + return currentFile.name(); +} + +/* +Return the file's content as a string. +*/ +QString Directory::fileContent() const +{ + return m_fileContent; +} + +/* +Set the file name of the current file +*/ +void Directory::setFilename(const QString &str) +{ + if( str != currentFile.name() ) { + currentFile.setName(str); + emit filenameChanged(); + } +} + +/* +Set the content of the file as a string +*/ +void Directory::setFileContent(const QString &str) +{ + if(str != m_fileContent){ + m_fileContent = str; + emit fileContentChanged(); + } +} + +/* +Called from QML to save the file using the filename and file content. +Saving makes sure that the file has a .txt extension. +*/ +void Directory::saveFile() +{ + if(currentFile.name().size() == 0){ + qWarning()<< "Empty filename. no save"; + return; + } + QString extendedName = currentFile.name(); + if(!currentFile.name().endsWith(".txt")){ + extendedName.append(".txt"); + } + QFile file( m_dir.filePath(extendedName) ); + if ( file.open(QFile::WriteOnly | QFile::Truncate) ) { + QTextStream outStream(&file); + outStream << m_fileContent; + } + file.close(); + refresh(); + emit directoryChanged(); +} + +/* +Load the contents of a file. +Only loads files with a .txt extension +*/ +void Directory::loadFile() +{ + m_fileContent.clear(); + QString extendedName = currentFile.name(); + if( !currentFile.name().endsWith(".txt") ) { + extendedName.append(".txt"); + } + + QFile file( m_dir.filePath(extendedName) ); + if ( file.open(QFile::ReadOnly ) ) { + QTextStream inStream(&file); + + QString line; + do { + line = inStream.read(75); + m_fileContent.append(line); + } while ( !line.isNull() ) ; + } + file.close(); +} + +/* +Reloads the content of the files list. This is to ensure that the newly +created files are added onto the list. +*/ +void Directory::refresh() +{ + m_dirFiles = m_dir.entryList(m_filterList,QDir::Files,QDir::Name); + m_fileList.clear(); + + File * file; + for(int i = 0; i < m_dirFiles.size() ; i ++) { + file = new File(); + + if( m_dirFiles.at(i).endsWith(".txt") ) { + QString name = m_dirFiles.at(i); + file->setName( name.remove(".txt",Qt::CaseSensitive) ); + } + else { + file->setName(m_dirFiles.at(i)); + } + m_fileList.append(file); + } +} diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/directory.h b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/directory.h new file mode 100644 index 00000000..90e15781 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/directory.h @@ -0,0 +1,107 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIRECTORY_H +#define DIRECTORY_H + +#include "file.h" + +#include <QDir> +#include <QStringList> +#include <QTextStream> +#include <QDeclarativeListProperty> +#include <QObject> + +class Directory : public QObject { + + Q_OBJECT + + //number of files in the directory + Q_PROPERTY(int filesCount READ filesCount) + + //list property containing file names as QString + Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT ) + + //file name of the text file to read/write + Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged) + + //text content of the file + Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged) + + public: + Directory(QObject *parent = 0); + + //properties' read functions + int filesCount() const; + QString filename() const; + QString fileContent() const; + QDeclarativeListProperty<File> files(); + + //properties' write functions + void setFilename(const QString &str); + void setFileContent(const QString &str); + + //accessible from QML + Q_INVOKABLE void saveFile(); + Q_INVOKABLE void loadFile(); + + signals: + void directoryChanged(); + void filenameChanged(); + void fileContentChanged(); + + private: + QDir m_dir; + QStringList m_dirFiles; + File currentFile; + QString m_saveDir; + QStringList m_filterList; + + //contains the file data in QString format + QString m_fileContent; + + //Registered to QML in a plugin. Accessible from QML as a property of Directory + QList<File *> m_fileList; + + //refresh content of the directory + void refresh(); +}; + +#endif diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/file.cpp b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/file.cpp new file mode 100644 index 00000000..7921489c --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/file.cpp @@ -0,0 +1,57 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include "file.h" + +File::File(QObject *parent) : QObject(parent) +{ + m_name = ""; +} + +QString File::name() const{ + return m_name; +} +void File::setName(const QString &str){ + if(str != m_name){ + m_name = str; + emit nameChanged(); + } +} diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/file.h b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/file.h new file mode 100644 index 00000000..ee93aa2e --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/file.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef FILE_H +#define FILE_H + + +#include <QString> +#include <QObject> + +class File : public QObject{ + + Q_OBJECT + + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) + + public: + File(QObject *parent = 0); + + QString name() const; + void setName(const QString &str); + + signals: + void nameChanged(); + + private: + QString m_name; +}; + +#endif diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.json b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/filedialog.json index 0967ef42..0967ef42 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.json +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/filedialog.json diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro index d85787d0..f25c490b 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin QT += declarative DESTDIR += ../plugins diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/qmldir index c2b27dad..c2b27dad 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir +++ b/examples/declarative/tutorials/gettingStarted/gsQml/filedialog/qmldir diff --git a/examples/tutorials/gettingStarted/gsQml/images/arrow.png b/examples/declarative/tutorials/gettingStarted/gsQml/images/arrow.png Binary files differindex 14978c2e..14978c2e 100644 --- a/examples/tutorials/gettingStarted/gsQml/images/arrow.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/images/arrow.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part0/Button.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part0/Button.qml index 0794e8a2..0794e8a2 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part0/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part0/Button.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/Button.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/Button.qml index 1048711a..1048711a 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/Button.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml index cf5e481d..cf5e481d 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/EditMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml index b74ea0e4..b74ea0e4 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/FileMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml index a1512e0b..a1512e0b 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/SimpleButton.qml diff --git a/doc/src/images/qml-texteditor1_button.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_button.png Binary files differindex aab64bcf..aab64bcf 100644 --- a/doc/src/images/qml-texteditor1_button.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_button.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_editmenu.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_editmenu.png Binary files differindex d3ff66f2..d3ff66f2 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_editmenu.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_editmenu.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_filemenu.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_filemenu.png Binary files differindex f2e2b0d9..f2e2b0d9 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_filemenu.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_filemenu.png diff --git a/doc/src/images/qml-texteditor1_simplebutton.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_simplebutton.png Binary files differindex 21ce5092..21ce5092 100644 --- a/doc/src/images/qml-texteditor1_simplebutton.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_simplebutton.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/qml-texteditor.qmlproject b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/qml-texteditor.qmlproject index d4909f86..d4909f86 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/qml-texteditor.qmlproject +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part1/qml-texteditor.qmlproject diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/Button.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/Button.qml index 744d4bf4..744d4bf4 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/Button.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml index 20f88545..20f88545 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/EditMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml index 75aac68b..75aac68b 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/FileMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml index c53196a4..c53196a4 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/MenuBar.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/pics/qml-texteditor2_menubar.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/pics/qml-texteditor2_menubar.png Binary files differindex da959a34..da959a34 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/pics/qml-texteditor2_menubar.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/pics/qml-texteditor2_menubar.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part2/qml-texteditor2.qmlproject b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/qml-texteditor2.qmlproject index d4909f86..d4909f86 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part2/qml-texteditor2.qmlproject +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part2/qml-texteditor2.qmlproject diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/Button.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/Button.qml index 744d4bf4..744d4bf4 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/Button.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml index 20f88545..20f88545 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/EditMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml index 75aac68b..75aac68b 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/FileMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml index c53196a4..c53196a4 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/MenuBar.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml index 4b09eff5..4b09eff5 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/TextArea.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml index 61beb1c6..61beb1c6 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/TextEditor.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/images/arrow.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/images/arrow.png Binary files differindex 14978c2e..14978c2e 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/images/arrow.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/images/arrow.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/pics/qml-texteditor3_texteditor.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/pics/qml-texteditor3_texteditor.png Binary files differindex d0623b5a..d0623b5a 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/pics/qml-texteditor3_texteditor.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/pics/qml-texteditor3_texteditor.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part3/qml-texteditor3.qmlproject b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/qml-texteditor3.qmlproject index d4909f86..d4909f86 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part3/qml-texteditor3.qmlproject +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part3/qml-texteditor3.qmlproject diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/Button.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/Button.qml index e0ba7ed7..e0ba7ed7 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/Button.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml index 7177ed25..7177ed25 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/EditMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml index f897be60..f897be60 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/FileMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml index 7dbb1c9a..7dbb1c9a 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/MenuBar.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml index df28ba3f..df28ba3f 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/SimpleButton.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml index f83e5d49..f83e5d49 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/TextArea.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml index 35d0e88c..35d0e88c 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/TextEditor.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/images/arrow.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/images/arrow.png Binary files differindex 14978c2e..14978c2e 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/images/arrow.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/images/arrow.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/pics/qml-texteditor4_texteditor.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/pics/qml-texteditor4_texteditor.png Binary files differindex a195fb87..a195fb87 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/pics/qml-texteditor4_texteditor.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/pics/qml-texteditor4_texteditor.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part4/qml-texteditor4.qmlproject b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/qml-texteditor4.qmlproject index d4909f86..d4909f86 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part4/qml-texteditor4.qmlproject +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part4/qml-texteditor4.qmlproject diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml index 84d8d874..84d8d874 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/TextEditor.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml index 9c15a1aa..9c15a1aa 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/Button.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml index 1677440f..1677440f 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/EditMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml index ca9e5c23..ca9e5c23 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/FileDialog.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml index c4bbad00..c4bbad00 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/FileMenu.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml index db698518..db698518 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/MenuBar.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml index 64a1bae6..64a1bae6 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/TextArea.qml diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir index 3f22778a..3f22778a 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/core/qmldir diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp index 286374d8..286374d8 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h index ddcf82be..ddcf82be 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/dialogPlugin.h diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.cpp b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.cpp index c5f455c7..c5f455c7 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.cpp +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.h b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.h index 1d01372e..1d01372e 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.h +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/directory.h diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.cpp b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.cpp index 9da61921..9da61921 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.cpp +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.cpp diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.h b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.h index 76c192e3..76c192e3 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.h +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/file.h diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.json b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.json @@ -0,0 +1 @@ +{} diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro index 62477470..f9229a3b 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/filedialog.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -CONFIG += qt plugin +CONFIG += plugin QT += declarative DESTDIR += ../plugins diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir new file mode 100644 index 00000000..c2b27dad --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/filedialog/qmldir @@ -0,0 +1 @@ +plugin FileDialog plugins diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/images/arrow.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/images/arrow.png Binary files differindex 14978c2e..14978c2e 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/images/arrow.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/images/arrow.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_editmenu.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_editmenu.png Binary files differindex 27feed5e..27feed5e 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_editmenu.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_editmenu.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_filemenu.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_filemenu.png Binary files differindex 4d8f9f22..4d8f9f22 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_filemenu.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_filemenu.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_newfile.png b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_newfile.png Binary files differindex 680acfe8..680acfe8 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_newfile.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/pics/qml-texteditor5_newfile.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part5/qml-texteditor5.qmlproject b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/qml-texteditor5.qmlproject index ed034dff..ed034dff 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part5/qml-texteditor5.qmlproject +++ b/examples/declarative/tutorials/gettingStarted/gsQml/parts/part5/qml-texteditor5.qmlproject diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png b/examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png Binary files differindex 27feed5e..27feed5e 100644 --- a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_editmenu.png diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png b/examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png Binary files differindex 4d8f9f22..4d8f9f22 100644 --- a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_filemenu.png diff --git a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png b/examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png Binary files differindex 680acfe8..680acfe8 100644 --- a/examples/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png +++ b/examples/declarative/tutorials/gettingStarted/gsQml/pics/qml-texteditor5_newfile.png diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.pro b/examples/declarative/tutorials/gettingStarted/gsQml/texteditor.pro index aa5306cc..aa5306cc 100644 --- a/examples/tutorials/gettingStarted/gsQml/texteditor.pro +++ b/examples/declarative/tutorials/gettingStarted/gsQml/texteditor.pro diff --git a/examples/declarative/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/declarative/tutorials/gettingStarted/gsQml/texteditor.qml new file mode 100644 index 00000000..84bb0c7d --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/gsQml/texteditor.qml @@ -0,0 +1,132 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 +import "core" + +Rectangle { + id: screen + width: 1000; height: 1000 + property int partition: height/3 + border { width: 1; color: "#DCDCCC"} + state: "DRAWER_CLOSED" + + //Item 1: MenuBar on the top portion of the screen + MenuBar { + id:menuBar + height: screen.partition; width: screen.width + z: 1 + } + + //Item 2: The editable text area + TextArea { + id: textArea + y: drawer.height + color: "#3F3F3F" + fontColor: "#DCDCCC" + height: partition*2; width:parent.width + } + + //Item 3: The drawer handle + Rectangle { + id: drawer + height: 15; width: parent.width + border { color : "#6A6D6A"; width: 1 } + z: 1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.77; color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#6A6D6A" } + } + Image { + id: arrowIcon + source: "images/arrow.png" + anchors.horizontalCenter: parent.horizontalCenter + Behavior{ NumberAnimation { property: "rotation"; easing.type: Easing.OutExpo } } + } + + MouseArea { + id: drawerMouseArea + anchors.fill: parent + hoverEnabled: true + onEntered: parent.border.color = Qt.lighter("#6A6D6A") + onExited: parent.border.color = "#6A6D6A" + onClicked: { + if (screen.state == "DRAWER_CLOSED") { + screen.state = "DRAWER_OPEN" + } + else if (screen.state == "DRAWER_OPEN"){ + screen.state = "DRAWER_CLOSED" + } + } + } + } + +//! [states] + states:[ + State { + name: "DRAWER_OPEN" + PropertyChanges { target: menuBar; y: 0} + PropertyChanges { target: textArea; y: partition + drawer.height} + PropertyChanges { target: drawer; y: partition} + PropertyChanges { target: arrowIcon; rotation: 180} + }, + State { + name: "DRAWER_CLOSED" + PropertyChanges { target: menuBar; y:-height; } + PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height } + PropertyChanges { target: drawer; y: 0 } + PropertyChanges { target: arrowIcon; rotation: 0 } + } + ] +//! [states] + +//! [transitions] + transitions: [ + Transition { + to: "*" + NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type:Easing.OutExpo } + NumberAnimation { target: menuBar; properties: "y"; duration: 100; easing.type: Easing.OutExpo } + NumberAnimation { target: drawer; properties: "y"; duration: 100; easing.type: Easing.OutExpo } + } + ] +//! [transitions] +} diff --git a/examples/declarative/tutorials/gettingStarted/images/arrow.png b/examples/declarative/tutorials/gettingStarted/images/arrow.png Binary files differnew file mode 100644 index 00000000..14978c2e --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/images/arrow.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml new file mode 100644 index 00000000..0794e8a2 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [document] +import QtQuick 1.0 + +Rectangle { + id: simplebutton + color: "grey" + width: 150; height: 75 + + Text{ + id: buttonLabel + anchors.centerIn: parent + text: "button label" + } +} +//! [document] diff --git a/examples/declarative/tutorials/gettingStarted/parts/part1/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part1/Button.qml new file mode 100644 index 00000000..1048711a --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/Button.qml @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + + //identifier of the item + id: button + + property string label: "button label" + + //these properties act as constants, useable outside this QML file + property int buttonHeight: 75 + property int buttonWidth: 150 + + //the color highlight when the mouse hovers on the rectangle + property color onHoverColor: "gold" + property color borderColor: "white" + + //buttonColor is set to the button's main color + property color buttonColor: "lightblue" + + //set appearance properties + radius: 10 + smooth: true + border{color: "white"; width: 3} + width: buttonWidth; height: buttonHeight + + Text{ + id: buttonLabel + anchors.centerIn: parent + text: label + } + + //buttonClick() is callable and a signal handler, onButtonClick is automatically created + signal buttonClick() + onButtonClick: { + console.log(buttonLabel.text + " clicked" ) + } + + //define the clickable area to be the whole rectangle + MouseArea{ + id: buttonMouseArea + anchors.fill: parent //stretch the area to the parent's dimension + onClicked: buttonClick() + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = onHoverColor + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = borderColor + } + + //change the color of the button when pressed + color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part1/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part1/EditMenu.qml new file mode 100644 index 00000000..cf5e481d --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/EditMenu.qml @@ -0,0 +1,76 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: editMenu + height: 480; width:1000 + color: "powderblue" + property string menuName:"Edit" + + Rectangle{ + id:actionContainer + color:"transparent" + anchors.centerIn: parent + + width: parent.width; height: parent.height / 5 + Row{ + anchors.centerIn: parent + spacing: parent.width/6 + Button{ + id: loadButton + buttonColor: "lightgrey" + label: "Cut" + } + + Button{ + buttonColor: "grey" + id: saveButton + label: "Paste" + } + Button{ + id: exitButton + label: "Select All" + buttonColor: "darkgrey" + } + } + } +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part1/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part1/FileMenu.qml new file mode 100644 index 00000000..b74ea0e4 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/FileMenu.qml @@ -0,0 +1,91 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: fileMenu + + //the menuName is accessible from outside this QML file + property string menuName: "File" + + //generous amount of screen space that will allow the buttons to fit + height: 480; width:1000 + + color: "#6C646A" + + //a sub-rectangle allows the flexibility of setting the row area + Rectangle{ + id:actionContainer + + //make this rectangle invisible + color:"transparent" + anchors.centerIn: parent + + //the height is a good proportion that creates more space at the top of the row of buttons + width: parent.width; height: parent.height / 5 + + Row{ + anchors.centerIn: parent + spacing: parent.width/6 + Button{ + id: loadButton + buttonColor: "lightgrey" + label: "Load" + } + + Button{ + buttonColor: "grey" + id: saveButton + label: "Save" + } + Button{ + id: exitButton + label: "Exit" + buttonColor: "darkgrey" + + //exit the application if the exitButton is clicked + onButtonClick:{ + Qt.quit() + } + } + } + } +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part1/SimpleButton.qml b/examples/declarative/tutorials/gettingStarted/parts/part1/SimpleButton.qml new file mode 100644 index 00000000..a1512e0b --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/SimpleButton.qml @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + + //identifier of the item + id: simplebutton + + //the rectangle's fill color + color: "grey" + + //dimensions of the button + width: 150; height: 75 + + //A text element contains functionalities for creating texts + Text { + id: buttonLabel + + //center the text inside the parent + anchors.centerIn: parent + + //text property binds to the label displayed on the button + text: "button label" + } + + //define the clickable area to be the whole rectangle + MouseArea { + id: buttonMouseArea + anchors.fill: parent //anchor all sides of the mouse area to the rectangle's anchors + + //onClicked handles valid mouse button clicks + onClicked: console.log(buttonLabel.text + " clicked" ) + } +} diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_button.png b/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_button.png Binary files differindex aab64bcf..aab64bcf 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_button.png +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_button.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_editmenu.png b/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_editmenu.png Binary files differnew file mode 100644 index 00000000..d3ff66f2 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_editmenu.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_filemenu.png b/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_filemenu.png Binary files differnew file mode 100644 index 00000000..f2e2b0d9 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_filemenu.png diff --git a/examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_simplebutton.png b/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_simplebutton.png Binary files differindex 21ce5092..21ce5092 100644 --- a/examples/tutorials/gettingStarted/gsQml/parts/part1/pics/qml-texteditor1_simplebutton.png +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/pics/qml-texteditor1_simplebutton.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part1/qml-texteditor.qmlproject b/examples/declarative/tutorials/gettingStarted/parts/part1/qml-texteditor.qmlproject new file mode 100644 index 00000000..d4909f86 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part1/qml-texteditor.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.0 + +Project { + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ " ../exampleplugin " ] +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part2/Button.qml new file mode 100644 index 00000000..744d4bf4 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/Button.qml @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + + //identifier of the item + id: button + + property string label: "button label" + + //these properties act as constants, useable outside this QML file + property int buttonHeight: 75 + property int buttonWidth: 150 + + //the color highlight when the mouse hovers on the rectangle + property color onHoverColor: "gold" + property color borderColor: "white" + + //buttonColor is set to the button's main color + property color buttonColor: "lightblue" + + //set appearance properties + radius:10 + smooth: true + border{color: "white"; width: 3} + width: buttonWidth; height: buttonHeight + + Text{ + id: buttonLabel + anchors.centerIn: parent + text: label + } + + //buttonClick() is callable and a signal handler, onButtonClick is automatically created + signal buttonClick() + onButtonClick: { + console.log(buttonLabel.text + " clicked" ) + } + + //define the clickable area to be the whole rectangle + MouseArea{ + id: buttonMouseArea + anchors.fill: parent //stretch the area to the parent's dimension + onClicked: buttonClick() + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = onHoverColor + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = borderColor + + } + + //change the color of the button when pressed + color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part2/EditMenu.qml new file mode 100644 index 00000000..20f88545 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/EditMenu.qml @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: editMenu + height: 480; width:1000 + color: "powderblue" + property string menuName:"Edit" + + Rectangle{ + id:actionContainer + color:"transparent" + anchors.centerIn: parent + + width: parent.width; height: parent.height / 5 + Row{ + anchors.centerIn: parent + spacing: parent.width/6 + Button{ + id: loadButton + buttonColor: "lightgrey" + label: "Cut" + } + + Button{ + buttonColor: "grey" + id: saveButton + label: "Paste" + } + Button{ + id: exitButton + label: "Select All" + buttonColor: "darkgrey" + } + } + } + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part2/FileMenu.qml new file mode 100644 index 00000000..75aac68b --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/FileMenu.qml @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: fileMenu + + //the menuName is accessible from outside this QML file + property string menuName: "File" + + //generous amount of screen space that will allow the buttons to fit + height: 480; width:1000 + + color: "#6C646A" + + //a sub-rectangle allows the flexibility of setting the row area + Rectangle{ + id:actionContainer + + //make this rectangle invisible + color:"transparent" + anchors.centerIn: parent + + //the height is a good proportion that creates more space at the top of the row of buttons + width: parent.width; height: parent.height / 5 + + Row{ + anchors.centerIn: parent + spacing: parent.width/6 + Button{ + id: loadButton + buttonColor: "lightgrey" + label: "Load" + } + + Button{ + buttonColor: "grey" + id: saveButton + label: "Save" + } + Button{ + id: exitButton + label: "Exit" + buttonColor: "darkgrey" + + //exit the application if the exitButton is clicked + onButtonClick:{ + Qt.quit() + } + } + } + } + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/parts/part2/MenuBar.qml new file mode 100644 index 00000000..c53196a4 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/MenuBar.qml @@ -0,0 +1,140 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: menuBar + width: 1000 + height:300 + + property color fileColor: "thistle" + property color editColor: "powderblue" + + //container for the header and the buttons + Rectangle{ + + id: labelList + height:parent.height/10 + width: parent.width + color: "steelblue" + + //default z is 0, items with higher z values are shown on top of items with lower z values + z: 1 + + //row displays its children in a vertical row + Row{ + anchors.centerIn: parent + spacing:40 + Button{ + height: 20 + width: 50 + label: "File" + id: fileButton + buttonColor : menuListView.currentIndex == 0? fileColor : Qt.darker(fileColor, 1.5) + scale: menuListView.currentIndex == 0? 1.25: 1 + radius: 1 + + //on a button click, change the list's currently selected item to FileMenu + onButtonClick: { + menuListView.currentIndex = 0 + } + } + Button{ + height: 20 + width: 50 + id: editButton + buttonColor : menuListView.currentIndex == 1? editColor : Qt.darker(editColor, 1.5) + scale: menuListView.currentIndex == 1? 1.25: 1 + label: "Edit" + radius: 1 + + //on a button click, change the list's currently selected item to EditMenu + onButtonClick: { + menuListView.currentIndex = 1 + } + + + } + + + } + } + + //a list of visual items already have delegates handling their display + VisualItemModel{ + id: menuListModel + + FileMenu{ + width: menuListView.width + height: menuBar.height + color: fileColor + } + EditMenu{ + color: editColor + width: menuListView.width + height: menuBar.height + + } + } + + //list view will display a model according to a delegate + ListView{ + id: menuListView + anchors.fill:parent + anchors.bottom: parent.bottom + width:parent.width + height: parent.height + + //the model contains the data + model: menuListModel + + //control the movement of the menu switching + snapMode: ListView.SnapOneItem + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 5000 + highlightFollowsCurrentItem: true + highlightMoveDuration:240 + highlightRangeMode: ListView.StrictlyEnforceRange + } + + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/pics/qml-texteditor2_menubar.png b/examples/declarative/tutorials/gettingStarted/parts/part2/pics/qml-texteditor2_menubar.png Binary files differnew file mode 100644 index 00000000..da959a34 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/pics/qml-texteditor2_menubar.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/qml-texteditor2.qmlproject b/examples/declarative/tutorials/gettingStarted/parts/part2/qml-texteditor2.qmlproject new file mode 100644 index 00000000..d4909f86 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/qml-texteditor2.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.0 + +Project { + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ " ../exampleplugin " ] +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/Button.qml new file mode 100644 index 00000000..744d4bf4 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/Button.qml @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + + //identifier of the item + id: button + + property string label: "button label" + + //these properties act as constants, useable outside this QML file + property int buttonHeight: 75 + property int buttonWidth: 150 + + //the color highlight when the mouse hovers on the rectangle + property color onHoverColor: "gold" + property color borderColor: "white" + + //buttonColor is set to the button's main color + property color buttonColor: "lightblue" + + //set appearance properties + radius:10 + smooth: true + border{color: "white"; width: 3} + width: buttonWidth; height: buttonHeight + + Text{ + id: buttonLabel + anchors.centerIn: parent + text: label + } + + //buttonClick() is callable and a signal handler, onButtonClick is automatically created + signal buttonClick() + onButtonClick: { + console.log(buttonLabel.text + " clicked" ) + } + + //define the clickable area to be the whole rectangle + MouseArea{ + id: buttonMouseArea + anchors.fill: parent //stretch the area to the parent's dimension + onClicked: buttonClick() + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = onHoverColor + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = borderColor + + } + + //change the color of the button when pressed + color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/EditMenu.qml new file mode 100644 index 00000000..20f88545 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/EditMenu.qml @@ -0,0 +1,77 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: editMenu + height: 480; width:1000 + color: "powderblue" + property string menuName:"Edit" + + Rectangle{ + id:actionContainer + color:"transparent" + anchors.centerIn: parent + + width: parent.width; height: parent.height / 5 + Row{ + anchors.centerIn: parent + spacing: parent.width/6 + Button{ + id: loadButton + buttonColor: "lightgrey" + label: "Cut" + } + + Button{ + buttonColor: "grey" + id: saveButton + label: "Paste" + } + Button{ + id: exitButton + label: "Select All" + buttonColor: "darkgrey" + } + } + } + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/FileMenu.qml new file mode 100644 index 00000000..75aac68b --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/FileMenu.qml @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: fileMenu + + //the menuName is accessible from outside this QML file + property string menuName: "File" + + //generous amount of screen space that will allow the buttons to fit + height: 480; width:1000 + + color: "#6C646A" + + //a sub-rectangle allows the flexibility of setting the row area + Rectangle{ + id:actionContainer + + //make this rectangle invisible + color:"transparent" + anchors.centerIn: parent + + //the height is a good proportion that creates more space at the top of the row of buttons + width: parent.width; height: parent.height / 5 + + Row{ + anchors.centerIn: parent + spacing: parent.width/6 + Button{ + id: loadButton + buttonColor: "lightgrey" + label: "Load" + } + + Button{ + buttonColor: "grey" + id: saveButton + label: "Save" + } + Button{ + id: exitButton + label: "Exit" + buttonColor: "darkgrey" + + //exit the application if the exitButton is clicked + onButtonClick:{ + Qt.quit() + } + } + } + } + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/MenuBar.qml new file mode 100644 index 00000000..c53196a4 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/MenuBar.qml @@ -0,0 +1,140 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: menuBar + width: 1000 + height:300 + + property color fileColor: "thistle" + property color editColor: "powderblue" + + //container for the header and the buttons + Rectangle{ + + id: labelList + height:parent.height/10 + width: parent.width + color: "steelblue" + + //default z is 0, items with higher z values are shown on top of items with lower z values + z: 1 + + //row displays its children in a vertical row + Row{ + anchors.centerIn: parent + spacing:40 + Button{ + height: 20 + width: 50 + label: "File" + id: fileButton + buttonColor : menuListView.currentIndex == 0? fileColor : Qt.darker(fileColor, 1.5) + scale: menuListView.currentIndex == 0? 1.25: 1 + radius: 1 + + //on a button click, change the list's currently selected item to FileMenu + onButtonClick: { + menuListView.currentIndex = 0 + } + } + Button{ + height: 20 + width: 50 + id: editButton + buttonColor : menuListView.currentIndex == 1? editColor : Qt.darker(editColor, 1.5) + scale: menuListView.currentIndex == 1? 1.25: 1 + label: "Edit" + radius: 1 + + //on a button click, change the list's currently selected item to EditMenu + onButtonClick: { + menuListView.currentIndex = 1 + } + + + } + + + } + } + + //a list of visual items already have delegates handling their display + VisualItemModel{ + id: menuListModel + + FileMenu{ + width: menuListView.width + height: menuBar.height + color: fileColor + } + EditMenu{ + color: editColor + width: menuListView.width + height: menuBar.height + + } + } + + //list view will display a model according to a delegate + ListView{ + id: menuListView + anchors.fill:parent + anchors.bottom: parent.bottom + width:parent.width + height: parent.height + + //the model contains the data + model: menuListModel + + //control the movement of the menu switching + snapMode: ListView.SnapOneItem + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 5000 + highlightFollowsCurrentItem: true + highlightMoveDuration:240 + highlightRangeMode: ListView.StrictlyEnforceRange + } + + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/TextArea.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/TextArea.qml new file mode 100644 index 00000000..4b09eff5 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/TextArea.qml @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id:textArea + + width :400 + height:400 + color: "white" + + Flickable{ + id: flickArea + + width: parent.width + height: parent.height + anchors.fill:parent + + function ensureVisible(r){ + if (contentX >= r.x) + contentX = r.x; + else if (contentX+width <= r.x+r.width) + contentX = r.x+r.width-width; + if (contentY >= r.y) + contentY = r.y; + else if (contentY+height <= r.y+r.height) + contentY = r.y+r.height-height; + } + + TextEdit{ + id: textEditor + anchors.fill:parent + width:parent.width; height:parent.height + color:"midnightblue" + focus: true + + wrapMode: TextEdit.Wrap + + onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) + } + } +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/TextEditor.qml new file mode 100644 index 00000000..61beb1c6 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/TextEditor.qml @@ -0,0 +1,68 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + + id: screen + width: 1000; height: 1000 + border.color:"black" + //the screen is partitioned into the MenuBar and TextArea. 1/3 of the screen is assigned to the MenuBar + property int partition: height/3 + + MenuBar{ + id:menuBar + height: partition + width:parent.width + z: 1 + } + + + TextArea{ + id:textArea + anchors.bottom:parent.bottom + y: partition + color: "azure" + height: partition*2 + width:parent.width + } + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/images/arrow.png b/examples/declarative/tutorials/gettingStarted/parts/part3/images/arrow.png Binary files differnew file mode 100644 index 00000000..14978c2e --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/images/arrow.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/pics/qml-texteditor3_texteditor.png b/examples/declarative/tutorials/gettingStarted/parts/part3/pics/qml-texteditor3_texteditor.png Binary files differnew file mode 100644 index 00000000..d0623b5a --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/pics/qml-texteditor3_texteditor.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/qml-texteditor3.qmlproject b/examples/declarative/tutorials/gettingStarted/parts/part3/qml-texteditor3.qmlproject new file mode 100644 index 00000000..d4909f86 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/qml-texteditor3.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.0 + +Project { + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ " ../exampleplugin " ] +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/Button.qml new file mode 100644 index 00000000..e0ba7ed7 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/Button.qml @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + + //identifier of the item + id: button + + //these properties act as constants, useable outside this QML file + property int buttonHeight: 75 + property int buttonWidth: 150 + + //attaches to the Text element's text content + property string label + property color textColor: buttonLabel.color + + //the color highlight when the mouse hovers on the rectangle + property color onHoverColor: "gold" + property color borderColor: "white" + + //buttonColor is set to the button's main color + property color buttonColor: "lightblue" + + //set appearance properties + radius:10 + smooth: true + border.color: "white" + border.width: 3 + width: buttonWidth; height: buttonHeight + + Text{ + id: buttonLabel + anchors.centerIn: parent + text: label //"button label" //bind the text to the parent's text + } + + //buttonClick() is callable and a signal handler, onButtonClick is automatically created + signal buttonClick() + onButtonClick: { + console.log(buttonLabel.text + " clicked" ) + } + + //define the clickable area to be the whole rectangle + MouseArea{ + id: buttonMouseArea + anchors.fill: parent //stretch the area to the parent's dimension + onClicked: buttonClick() + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = onHoverColor + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = borderColor + + } + + //change the color of the button when pressed + color: buttonMouseArea.pressed ? Qt.darker(buttonColor, 1.5) : buttonColor + //animate the color whenever the color property changes + Behavior on color { ColorAnimation{ duration: 55} } + + //scale the button when pressed + scale: buttonMouseArea.pressed ? 1.1 : 1.00 + //Animate the scale property change + Behavior on scale { NumberAnimation{ duration: 55} } + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/EditMenu.qml new file mode 100644 index 00000000..7177ed25 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/EditMenu.qml @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: editMenu + height: 480; width:1000 + color: "powderblue" + property string menuName:"Edit" + gradient: Gradient{ + GradientStop { position: 0.0; color: "#6A6F70" } + GradientStop { position: 1.0; color: Qt.darker("#6A6D67") } + } + + Rectangle{ + id:actionContainer + color:"transparent" + anchors.centerIn: parent + + width: parent.width; height: parent.height / 5 + Row{ + anchors.centerIn: parent + spacing: parent.width/6 + Button{ + id: loadButton + buttonColor: "lightgrey" + label: "Cut" + } + + Button{ + buttonColor: "grey" + id: saveButton + label: "Paste" + } + Button{ + id: exitButton + label: "Select All" + buttonColor: "darkgrey" + } + } + } + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/FileMenu.qml new file mode 100644 index 00000000..f897be60 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/FileMenu.qml @@ -0,0 +1,96 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: fileMenu + + //the menuName is accessible from outside this QML file + property string menuName: "File" + + //generous amount of screen space that will allow the buttons to fit + height: 480; width:1000 + + color: "#6C646A" + gradient: Gradient{ + GradientStop { position: 0.0; color: "#6C646A" } + GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } + } + + //a sub-rectangle allows the flexibility of setting the row area + Rectangle{ + id:actionContainer + + //make this rectangle invisible + color:"transparent" + anchors.centerIn: parent + + //the height is a good proportion that creates more space at the top of the row of buttons + width: parent.width; height: parent.height / 5 + + Row{ + anchors.centerIn: parent + spacing: parent.width/6 + Button{ + id: loadButton + buttonColor: "lightgrey" + label: "Load" + } + + Button{ + buttonColor: "grey" + id: saveButton + label: "Save" + } + Button{ + id: exitButton + label: "Exit" + buttonColor: "darkgrey" + + //exit the application if the exitButton is clicked + onButtonClick:{ + Qt.quit() + } + } + } + } + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/MenuBar.qml new file mode 100644 index 00000000..7dbb1c9a --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/MenuBar.qml @@ -0,0 +1,146 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: menuBar + width: 1000 + height:300 + + property color fileColor: "plum" + property color editColor: "powderblue" + + //container for the header and the buttons + Rectangle{ + + id: labelList + height:parent.height/10 + width: parent.width + color: "beige" + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.98;color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#0e1B20" } + } + + //default z is 0, items with higher z values are shown on top of items with lower z values + z: 1 + + //row displays its children in a vertical row + Row{ + anchors.centerIn: parent + spacing:40 + Button{ + height: 20 + width: 50 + label: "File" + id: fileButton + buttonColor : menuListView.currentIndex == 0? fileColor : Qt.darker(fileColor, 1.5) + scale: menuListView.currentIndex == 0? 1.25: 1 + radius: 1 + + //on a button click, change the list's currently selected item to FileMenu + onButtonClick: { + menuListView.currentIndex = 0 + } + } + Button{ + height: 20 + width: 50 + id: editButton + buttonColor : menuListView.currentIndex == 1? editColor : Qt.darker(editColor, 1.5) + scale: menuListView.currentIndex == 1? 1.25: 1 + label: "Edit" + radius: 1 + + //on a button click, change the list's currently selected item to EditMenu + onButtonClick: { + menuListView.currentIndex = 1 + } + + + } + + + } + } + + //a list of visual items already have delegates handling their display + VisualItemModel{ + id: menuListModel + + FileMenu{ + width: menuListView.width + height: menuBar.height + color: fileColor + } + EditMenu{ + color: editColor + width: menuListView.width + height: menuBar.height + + } + } + + //list view will display a model according to a delegate + ListView{ + id: menuListView + anchors.fill:parent + anchors.bottom: parent.bottom + width:parent.width + height: parent.height + + //the model contains the data + model: menuListModel + + //control the movement of the menu switching + snapMode: ListView.SnapOneItem + orientation: ListView.Horizontal + boundsBehavior: Flickable.StopAtBounds + flickDeceleration: 5000 + highlightFollowsCurrentItem: true + highlightMoveDuration:240 + highlightRangeMode: ListView.StrictlyEnforceRange + } + + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/SimpleButton.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/SimpleButton.qml new file mode 100644 index 00000000..df28ba3f --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/SimpleButton.qml @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: simplebutton + color: "grey" + width: 150; height: 75 + + Text{ + id: buttonLabel + anchors.centerIn: parent + text: "button label" + } + + MouseArea{ + id: buttonMouseArea + anchors.fill: parent + onClicked: console.log(buttonLabel.text + " clicked" ) + } +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/TextArea.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/TextArea.qml new file mode 100644 index 00000000..f83e5d49 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/TextArea.qml @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id:textArea + + width :400 + height:400 + property color fontColor: "white" + + Flickable{ + id: flickArea + + width: parent.width + height: parent.height + anchors.fill:parent + + function ensureVisible(r){ + if (contentX >= r.x) + contentX = r.x; + else if (contentX+width <= r.x+r.width) + contentX = r.x+r.width-width; + if (contentY >= r.y) + contentY = r.y; + else if (contentY+height <= r.y+r.height) + contentY = r.y+r.height-height; + } + + TextEdit{ + id: textEditor + anchors.fill:parent + width:parent.width; height:parent.height + color:fontColor + focus: true + + wrapMode: TextEdit.Wrap + + onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) + } + } +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/TextEditor.qml new file mode 100644 index 00000000..35d0e88c --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/TextEditor.qml @@ -0,0 +1,146 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 + +Rectangle { + id: screen + width: 1000; height: 1000 + property int partition: height/3 + state: "DRAWER_CLOSED" + + + //Item 1: MenuBar on the top portion of the screen + MenuBar{ + id:menuBar + height: partition + //anchors.top:parent.top + width:parent.width + z:1 + } + + + //Item 2: The editable text area + TextArea{ + id:textArea + y:drawer.height + border.color: Qt.darker(color, 1.4) + border.width: 2 + color: "#3F3F3F" + fontColor: "#DCDCCC" + height: partition*2 + width:parent.width + } + + //Item 3: The drawer handle + Rectangle{ + id:drawer + height:15 + width: parent.width + border.color : "#6A6D6A" + border.width: 1 + + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.77; color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#6A6D6A" } + } + + Image{ + id: arrowIcon + source: "images/arrow.png" + anchors.horizontalCenter: parent.horizontalCenter + + Behavior{NumberAnimation{property: "rotation";easing.type: Easing.OutExpo }} + } + + MouseArea{ + id: drawerMouseArea + anchors.fill:parent + onClicked:{ + if (screen.state == "DRAWER_CLOSED"){ + screen.state = "DRAWER_OPEN" + console.log("drawer OPEN") + } + else if (screen.state == "DRAWER_OPEN"){ + screen.state = "DRAWER_CLOSED" + console.log("drawer closed") + } + } + + //if true, then onEntered and onExited called if mouse hovers in the mouse area + //if false, a button must be clicked to detect the mouse hover + hoverEnabled: true + + //display a border if the mouse hovers on the button mouse area + onEntered: parent.border.color = Qt.lighter("#6A6D6A") + //remove the border if the mouse exits the button mouse area + onExited: parent.border.color = "#6A6D6A" + } + + } + states:[ + State{ + name: "DRAWER_OPEN" + PropertyChanges { target: menuBar; y:0} + PropertyChanges { target: textArea; y: partition + drawer.height} + PropertyChanges { target: drawer; y: partition} + PropertyChanges { target: arrowIcon; rotation: 180} + }, + State{ + name: "DRAWER_CLOSED" + PropertyChanges { target: menuBar; y:-partition} + PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height} + PropertyChanges { target: drawer; y: 0} + PropertyChanges { target: arrowIcon; rotation: 0} + } + + ] + transitions: [ + Transition{ + to: "*" + NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type:Easing.OutExpo } + NumberAnimation { target: menuBar; properties: "y"; duration: 100;easing.type: Easing.OutExpo } + NumberAnimation { target: drawer; properties: "y"; duration: 100;easing.type: Easing.OutExpo } + } + + ] +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/images/arrow.png b/examples/declarative/tutorials/gettingStarted/parts/part4/images/arrow.png Binary files differnew file mode 100644 index 00000000..14978c2e --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/images/arrow.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/pics/qml-texteditor4_texteditor.png b/examples/declarative/tutorials/gettingStarted/parts/part4/pics/qml-texteditor4_texteditor.png Binary files differnew file mode 100644 index 00000000..a195fb87 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/pics/qml-texteditor4_texteditor.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/qml-texteditor4.qmlproject b/examples/declarative/tutorials/gettingStarted/parts/part4/qml-texteditor4.qmlproject new file mode 100644 index 00000000..d4909f86 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/qml-texteditor4.qmlproject @@ -0,0 +1,16 @@ +import QmlProject 1.0 + +Project { + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + // importPaths: [ " ../exampleplugin " ] +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/parts/part5/TextEditor.qml new file mode 100644 index 00000000..84d8d874 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/TextEditor.qml @@ -0,0 +1,127 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 1.0 +import "core" + +Rectangle { + id: screen + width: 1000; height: 1000 + property int partition: height/3 + state: "DRAWER_CLOSED" + + //Item 1: MenuBar on the top portion of the screen + MenuBar{ + id:menuBar + height: screen.partition; width: screen.width + z:1 + } + //Item 2: The editable text area + TextArea{ + id:textArea + y:drawer.height + color: "#3F3F3F" + fontColor: "#DCDCCC" + height: partition*2; width:parent.width + } + //Item 3: The drawer handle + Rectangle{ + id:drawer + height:15; width: parent.width + border.color : "#6A6D6A" + border.width: 1 + z:1 + gradient: Gradient { + GradientStop { position: 0.0; color: "#8C8F8C" } + GradientStop { position: 0.17; color: "#6A6D6A" } + GradientStop { position: 0.77; color: "#3F3F3F" } + GradientStop { position: 1.0; color: "#6A6D6A" } + } + Image{ + id: arrowIcon + source: "images/arrow.png" + anchors.horizontalCenter: parent.horizontalCenter + + Behavior{NumberAnimation{property: "rotation";easing.type: Easing.OutExpo }} + } + + MouseArea{ + id: drawerMouseArea + anchors.fill:parent + hoverEnabled: true + onEntered: parent.border.color = Qt.lighter("#6A6D6A") + onExited: parent.border.color = "#6A6D6A" + onClicked:{ + if (screen.state == "DRAWER_CLOSED"){ + screen.state = "DRAWER_OPEN" + } + else if (screen.state == "DRAWER_OPEN"){ + screen.state = "DRAWER_CLOSED" + } + } + } + } + + states:[ + State{ + name: "DRAWER_OPEN" + PropertyChanges { target: menuBar; y: 0} + PropertyChanges { target: textArea; y: partition + drawer.height} + PropertyChanges { target: drawer; y: partition} + PropertyChanges { target: arrowIcon; rotation: 180} + }, + State{ + name: "DRAWER_CLOSED" + PropertyChanges { target: menuBar; y:-height; } + PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height} + PropertyChanges { target: drawer; y: 0} + PropertyChanges { target: arrowIcon; rotation: 0} + } + ] + + transitions: [ + Transition{ + to: "*" + NumberAnimation { target: textArea; properties: "y, height"; duration: 100; easing.type:Easing.OutExpo } + NumberAnimation { target: menuBar; properties: "y"; duration: 100;easing.type: Easing.OutExpo } + NumberAnimation { target: drawer; properties: "y"; duration: 100;easing.type: Easing.OutExpo } + } + ] +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.cpp b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.cpp new file mode 100644 index 00000000..286374d8 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.cpp @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "dialogPlugin.h" +#include "directory.h" +#include "file.h" +#include <QtDeclarative/qdeclarative.h> + +void DialogPlugin::registerTypes(const char *uri){ + + //register the class Directory into QML as a "Directory" element version 1.0 + qmlRegisterType<Directory>(uri, 1, 0, "Directory"); + qmlRegisterType<File>(uri,1,0,"File"); + + //qRegisterMetaType<QDeclarativeListProperty<QString> > ("QDeclarativeListProperty<QString>"); + +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.h b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.h new file mode 100644 index 00000000..ddcf82be --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.h @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIALOGPLUGIN_H +#define DIALOGPLUGIN_H + +#include <QtDeclarative/QDeclarativeExtensionPlugin> + +class DialogPlugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface" FILE "filedialog.json") + + public: + //registerTypes is inherited from QDeclarativeExtensionPlugin + void registerTypes(const char *uri); + +}; + +#endif + diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp new file mode 100644 index 00000000..c5f455c7 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp @@ -0,0 +1,219 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "directory.h" +#include <QDebug> + +/* +Directory constructor + +Initialize the saves directory and creates the file list +*/ +Directory::Directory(QObject *parent) : QObject(parent) +{ + + + m_dir.cd( QDir::currentPath()); + + //go to the saved directory. if not found, create save directory + m_saveDir = "saves"; + if (m_dir.cd(m_saveDir) == 0){ + m_dir.mkdir(m_saveDir); + m_dir.cd(m_saveDir); + } + m_filterList << "*.txt"; + + refresh(); +} + +/* +Directory::filesNumber +Return the number of Files +*/ +int Directory:: filesCount() const{ + return m_fileList.size(); +} + +/* +Function called to append data onto list property +*/ +void appendFiles(QDeclarativeListProperty<File> * property, File * file){ + //Do nothing. can't add to a directory using this method +} + +/* +Function called to retrieve file in the list using an index +*/ +File* fileAt(QDeclarativeListProperty<File> * property, int index){ + return static_cast< QList<File *> *>(property->data)->at(index); +} + +/* +Returns the number of files in the list +*/ +int filesSize(QDeclarativeListProperty<File> * property){ + return static_cast< QList<File *> *>(property->data)->size(); +} + +/* +Function called to empty the list property contents +*/ +void clearFilesPtr(QDeclarativeListProperty<File> *property){ + return static_cast< QList<File *> *>(property->data)->clear(); +} + +/* +Returns the list of files as a QDeclarativeListProperty. +*/ +QDeclarativeListProperty<File> Directory::files(){ + + refresh(); +// return QDeclarativeListProperty<QString>(this,m_filePtrList); //not recommended in the docs + return QDeclarativeListProperty<File>( this, &m_fileList, &appendFiles, &filesSize, &fileAt, &clearFilesPtr ); +} + +/* +Return te name of the currently selected file +*/ +QString Directory::filename() const{ + return currentFile.name(); +} + +/* +Return the file's content as a string. +*/ +QString Directory::fileContent() const{ + return m_fileContent; +} + +/* +Set the file name of the current file +*/ +void Directory::setFilename(const QString &str){ + if(str != currentFile.name()){ + currentFile.setName(str); + emit filenameChanged(); + } +} + +/* +Set the content of the file as a string +*/ +void Directory::setFileContent(const QString &str){ + if(str != m_fileContent){ + m_fileContent = str; + emit fileContentChanged(); + } +} + +/* +Called from QML to save the file using the filename and file content. +Saving makes sure that the file has a .txt extension. +*/ +void Directory::saveFile(){ + + if(currentFile.name().size() == 0){ + qWarning()<< "Empty filename. no save"; + return; + } + + QString extendedName = currentFile.name(); + if(!currentFile.name().endsWith(".txt")){ + extendedName.append(".txt"); + } + + QFile file( m_dir.filePath(extendedName) ); + if (file.open(QFile::WriteOnly | QFile::Truncate)){ + QTextStream outStream(&file); + outStream << m_fileContent; + } + file.close(); + refresh(); + emit directoryChanged(); +} + +/* +Load the contents of a file. +Only loads files with a .txt extension +*/ +void Directory::loadFile(){ + + m_fileContent.clear(); + QString extendedName = currentFile.name(); + if(!currentFile.name().endsWith(".txt")){ + extendedName.append(".txt"); + } + + QFile file( m_dir.filePath(extendedName) ); + if (file.open(QFile::ReadOnly )){ + QTextStream inStream(&file); + + QString line; + do{ + line = inStream.read(75); + m_fileContent.append(line); + }while (!line .isNull()); + } + file.close(); +} + +/* +Reloads the content of the files list. This is to ensure that the newly +created files are added onto the list. +*/ +void Directory::refresh(){ + m_dirFiles = m_dir.entryList(m_filterList,QDir::Files,QDir::Name); + m_fileList.clear(); + + File * file; + for(int i = 0; i < m_dirFiles.size() ; i ++){ + + file = new File(); + + if(m_dirFiles.at(i).endsWith(".txt")){ + QString name = m_dirFiles.at(i); + file->setName( name.remove(".txt",Qt::CaseSensitive)); + } + else{ + file->setName(m_dirFiles.at(i)); + } + m_fileList.append(file); + } +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.h b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.h new file mode 100644 index 00000000..1d01372e --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.h @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef DIRECTORY_H +#define DIRECTORY_H + +#include "file.h" + +#include <QDir> +#include <QStringList> +#include <QTextStream> +#include <QDeclarativeListProperty> +#include <QObject> + +class Directory : public QObject{ + + Q_OBJECT + + //number of files in the directory + Q_PROPERTY(int filesCount READ filesCount) + + //list property containing file names as QString + Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT ) + + //file name of the text file to read/write + Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged) + + //text content of the file + Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged) + + public: + Directory(QObject *parent = 0); + + //properties' read functions + int filesCount() const; + QString filename() const; + QString fileContent() const; + QDeclarativeListProperty<File> files(); + + //properties' write functions + void setFilename(const QString &str); + void setFileContent(const QString &str); + + //accessible from QML + Q_INVOKABLE void saveFile(); + Q_INVOKABLE void loadFile(); + + signals: + void directoryChanged(); + void filenameChanged(); + void fileContentChanged(); + + private: + QDir m_dir; + QStringList m_dirFiles; + File currentFile; + QString m_saveDir; + QStringList m_filterList; + + //contains the file data in QString format + QString m_fileContent; + + //Registered to QML in a plugin. Accessible from QML as a property of Directory + QList<File *> m_fileList; + + //refresh content of the directory + void refresh(); +}; + + +#endif diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.cpp b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.cpp new file mode 100644 index 00000000..9da61921 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.cpp @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "file.h" + +File::File(QObject *parent) : QObject(parent) +{ + m_name = ""; +} + +QString File::name() const{ + return m_name; +} +void File::setName(const QString &str){ + if(str != m_name){ + m_name = str; + emit nameChanged(); + } +} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.h b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.h new file mode 100644 index 00000000..76c192e3 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.h @@ -0,0 +1,67 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtDeclarative module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef FILE_H +#define FILE_H + + +#include <QString> +#include <QObject> + +class File : public QObject{ + + Q_OBJECT + + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) + + public: + File(QObject *parent = 0); + + QString name() const; + void setName(const QString &str); + + signals: + void nameChanged(); + + private: + QString m_name; +}; + +#endif diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.json b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.json @@ -0,0 +1 @@ +{} diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro new file mode 100644 index 00000000..f9229a3b --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro @@ -0,0 +1,17 @@ +TEMPLATE = lib +CONFIG += plugin +QT += declarative + +DESTDIR += ../plugins +OBJECTS_DIR = tmp +MOC_DIR = tmp + +TARGET = FileDialog + +HEADERS += directory.h \ + file.h \ + dialogPlugin.h + +SOURCES += directory.cpp \ + file.cpp \ + dialogPlugin.cpp diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/qmldir b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/qmldir new file mode 100644 index 00000000..c2b27dad --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/qmldir @@ -0,0 +1 @@ +plugin FileDialog plugins diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/images/arrow.png b/examples/declarative/tutorials/gettingStarted/parts/part5/images/arrow.png Binary files differnew file mode 100644 index 00000000..14978c2e --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/images/arrow.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_editmenu.png b/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_editmenu.png Binary files differnew file mode 100644 index 00000000..27feed5e --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_editmenu.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_filemenu.png b/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_filemenu.png Binary files differnew file mode 100644 index 00000000..4d8f9f22 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_filemenu.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_newfile.png b/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_newfile.png Binary files differnew file mode 100644 index 00000000..680acfe8 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/pics/qml-texteditor5_newfile.png diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/qml-texteditor5.qmlproject b/examples/declarative/tutorials/gettingStarted/parts/part5/qml-texteditor5.qmlproject new file mode 100644 index 00000000..ed034dff --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/qml-texteditor5.qmlproject @@ -0,0 +1,18 @@ +import QmlProject 1.0 + +Project { + /* Include .qml, .js, and image files from current directory and subdirectories */ + QmlFiles { + directory: "." + directory: "core" + directory: "filedialog" + } + JavaScriptFiles { + directory: "." + } + ImageFiles { + directory: "." + } + /* List of plugin directories passed to QML runtime */ + importPaths: [ " ./plugins " ] +} diff --git a/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_editmenu.png b/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_editmenu.png Binary files differnew file mode 100644 index 00000000..27feed5e --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_editmenu.png diff --git a/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_filemenu.png b/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_filemenu.png Binary files differnew file mode 100644 index 00000000..4d8f9f22 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_filemenu.png diff --git a/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_newfile.png b/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_newfile.png Binary files differnew file mode 100644 index 00000000..680acfe8 --- /dev/null +++ b/examples/declarative/tutorials/gettingStarted/pics/qml-texteditor5_newfile.png diff --git a/examples/declarative/tutorials/tutorials.pro b/examples/declarative/tutorials/tutorials.pro index 5ad5b37a..7e26353e 100644 --- a/examples/declarative/tutorials/tutorials.pro +++ b/examples/declarative/tutorials/tutorials.pro @@ -1,9 +1,9 @@ TEMPLATE = subdirs SUBDIRS += \ - extending + extending \ + gettingStarted -# install -sources.files = tutorials.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/tutorials -INSTALLS += sources +EXAMPLE_FILES = \ + helloworld \ + samegame diff --git a/examples/demos/twitter/main.cpp b/examples/declarative/twitter/main.cpp index c79424b7..c79424b7 100644 --- a/examples/demos/twitter/main.cpp +++ b/examples/declarative/twitter/main.cpp diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/Button.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/Button.qml index 9b9b2d67..9b9b2d67 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/Button.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/Button.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/FatDelegate.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml index e4a6e150..e4a6e150 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/FatDelegate.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/Input.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/Input.qml index ce1bc0e9..ce1bc0e9 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/Input.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/Input.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/Loading.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/Loading.qml index b8fe357a..b8fe357a 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/Loading.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/Loading.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml index 1e1dbd62..1e1dbd62 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/RssModel.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml index 348fd2a8..348fd2a8 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/RssModel.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/SearchView.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml index d1c50fca..d1c50fca 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/SearchView.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/TitleBar.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml index 7f094028..7f094028 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/TitleBar.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/ToolBar.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml index 87cea7af..87cea7af 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/ToolBar.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/UserModel.qml b/examples/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml index d5714754..d5714754 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/UserModel.qml +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/gloss.png b/examples/declarative/twitter/qml/twitter/TwitterCore/images/gloss.png Binary files differindex 5d370cd9..5d370cd9 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/gloss.png +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/gloss.png diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.png b/examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.png Binary files differindex 2cc38dc3..2cc38dc3 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.png +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.png diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.sci b/examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.sci index 054bff78..054bff78 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.sci +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.sci diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/loading.png b/examples/declarative/twitter/qml/twitter/TwitterCore/images/loading.png Binary files differindex 47a1589c..47a1589c 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/loading.png +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/loading.png diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/quit.png b/examples/declarative/twitter/qml/twitter/TwitterCore/images/quit.png Binary files differindex 5bda1b6e..5bda1b6e 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/quit.png +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/quit.png diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/stripes.png b/examples/declarative/twitter/qml/twitter/TwitterCore/images/stripes.png Binary files differindex 9f36727e..9f36727e 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/stripes.png +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/stripes.png diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.png b/examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.png Binary files differindex 51c90082..51c90082 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.png +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.png diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.sci b/examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.sci index 0418d94c..0418d94c 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.sci +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.sci diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.png b/examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.png Binary files differindex 11310013..11310013 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.png +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.png diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.sci b/examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.sci index 9e4f9653..9e4f9653 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.sci +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.sci diff --git a/examples/demos/twitter/qml/twitter/TwitterCore/qmldir b/examples/declarative/twitter/qml/twitter/TwitterCore/qmldir index 84d85c28..84d85c28 100644 --- a/examples/demos/twitter/qml/twitter/TwitterCore/qmldir +++ b/examples/declarative/twitter/qml/twitter/TwitterCore/qmldir diff --git a/examples/demos/twitter/qml/twitter/twitter.qml b/examples/declarative/twitter/qml/twitter/twitter.qml index 5d4cd885..5d4cd885 100644 --- a/examples/demos/twitter/qml/twitter/twitter.qml +++ b/examples/declarative/twitter/qml/twitter/twitter.qml diff --git a/examples/demos/twitter/twitter.desktop b/examples/declarative/twitter/twitter.desktop index 5d1b851b..5d1b851b 100644 --- a/examples/demos/twitter/twitter.desktop +++ b/examples/declarative/twitter/twitter.desktop diff --git a/examples/demos/twitter/twitter.pro b/examples/declarative/twitter/twitter.pro index c2beb0e3..68ece226 100644 --- a/examples/demos/twitter/twitter.pro +++ b/examples/declarative/twitter/twitter.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/twitter +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/twitter exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/twitter/twitter.qmlproject b/examples/declarative/twitter/twitter.qmlproject index 3b360cf2..3b360cf2 100644 --- a/examples/demos/twitter/twitter.qmlproject +++ b/examples/declarative/twitter/twitter.qmlproject diff --git a/examples/demos/twitter/twitter.svg b/examples/declarative/twitter/twitter.svg index 566acfad..566acfad 100644 --- a/examples/demos/twitter/twitter.svg +++ b/examples/declarative/twitter/twitter.svg diff --git a/examples/demos/twitter/twitter64.png b/examples/declarative/twitter/twitter64.png Binary files differindex 707d5c4e..707d5c4e 100644 --- a/examples/demos/twitter/twitter64.png +++ b/examples/declarative/twitter/twitter64.png diff --git a/examples/demos/twitter/twitter80.png b/examples/declarative/twitter/twitter80.png Binary files differindex 6ad8096c..6ad8096c 100644 --- a/examples/demos/twitter/twitter80.png +++ b/examples/declarative/twitter/twitter80.png diff --git a/examples/demos/twitter/twitter_harmattan.desktop b/examples/declarative/twitter/twitter_harmattan.desktop index 40a4a1bc..40a4a1bc 100644 --- a/examples/demos/twitter/twitter_harmattan.desktop +++ b/examples/declarative/twitter/twitter_harmattan.desktop diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro index 5e112a8d..a2159f30 100644 --- a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro +++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/dialcontrol +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/dialcontrol exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/flipable/flipable.pro b/examples/declarative/ui-components/flipable/flipable.pro index 0cfd2ec2..af1892f7 100644 --- a/examples/declarative/ui-components/flipable/flipable.pro +++ b/examples/declarative/ui-components/flipable/flipable.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/flipable +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/flipable exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/main/main.pro b/examples/declarative/ui-components/main/main.pro index 428ffd47..d44b7adc 100644 --- a/examples/declarative/ui-components/main/main.pro +++ b/examples/declarative/ui-components/main/main.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/main +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/main exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/progressbar/progressbar.pro b/examples/declarative/ui-components/progressbar/progressbar.pro index 8e232277..66365c2e 100644 --- a/examples/declarative/ui-components/progressbar/progressbar.pro +++ b/examples/declarative/ui-components/progressbar/progressbar.pro @@ -23,7 +23,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/progressbar +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/progressbar exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.pro b/examples/declarative/ui-components/scrollbar/scrollbar.pro index 5843ef7f..3f131b85 100644 --- a/examples/declarative/ui-components/scrollbar/scrollbar.pro +++ b/examples/declarative/ui-components/scrollbar/scrollbar.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/scrollbar +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/scrollbar exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/searchbox/searchbox.pro b/examples/declarative/ui-components/searchbox/searchbox.pro index 6219524f..aa8dd9c2 100644 --- a/examples/declarative/ui-components/searchbox/searchbox.pro +++ b/examples/declarative/ui-components/searchbox/searchbox.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/searchbox +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/searchbox exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.pro b/examples/declarative/ui-components/slideswitch/slideswitch.pro index 63e471cf..7f7c981c 100644 --- a/examples/declarative/ui-components/slideswitch/slideswitch.pro +++ b/examples/declarative/ui-components/slideswitch/slideswitch.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/slideswitch +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/slideswitch exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/spinner/spinner.pro b/examples/declarative/ui-components/spinner/spinner.pro index 0c65f28d..80c4e523 100644 --- a/examples/declarative/ui-components/spinner/spinner.pro +++ b/examples/declarative/ui-components/spinner/spinner.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/spinner +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/spinner exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.pro b/examples/declarative/ui-components/tabwidget/tabwidget.pro index 97d49ea2..83618d03 100644 --- a/examples/declarative/ui-components/tabwidget/tabwidget.pro +++ b/examples/declarative/ui-components/tabwidget/tabwidget.pro @@ -18,7 +18,7 @@ QML_IMPORT_PATH = SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/tabwidget +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/ui-components/tabwidget exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/ui-components/ui-components.pro b/examples/declarative/ui-components/ui-components.pro index 951121f3..62d1cdf8 100644 --- a/examples/declarative/ui-components/ui-components.pro +++ b/examples/declarative/ui-components/ui-components.pro @@ -9,8 +9,3 @@ SUBDIRS += dialcontrol \ slideswitch \ spinner \ tabwidget - -# install -sources.files = ui-components.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components -INSTALLS += sources diff --git a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro index 9c75b8b0..3755d5fc 100644 --- a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro +++ b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro @@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/xml/xmlhttprequest-example +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/xml/xmlhttprequest-example exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri) -else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) +else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro deleted file mode 100644 index b0ac9ce3..00000000 --- a/examples/demos/demos.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = subdirs - -# These demos contain C++ and need to be compiled -SUBDIRS = \ - calculator \ - flickr \ - photoviewer \ - minehunt \ - samegame \ - snake \ - rssnews \ - twitter - -# install -sources.files = demos.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/demos -INSTALLS += sources diff --git a/doc/src/images/qml-calculator-example.png b/examples/demos/doc/images/qml-calculator-example.png Binary files differindex 0f9ced80..0f9ced80 100644 --- a/doc/src/images/qml-calculator-example.png +++ b/examples/demos/doc/images/qml-calculator-example.png diff --git a/doc/src/images/qml-minehunt-demo.png b/examples/demos/doc/images/qml-minehunt-demo.png Binary files differindex 3b695693..3b695693 100644 --- a/doc/src/images/qml-minehunt-demo.png +++ b/examples/demos/doc/images/qml-minehunt-demo.png diff --git a/doc/src/images/qml-photoviewer-demo.png b/examples/demos/doc/images/qml-photoviewer-demo.png Binary files differindex be6f1bf1..be6f1bf1 100644 --- a/doc/src/images/qml-photoviewer-demo.png +++ b/examples/demos/doc/images/qml-photoviewer-demo.png diff --git a/doc/src/images/qml-rssnews-demo.png b/examples/demos/doc/images/qml-rssnews-demo.png Binary files differindex b4143b46..b4143b46 100644 --- a/doc/src/images/qml-rssnews-demo.png +++ b/examples/demos/doc/images/qml-rssnews-demo.png diff --git a/doc/src/images/qml-samegame-demo.png b/examples/demos/doc/images/qml-samegame-demo.png Binary files differindex 945f2b96..945f2b96 100644 --- a/doc/src/images/qml-samegame-demo.png +++ b/examples/demos/doc/images/qml-samegame-demo.png diff --git a/doc/src/images/qml-snake-demo.png b/examples/demos/doc/images/qml-snake-demo.png Binary files differindex d3c077d1..d3c077d1 100644 --- a/doc/src/images/qml-snake-demo.png +++ b/examples/demos/doc/images/qml-snake-demo.png diff --git a/doc/src/images/qml-twitter-demo.png b/examples/demos/doc/images/qml-twitter-demo.png Binary files differindex 63d6486a..63d6486a 100644 --- a/doc/src/images/qml-twitter-demo.png +++ b/examples/demos/doc/images/qml-twitter-demo.png diff --git a/examples/demos/doc/src/qml-calculator.qdoc b/examples/demos/doc/src/qml-calculator.qdoc new file mode 100644 index 00000000..a697638e --- /dev/null +++ b/examples/demos/doc/src/qml-calculator.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Calculator + \example declarative/calculator + \brief Shows how to write a calculator in QML + \ingroup qmldemos + + This example shows how to write a simple calculator application in QML and JavaScript. + + \image qml-calculator-example.png +*/ diff --git a/examples/demos/doc/src/qml-minehunt.qdoc b/examples/demos/doc/src/qml-minehunt.qdoc new file mode 100644 index 00000000..37110fd3 --- /dev/null +++ b/examples/demos/doc/src/qml-minehunt.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Minehunt + \example declarative/minehunt + \brief Shows how to write a Minehunt game in QML + \ingroup qmldemos + + This example shows how to create a simple Minehunt game, using QML for the + UI and C++ for the game logic. + + \image qml-minehunt-demo.png +*/ diff --git a/examples/demos/doc/src/qml-photoviewer.qdoc b/examples/demos/doc/src/qml-photoviewer.qdoc new file mode 100644 index 00000000..f2353d3a --- /dev/null +++ b/examples/demos/doc/src/qml-photoviewer.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Photo Viewer + \example declarative/photoviewer + \brief Shows how to write a Flickr photo viewer in QML + \ingroup qmldemos + + This example shows how to write a Flickr photo viewer application in QML. + + \image qml-photoviewer-demo.png +*/ diff --git a/examples/demos/doc/src/qml-rssnews.qdoc b/examples/demos/doc/src/qml-rssnews.qdoc new file mode 100644 index 00000000..4b788255 --- /dev/null +++ b/examples/demos/doc/src/qml-rssnews.qdoc @@ -0,0 +1,37 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title RSS News + \example declarative/rssnews + \brief Shows how to write an RSS news reader in QML + \ingroup qmldemos + + This example shows how to write an RSS news reader in QML. + + \image qml-rssnews-demo.png +*/ diff --git a/examples/demos/doc/src/qml-samegame.qdoc b/examples/demos/doc/src/qml-samegame.qdoc new file mode 100644 index 00000000..b7e0c55b --- /dev/null +++ b/examples/demos/doc/src/qml-samegame.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Same Game + \example declarative/samegame + \brief Shows how to write a Same Game in QML + \ingroup qmldemos + + This example shows how to write a 'Same Game' game in QML, using Javascript + for all the game logic. + + \image qml-samegame-demo.png +*/ diff --git a/examples/demos/doc/src/qml-snake.qdoc b/examples/demos/doc/src/qml-snake.qdoc new file mode 100644 index 00000000..53feb11f --- /dev/null +++ b/examples/demos/doc/src/qml-snake.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Snake + \example declarative/snake + \brief Shows how to write a Snake game in QML + \ingroup qmldemos + + This example shows how to write a Snake game in QML, controlled by the + keyboard as well as the mouse. + + \image qml-snake-demo.png +*/ diff --git a/examples/demos/doc/src/qml-twitter.qdoc b/examples/demos/doc/src/qml-twitter.qdoc new file mode 100644 index 00000000..e4ea5e10 --- /dev/null +++ b/examples/demos/doc/src/qml-twitter.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \title Twitter Mobile + \example declarative/twitter + \brief Shows how to write a Twitter client in QML + \ingroup qmldemos + + This example shows how to write a mobile Twitter search client in QML. Use it to + see what people think about Qt Quick! + + \image qml-twitter-demo.png +*/ diff --git a/examples/examples.pro b/examples/examples.pro index 0d688669..baae4bb9 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,6 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ - declarative \ - demos \ - helper + declarative diff --git a/examples/helper/helper.pro b/examples/helper/helper.pro deleted file mode 100644 index 5b55497a..00000000 --- a/examples/helper/helper.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = subdirs - -# the helpers simply need a make install target, but require no compilation -sources.files = \ - qmlapplicationviewer \ - deployment.pri \ - helper.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/helper -INSTALLS += sources diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index be3978aa..365cb04e 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -29,7 +29,6 @@ HEADERS += \ linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND DEFINES += QT_NO_OPENTYPE -INCLUDEPATH += ../3rdparty/harfbuzz/src blackberry: { DEFINES += CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp index 39ec4881..a38938bc 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.cpp +++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp @@ -2627,10 +2627,17 @@ QScriptValue QDeclarativeItem::mapFromItem(const QScriptValue &item, qreal x, qr return 0; } - QScriptValue sv = item.engine()->newObject(); - // If QGraphicsItem::mapFromItem() is called with 0, behaves the same as mapFromScene() QPointF p = qobject_cast<QGraphicsItem*>(this)->mapFromItem(itemObj, x, y); + + // Use the script engine from the passed item, if available. Use this item's one otherwise. + QScriptEngine* const se = itemObj ? item.engine() : QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(this)); + + // Engine-less items are unlikely, but nevertheless possible. Handle them. + if (0 == se) + return QScriptValue(QScriptValue::UndefinedValue); + + QScriptValue sv = se->newObject(); sv.setProperty(QLatin1String("x"), p.x()); sv.setProperty(QLatin1String("y"), p.y()); return sv; @@ -2665,10 +2672,17 @@ QScriptValue QDeclarativeItem::mapToItem(const QScriptValue &item, qreal x, qrea return 0; } - QScriptValue sv = item.engine()->newObject(); - // If QGraphicsItem::mapToItem() is called with 0, behaves the same as mapToScene() QPointF p = qobject_cast<QGraphicsItem*>(this)->mapToItem(itemObj, x, y); + + // Use the script engine from the passed item, if available. Use this item's one otherwise. + QScriptEngine* const se = itemObj ? item.engine() : QDeclarativeEnginePrivate::getScriptEngine(qmlEngine(this)); + + // Engine-less items are unlikely, but nevertheless possible. Handle them. + if (0 == se) + return QScriptValue(QScriptValue::UndefinedValue); + + QScriptValue sv = se->newObject(); sv.setProperty(QLatin1String("x"), p.x()); sv.setProperty(QLatin1String("y"), p.y()); return sv; diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp index 9ccb4000..e49c1e76 100644 --- a/src/declarative/graphicsitems/qdeclarativepathview.cpp +++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp @@ -163,6 +163,7 @@ void QDeclarativePathViewPrivate::clear() releaseItem(p); } items.clear(); + tl.clear(); } void QDeclarativePathViewPrivate::updateMappedRange() @@ -475,6 +476,8 @@ QDeclarativePathView::~QDeclarativePathView() For large or dynamic datasets the model is usually provided by a C++ model object. Models can also be created directly in QML, using the ListModel element. + \note changing the model will reset the offset and currentIndex to 0. + \sa {qmlmodels}{Data Models} */ QVariant QDeclarativePathView::model() const @@ -495,11 +498,7 @@ void QDeclarativePathView::setModel(const QVariant &model) disconnect(d->model, SIGNAL(itemsMoved(int,int,int)), this, SLOT(itemsMoved(int,int,int))); disconnect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset())); disconnect(d->model, SIGNAL(createdItem(int,QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*))); - for (int i=0; i<d->items.count(); i++){ - QDeclarativeItem *p = d->items[i]; - d->model->release(p); - } - d->items.clear(); + d->clear(); } d->modelVariant = model; @@ -519,6 +518,7 @@ void QDeclarativePathView::setModel(const QVariant &model) if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model)) dataModel->setModel(model); } + int oldModelCount = d->modelCount; d->modelCount = 0; if (d->model) { connect(d->model, SIGNAL(itemsInserted(int,int)), this, SLOT(itemsInserted(int,int))); @@ -527,14 +527,20 @@ void QDeclarativePathView::setModel(const QVariant &model) connect(d->model, SIGNAL(modelReset()), this, SLOT(modelReset())); connect(d->model, SIGNAL(createdItem(int,QDeclarativeItem*)), this, SLOT(createdItem(int,QDeclarativeItem*))); d->modelCount = d->model->count(); - if (d->model->count()) - d->offset = qmlMod(d->offset, qreal(d->model->count())); - if (d->offset < 0) - d->offset = d->model->count() + d->offset; -} + } + if (isComponentComplete()) { + if (d->currentIndex != 0) { + d->currentIndex = 0; + emit currentIndexChanged(); + } + if (d->offset != 0.0) { + d->offset = 0; + emit offsetChanged(); + } + } d->regenerate(); - d->fixOffset(); - emit countChanged(); + if (d->modelCount != oldModelCount) + emit countChanged(); emit modelChanged(); } @@ -592,8 +598,17 @@ int QDeclarativePathView::currentIndex() const void QDeclarativePathView::setCurrentIndex(int idx) { Q_D(QDeclarativePathView); - if (d->model && d->modelCount) - idx = qAbs(idx % d->modelCount); + if (!isComponentComplete()) { + if (idx != d->currentIndex) { + d->currentIndex = idx; + emit currentIndexChanged(); + } + return; + } + + idx = d->modelCount + ? ((idx % d->modelCount) + d->modelCount) % d->modelCount + : 0; if (d->model && idx != d->currentIndex) { if (d->modelCount) { int itemIndex = (d->currentIndex - d->firstIndex + d->modelCount) % d->modelCount; @@ -649,13 +664,8 @@ void QDeclarativePathView::incrementCurrentIndex() void QDeclarativePathView::decrementCurrentIndex() { Q_D(QDeclarativePathView); - if (d->model && d->modelCount) { - int idx = currentIndex()-1; - if (idx < 0) - idx = d->modelCount - 1; - d->moveDirection = QDeclarativePathViewPrivate::Negative; - setCurrentIndex(idx); - } + d->moveDirection = QDeclarativePathViewPrivate::Negative; + setCurrentIndex(currentIndex()-1); } /*! @@ -1323,15 +1333,20 @@ void QDeclarativePathView::componentComplete() { Q_D(QDeclarativePathView); QDeclarativeItem::componentComplete(); - d->createHighlight(); - // It is possible that a refill has already happended to to Path - // bindings being handled in the componentComplete(). If so - // don't do it again. - if (d->items.count() == 0 && d->model) { + + if (d->model) { d->modelCount = d->model->count(); - d->regenerate(); + if (d->modelCount && d->currentIndex != 0) // an initial value has been provided for currentIndex + d->offset = qmlMod(d->modelCount - d->currentIndex, d->modelCount); } + + d->createHighlight(); + d->regenerate(); d->updateHighlight(); + d->updateCurrent(); + + if (d->modelCount) + emit countChanged(); } void QDeclarativePathView::refill() @@ -1522,6 +1537,10 @@ void QDeclarativePathView::itemsRemoved(int modelIndex, int count) } d->modelCount -= count; + + if (d->currentIndex == -1) + d->currentIndex = d->calcCurrentIndex(); + if (!d->modelCount) { while (d->itemCache.count()) d->releaseItem(d->itemCache.takeLast()); @@ -1548,19 +1567,19 @@ void QDeclarativePathView::itemsMoved(int /*from*/, int /*to*/, int /*count*/) if (!d->isValid() || !isComponentComplete()) return; + int oldCurrent = d->currentIndex; + // Fix current index + if (d->currentIndex >= 0 && d->currentItem) + d->currentIndex = d->model->indexOf(d->currentItem, this); + QList<QDeclarativeItem *> removedItems = d->items; d->items.clear(); d->regenerate(); while (removedItems.count()) d->releaseItem(removedItems.takeLast()); - // Fix current index - if (d->currentIndex >= 0 && d->currentItem) { - int oldCurrent = d->currentIndex; - d->currentIndex = d->model->indexOf(d->currentItem, this); - if (oldCurrent != d->currentIndex) - emit currentIndexChanged(); - } + if (oldCurrent != d->currentIndex) + emit currentIndexChanged(); d->updateCurrent(); } @@ -1623,7 +1642,7 @@ void QDeclarativePathView::movementEnding() // find the item closest to the snap position int QDeclarativePathViewPrivate::calcCurrentIndex() { - int current = -1; + int current = 0; if (modelCount && model && items.count()) { offset = qmlMod(offset, modelCount); if (offset < 0) @@ -1644,7 +1663,7 @@ void QDeclarativePathViewPrivate::updateCurrent() return; int idx = calcCurrentIndex(); - if (model && idx != currentIndex) { + if (model && (idx != currentIndex || !currentItem)) { int itemIndex = (currentIndex - firstIndex + modelCount) % modelCount; if (itemIndex < items.count()) { if (QDeclarativeItem *item = items.at(itemIndex)) { @@ -1652,6 +1671,7 @@ void QDeclarativePathViewPrivate::updateCurrent() att->setIsCurrentItem(false); } } + int oldCurrentIndex = currentIndex; currentIndex = idx; currentItem = 0; itemIndex = (idx - firstIndex + modelCount) % modelCount; @@ -1661,7 +1681,8 @@ void QDeclarativePathViewPrivate::updateCurrent() if (QDeclarativePathViewAttached *att = attached(currentItem)) att->setIsCurrentItem(true); } - emit q->currentIndexChanged(); + if (oldCurrentIndex != currentIndex) + emit q->currentIndexChanged(); } } diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index f73de7f3..ab321203 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -662,7 +662,8 @@ void QDeclarativeCompiler::compileTree(QDeclarativeParser::Object *tree) output->bytecode << init; // Build global import scripts - QHash<QString, Object::ScriptBlock> importedScripts; + QSet<QString> importedScripts; + QList<Object::ScriptBlock> importedScriptList; QStringList importedScriptIndexes; foreach (const QDeclarativeTypeData::ScriptReference &script, unit->resolvedScripts()) { @@ -672,24 +673,23 @@ void QDeclarativeCompiler::compileTree(QDeclarativeParser::Object *tree) Q_ASSERT(!importedScripts.contains(script.qualifier)); if (!scriptCode.isEmpty()) { - Object::ScriptBlock &scriptBlock = importedScripts[script.qualifier]; + importedScripts.insert(script.qualifier); + Object::ScriptBlock scriptBlock; scriptBlock.code = scriptCode; scriptBlock.file = script.script->finalUrl().toString(); scriptBlock.pragmas = pragmas; + importedScriptList.append(scriptBlock); + importedScriptIndexes.append(script.qualifier); } } - for (QHash<QString, Object::ScriptBlock>::Iterator iter = importedScripts.begin(); - iter != importedScripts.end(); ++iter) { - - importedScriptIndexes.append(iter.key()); - + for (int i = 0; i < importedScriptList.count(); ++i) { QDeclarativeInstruction import; import.type = QDeclarativeInstruction::StoreImportedScript; import.line = 0; import.storeScript.value = output->scripts.count(); - output->scripts << *iter; + output->scripts << importedScriptList.at(i); output->bytecode << import; } diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index fa7134ed..23bc9aa1 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -114,6 +114,7 @@ #endif Q_DECLARE_METATYPE(QDeclarativeProperty) +Q_DECLARE_METATYPE(QScriptValue) QT_BEGIN_NAMESPACE @@ -570,7 +571,7 @@ void QDeclarativeEnginePrivate::init() Q_Q(QDeclarativeEngine); qRegisterMetaType<QVariant>("QVariant"); qRegisterMetaType<QDeclarativeScriptString>("QDeclarativeScriptString"); - qRegisterMetaType<QScriptValue>("QScriptValue"); + qRegisterMetaType<QScriptValue>(); qRegisterMetaType<QDeclarativeComponent::Status>("QDeclarativeComponent::Status"); QDeclarativeData::init(); diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index cc1d5520..4f22b94d 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -157,7 +157,7 @@ public: int notifyIndex; }; bool captureProperties; - QPODVector<CapturedProperty> capturedProperties; + QPODVector<CapturedProperty, 16> capturedProperties; QDeclarativeContext *rootContext; bool isDebugging; diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp index b52a0748..58897c9e 100644 --- a/src/declarative/qml/qdeclarativeexpression.cpp +++ b/src/declarative/qml/qdeclarativeexpression.cpp @@ -460,7 +460,7 @@ QScriptValue QDeclarativeQtScriptExpression::scriptValue(QObject *secondaryScope QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context()->engine); bool lastCaptureProperties = ep->captureProperties; - QPODVector<QDeclarativeEnginePrivate::CapturedProperty> lastCapturedProperties; + QPODVector<QDeclarativeEnginePrivate::CapturedProperty, 16> lastCapturedProperties; ep->captureProperties = trackChange; ep->capturedProperties.copyAndClear(lastCapturedProperties); @@ -539,7 +539,7 @@ QScriptValue QDeclarativeQtScriptExpression::eval(QObject *secondaryScope, bool } } -void QDeclarativeQtScriptExpression::updateGuards(const QPODVector<QDeclarativeEnginePrivate::CapturedProperty> &properties) +void QDeclarativeQtScriptExpression::updateGuards(const QPODVector<QDeclarativeEnginePrivate::CapturedProperty, 16> &properties) { Q_ASSERT(guardObject); Q_ASSERT(guardObjectNotifyIndex != -1); diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h index 6e8df8ae..402ae846 100644 --- a/src/declarative/qml/qdeclarativeexpression_p.h +++ b/src/declarative/qml/qdeclarativeexpression_p.h @@ -153,7 +153,7 @@ public: private: void clearGuards(); QScriptValue eval(QObject *secondaryScope, bool *isUndefined); - void updateGuards(const QPODVector<QDeclarativeEnginePrivate::CapturedProperty> &properties); + void updateGuards(const QPODVector<QDeclarativeEnginePrivate::CapturedProperty, 16> &properties); bool trackChange; diff --git a/src/declarative/qml/qdeclarativefastproperties_p.h b/src/declarative/qml/qdeclarativefastproperties_p.h index 8747eeba..f0e94779 100644 --- a/src/declarative/qml/qdeclarativefastproperties_p.h +++ b/src/declarative/qml/qdeclarativefastproperties_p.h @@ -50,7 +50,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QObject; -class QMetaObject; +struct QMetaObject; class QDeclarativeNotifierEndpoint; class QDeclarativeFastProperties { diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp index 09390646..4a771de9 100644 --- a/src/declarative/qml/qdeclarativemetatype.cpp +++ b/src/declarative/qml/qdeclarativemetatype.cpp @@ -449,7 +449,7 @@ QObject *QDeclarativeType::create() const d->m_newFunc(rv); if (rv && !d->m_metaObjects.isEmpty()) - (void *)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects); + (void)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects); return rv; } @@ -462,7 +462,7 @@ void QDeclarativeType::create(QObject **out, void **memory, size_t additionalMem d->m_newFunc(rv); if (rv && !d->m_metaObjects.isEmpty()) - (void *)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects); + (void)new QDeclarativeProxyMetaObject(rv, &d->m_metaObjects); *out = rv; *memory = ((char *)rv) + d->m_allocationSize; diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp index 00b9a4de..9043760a 100644 --- a/src/declarative/qml/qdeclarativevaluetype.cpp +++ b/src/declarative/qml/qdeclarativevaluetype.cpp @@ -80,9 +80,19 @@ int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMino QDeclarativeValueTypeFactory::QDeclarativeValueTypeFactory() { + static int isGuiApp = -1; + memset(valueTypes, 0, sizeof(valueTypes)); + /*FIXME: is there a better way to tell if an app is Gui or not?*/ + if (isGuiApp == -1) + isGuiApp = (int) qApp->inherits("QGuiApplication"); // ### Optimize - for (unsigned int ii = 0; ii < (QVariant::UserType - 1); ++ii) + for (unsigned int ii = 0; ii <= QVariant::LastCoreType; ++ii) valueTypes[ii] = valueType(ii); + + if (isGuiApp) { + for (unsigned int ii = QVariant::LastCoreType + 1; ii < (QVariant::UserType - 1); ++ii) + valueTypes[ii] = valueType(ii); + } } QDeclarativeValueTypeFactory::~QDeclarativeValueTypeFactory() diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index 5c875510..49ce35da 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -283,7 +283,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEObjectStack &stack, { QObject *o = (QObject *)operator new(instr.createSimple.typeSize + sizeof(QDeclarativeData)); - ::memset(o, 0, instr.createSimple.typeSize + sizeof(QDeclarativeData)); + ::memset(static_cast<void *>(o), 0, instr.createSimple.typeSize + sizeof(QDeclarativeData)); instr.createSimple.create(o); QDeclarativeData *ddata = (QDeclarativeData *)(((const char *)o) + instr.createSimple.typeSize); diff --git a/src/declarative/qml/qdeclarativexmlhttprequest.cpp b/src/declarative/qml/qdeclarativexmlhttprequest.cpp index bb16a9c1..dd091ca7 100644 --- a/src/declarative/qml/qdeclarativexmlhttprequest.cpp +++ b/src/declarative/qml/qdeclarativexmlhttprequest.cpp @@ -1321,7 +1321,7 @@ void QDeclarativeXMLHttpRequest::readEncoding() if (header.first == "content-type") { int separatorIdx = header.second.indexOf(';'); if (separatorIdx == -1) { - m_mime == header.second; + m_mime = header.second; } else { m_mime = header.second.mid(0, separatorIdx); int charsetIdx = header.second.indexOf("charset="); diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h index bf3019de..2c09235b 100644 --- a/src/declarative/util/qdeclarativeanimation_p.h +++ b/src/declarative/util/qdeclarativeanimation_p.h @@ -61,6 +61,12 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && \ + (defined(Q_CC_CLANG) || (__GNUC__ * 100 + __GNUC_MINOR__) > 406) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Woverloaded-virtual" +#endif + class QDeclarativeAbstractAnimationPrivate; class QDeclarativeAnimationGroup; class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeAbstractAnimation : public QObject, public QDeclarativePropertyValueSource, public QDeclarativeParserStatus @@ -507,6 +513,11 @@ protected: virtual QAbstractAnimation *qtAnimation(); }; +#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && \ + (defined(Q_CC_CLANG) || (__GNUC__ * 100 + __GNUC_MINOR__) > 406) +# pragma GCC diagnostic pop +#endif + QT_END_NAMESPACE QML_DECLARE_TYPE(QDeclarativeAbstractAnimation) diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp index 6304ee40..60b3f9be 100644 --- a/src/declarative/util/qdeclarativefontloader.cpp +++ b/src/declarative/util/qdeclarativefontloader.cpp @@ -64,7 +64,7 @@ class QDeclarativeFontObject : public QObject Q_OBJECT public: - QDeclarativeFontObject(int _id); + QDeclarativeFontObject(int _id = -1); void download(const QUrl &url, QNetworkAccessManager *manager); @@ -84,7 +84,7 @@ private: Q_DISABLE_COPY(QDeclarativeFontObject) }; -QDeclarativeFontObject::QDeclarativeFontObject(int _id = -1) +QDeclarativeFontObject::QDeclarativeFontObject(int _id) : QObject(0), id(_id), reply(0), redirectCount(0) {} diff --git a/src/doc/doc.pro b/src/doc/doc.pro new file mode 100644 index 00000000..22366cd3 --- /dev/null +++ b/src/doc/doc.pro @@ -0,0 +1,2 @@ +TEMPLATE = aux +QMAKE_DOCS = $$PWD/qtdeclarative.qdocconf diff --git a/src/doc/qtdeclarative.qdocconf b/src/doc/qtdeclarative.qdocconf new file mode 100644 index 00000000..6a87d453 --- /dev/null +++ b/src/doc/qtdeclarative.qdocconf @@ -0,0 +1,31 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtDeclarative +description = "Qt Declarative Examples Documentation" +url = http://qt-project.org/doc/qt-5.0/qtdeclarative +version = 5.0.1 + +exampleinstallpath = declarative + +qhp.projects = QtDeclarative + +qhp.QtDeclarative.file = qtdeclarative.qhp +qhp.QtDeclarative.namespace = org.qt-project.qtdeclarative.500 +qhp.QtDeclarative.virtualFolder = declarative +qhp.QtDeclarative.indexTitle = Qt Quick +qhp.QtDeclarative.indexRoot = + +qhp.QtDeclarative.filterAttributes = declarative 5.0.1 qtrefdoc +qhp.QtDeclarative.customFilters.Qt.name = declarative 5.0.1 +qhp.QtDeclarative.customFilters.Qt.filterAttributes = declarative 5.0.1 + +depends += qtcore qtgui qtscript qtdoc + +exampledirs = ../examples/declarative + +headerdirs += .. + +sourcedirs += .. + +imagedirs += images + diff --git a/doc/src/declarative/advtutorial.qdoc b/src/doc/src/declarative/advtutorial.qdoc index 59224f3e..59224f3e 100644 --- a/doc/src/declarative/advtutorial.qdoc +++ b/src/doc/src/declarative/advtutorial.qdoc diff --git a/doc/src/declarative/anchor-layout.qdoc b/src/doc/src/declarative/anchor-layout.qdoc index 611b3a16..611b3a16 100644 --- a/doc/src/declarative/anchor-layout.qdoc +++ b/src/doc/src/declarative/anchor-layout.qdoc diff --git a/doc/src/declarative/animation.qdoc b/src/doc/src/declarative/animation.qdoc index 0f58e752..0f58e752 100644 --- a/doc/src/declarative/animation.qdoc +++ b/src/doc/src/declarative/animation.qdoc diff --git a/doc/src/declarative/basicelements.qdoc b/src/doc/src/declarative/basicelements.qdoc index a90e2d21..a90e2d21 100644 --- a/doc/src/declarative/basicelements.qdoc +++ b/src/doc/src/declarative/basicelements.qdoc diff --git a/doc/src/declarative/basictypes.qdoc b/src/doc/src/declarative/basictypes.qdoc index 2fbccdff..2fbccdff 100644 --- a/doc/src/declarative/basictypes.qdoc +++ b/src/doc/src/declarative/basictypes.qdoc diff --git a/doc/src/declarative/behaviors-and-states.qdoc b/src/doc/src/declarative/behaviors-and-states.qdoc index 8402c571..8402c571 100644 --- a/doc/src/declarative/behaviors-and-states.qdoc +++ b/src/doc/src/declarative/behaviors-and-states.qdoc diff --git a/doc/src/declarative/codingconventions.qdoc b/src/doc/src/declarative/codingconventions.qdoc index 050d2eb7..050d2eb7 100644 --- a/doc/src/declarative/codingconventions.qdoc +++ b/src/doc/src/declarative/codingconventions.qdoc diff --git a/doc/src/declarative/declarativeui.qdoc b/src/doc/src/declarative/declarativeui.qdoc index ea1f29b1..ea1f29b1 100644 --- a/doc/src/declarative/declarativeui.qdoc +++ b/src/doc/src/declarative/declarativeui.qdoc diff --git a/doc/src/declarative/dynamicobjects.qdoc b/src/doc/src/declarative/dynamicobjects.qdoc index 2476a57a..2476a57a 100644 --- a/doc/src/declarative/dynamicobjects.qdoc +++ b/src/doc/src/declarative/dynamicobjects.qdoc diff --git a/doc/src/declarative/elements.qdoc b/src/doc/src/declarative/elements.qdoc index d2061598..d2061598 100644 --- a/doc/src/declarative/elements.qdoc +++ b/src/doc/src/declarative/elements.qdoc diff --git a/doc/src/declarative/example-slideswitch.qdoc b/src/doc/src/declarative/example-slideswitch.qdoc index 28c0d32b..28c0d32b 100644 --- a/doc/src/declarative/example-slideswitch.qdoc +++ b/src/doc/src/declarative/example-slideswitch.qdoc diff --git a/doc/src/declarative/examples.qdoc b/src/doc/src/declarative/examples.qdoc index 2d7f7cf8..2d7f7cf8 100644 --- a/doc/src/declarative/examples.qdoc +++ b/src/doc/src/declarative/examples.qdoc diff --git a/doc/src/declarative/extending-tutorial.qdoc b/src/doc/src/declarative/extending-tutorial.qdoc index 00d611d6..00d611d6 100644 --- a/doc/src/declarative/extending-tutorial.qdoc +++ b/src/doc/src/declarative/extending-tutorial.qdoc diff --git a/doc/src/declarative/extending.qdoc b/src/doc/src/declarative/extending.qdoc index fbc50b84..fbc50b84 100644 --- a/doc/src/declarative/extending.qdoc +++ b/src/doc/src/declarative/extending.qdoc diff --git a/doc/src/declarative/focus.qdoc b/src/doc/src/declarative/focus.qdoc index a4c9a543..a4c9a543 100644 --- a/doc/src/declarative/focus.qdoc +++ b/src/doc/src/declarative/focus.qdoc diff --git a/doc/src/declarative/globalobject.qdoc b/src/doc/src/declarative/globalobject.qdoc index e23d6a56..e23d6a56 100644 --- a/doc/src/declarative/globalobject.qdoc +++ b/src/doc/src/declarative/globalobject.qdoc diff --git a/doc/src/declarative/integrating.qdoc b/src/doc/src/declarative/integrating.qdoc index 3d3373b7..3d3373b7 100644 --- a/doc/src/declarative/integrating.qdoc +++ b/src/doc/src/declarative/integrating.qdoc diff --git a/doc/src/declarative/javascriptblocks.qdoc b/src/doc/src/declarative/javascriptblocks.qdoc index d4ae021a..d4ae021a 100644 --- a/doc/src/declarative/javascriptblocks.qdoc +++ b/src/doc/src/declarative/javascriptblocks.qdoc diff --git a/doc/src/declarative/modules.qdoc b/src/doc/src/declarative/modules.qdoc index 9ef394f8..9ef394f8 100644 --- a/doc/src/declarative/modules.qdoc +++ b/src/doc/src/declarative/modules.qdoc diff --git a/doc/src/declarative/mouseevents.qdoc b/src/doc/src/declarative/mouseevents.qdoc index 5b9e54e9..5b9e54e9 100644 --- a/doc/src/declarative/mouseevents.qdoc +++ b/src/doc/src/declarative/mouseevents.qdoc diff --git a/doc/src/declarative/network.qdoc b/src/doc/src/declarative/network.qdoc index 54058860..54058860 100644 --- a/doc/src/declarative/network.qdoc +++ b/src/doc/src/declarative/network.qdoc diff --git a/doc/src/declarative/pics/3d-axis.png b/src/doc/src/declarative/pics/3d-axis.png Binary files differindex 1a587ffd..1a587ffd 100644 --- a/doc/src/declarative/pics/3d-axis.png +++ b/src/doc/src/declarative/pics/3d-axis.png diff --git a/doc/src/declarative/pics/3d-rotation-axis.png b/src/doc/src/declarative/pics/3d-rotation-axis.png Binary files differindex b9402156..b9402156 100644 --- a/doc/src/declarative/pics/3d-rotation-axis.png +++ b/src/doc/src/declarative/pics/3d-rotation-axis.png diff --git a/doc/src/declarative/pics/BorderImage.png b/src/doc/src/declarative/pics/BorderImage.png Binary files differindex 651dd8aa..651dd8aa 100644 --- a/doc/src/declarative/pics/BorderImage.png +++ b/src/doc/src/declarative/pics/BorderImage.png diff --git a/doc/src/declarative/pics/ListViewHighlight.png b/src/doc/src/declarative/pics/ListViewHighlight.png Binary files differindex 02bf51da..02bf51da 100644 --- a/doc/src/declarative/pics/ListViewHighlight.png +++ b/src/doc/src/declarative/pics/ListViewHighlight.png diff --git a/doc/src/declarative/pics/ListViewHorizontal.png b/src/doc/src/declarative/pics/ListViewHorizontal.png Binary files differindex 4633a0e1..4633a0e1 100644 --- a/doc/src/declarative/pics/ListViewHorizontal.png +++ b/src/doc/src/declarative/pics/ListViewHorizontal.png diff --git a/doc/src/declarative/pics/ListViewVertical.png b/src/doc/src/declarative/pics/ListViewVertical.png Binary files differindex e0b23d95..e0b23d95 100644 --- a/doc/src/declarative/pics/ListViewVertical.png +++ b/src/doc/src/declarative/pics/ListViewVertical.png diff --git a/doc/src/declarative/pics/anatomy-component.png b/src/doc/src/declarative/pics/anatomy-component.png Binary files differindex 6125b009..6125b009 100644 --- a/doc/src/declarative/pics/anatomy-component.png +++ b/src/doc/src/declarative/pics/anatomy-component.png diff --git a/doc/src/declarative/pics/anchorchanges.png b/src/doc/src/declarative/pics/anchorchanges.png Binary files differindex 4973e4e9..4973e4e9 100644 --- a/doc/src/declarative/pics/anchorchanges.png +++ b/src/doc/src/declarative/pics/anchorchanges.png diff --git a/doc/src/declarative/pics/anchors.svg b/src/doc/src/declarative/pics/anchors.svg index 08b00ed6..08b00ed6 100644 --- a/doc/src/declarative/pics/anchors.svg +++ b/src/doc/src/declarative/pics/anchors.svg diff --git a/doc/src/declarative/pics/animatedimageitem.gif b/src/doc/src/declarative/pics/animatedimageitem.gif Binary files differindex 85c3cb56..85c3cb56 100644 --- a/doc/src/declarative/pics/animatedimageitem.gif +++ b/src/doc/src/declarative/pics/animatedimageitem.gif diff --git a/doc/src/declarative/pics/axisrotation.png b/src/doc/src/declarative/pics/axisrotation.png Binary files differindex 4cddcdfc..4cddcdfc 100644 --- a/doc/src/declarative/pics/axisrotation.png +++ b/src/doc/src/declarative/pics/axisrotation.png diff --git a/doc/src/declarative/pics/blur_example.png b/src/doc/src/declarative/pics/blur_example.png Binary files differindex 763b1122..763b1122 100644 --- a/doc/src/declarative/pics/blur_example.png +++ b/src/doc/src/declarative/pics/blur_example.png diff --git a/doc/src/declarative/pics/content.png b/src/doc/src/declarative/pics/content.png Binary files differindex 47a98ac9..47a98ac9 100644 --- a/doc/src/declarative/pics/content.png +++ b/src/doc/src/declarative/pics/content.png diff --git a/doc/src/declarative/pics/declarative-adv-tutorial1.png b/src/doc/src/declarative/pics/declarative-adv-tutorial1.png Binary files differindex 1699ab0e..1699ab0e 100644 --- a/doc/src/declarative/pics/declarative-adv-tutorial1.png +++ b/src/doc/src/declarative/pics/declarative-adv-tutorial1.png diff --git a/doc/src/declarative/pics/declarative-adv-tutorial2.png b/src/doc/src/declarative/pics/declarative-adv-tutorial2.png Binary files differindex ba27c442..ba27c442 100644 --- a/doc/src/declarative/pics/declarative-adv-tutorial2.png +++ b/src/doc/src/declarative/pics/declarative-adv-tutorial2.png diff --git a/doc/src/declarative/pics/declarative-adv-tutorial3.png b/src/doc/src/declarative/pics/declarative-adv-tutorial3.png Binary files differindex d500434d..d500434d 100644 --- a/doc/src/declarative/pics/declarative-adv-tutorial3.png +++ b/src/doc/src/declarative/pics/declarative-adv-tutorial3.png diff --git a/doc/src/declarative/pics/declarative-adv-tutorial4.gif b/src/doc/src/declarative/pics/declarative-adv-tutorial4.gif Binary files differindex 827458da..827458da 100644 --- a/doc/src/declarative/pics/declarative-adv-tutorial4.gif +++ b/src/doc/src/declarative/pics/declarative-adv-tutorial4.gif diff --git a/doc/src/declarative/pics/declarative-qmlfocus1.png b/src/doc/src/declarative/pics/declarative-qmlfocus1.png Binary files differindex fd05146d..fd05146d 100644 --- a/doc/src/declarative/pics/declarative-qmlfocus1.png +++ b/src/doc/src/declarative/pics/declarative-qmlfocus1.png diff --git a/doc/src/declarative/pics/declarative-qmlfocus2.png b/src/doc/src/declarative/pics/declarative-qmlfocus2.png Binary files differindex a946e2c4..a946e2c4 100644 --- a/doc/src/declarative/pics/declarative-qmlfocus2.png +++ b/src/doc/src/declarative/pics/declarative-qmlfocus2.png diff --git a/doc/src/declarative/pics/declarative-qmlfocus3.png b/src/doc/src/declarative/pics/declarative-qmlfocus3.png Binary files differindex ba55f760..ba55f760 100644 --- a/doc/src/declarative/pics/declarative-qmlfocus3.png +++ b/src/doc/src/declarative/pics/declarative-qmlfocus3.png diff --git a/doc/src/declarative/pics/declarative-qmlfocus4.png b/src/doc/src/declarative/pics/declarative-qmlfocus4.png Binary files differindex e21f2a6a..e21f2a6a 100644 --- a/doc/src/declarative/pics/declarative-qmlfocus4.png +++ b/src/doc/src/declarative/pics/declarative-qmlfocus4.png diff --git a/doc/src/declarative/pics/dial-example.gif b/src/doc/src/declarative/pics/dial-example.gif Binary files differindex 4e90ba91..4e90ba91 100644 --- a/doc/src/declarative/pics/dial-example.gif +++ b/src/doc/src/declarative/pics/dial-example.gif diff --git a/doc/src/declarative/pics/edge1.png b/src/doc/src/declarative/pics/edge1.png Binary files differindex f4bc16d0..f4bc16d0 100644 --- a/doc/src/declarative/pics/edge1.png +++ b/src/doc/src/declarative/pics/edge1.png diff --git a/doc/src/declarative/pics/edge2.png b/src/doc/src/declarative/pics/edge2.png Binary files differindex 71bda8eb..71bda8eb 100644 --- a/doc/src/declarative/pics/edge2.png +++ b/src/doc/src/declarative/pics/edge2.png diff --git a/doc/src/declarative/pics/edge3.png b/src/doc/src/declarative/pics/edge3.png Binary files differindex 51bb894c..51bb894c 100644 --- a/doc/src/declarative/pics/edge3.png +++ b/src/doc/src/declarative/pics/edge3.png diff --git a/doc/src/declarative/pics/edge4.png b/src/doc/src/declarative/pics/edge4.png Binary files differindex aee3bd10..aee3bd10 100644 --- a/doc/src/declarative/pics/edge4.png +++ b/src/doc/src/declarative/pics/edge4.png diff --git a/doc/src/declarative/pics/edges.png b/src/doc/src/declarative/pics/edges.png Binary files differindex 211b1019..211b1019 100644 --- a/doc/src/declarative/pics/edges.png +++ b/src/doc/src/declarative/pics/edges.png diff --git a/doc/src/declarative/pics/edges.svg b/src/doc/src/declarative/pics/edges.svg index 25698ca4..25698ca4 100644 --- a/doc/src/declarative/pics/edges.svg +++ b/src/doc/src/declarative/pics/edges.svg diff --git a/doc/src/declarative/pics/edges_examples.svg b/src/doc/src/declarative/pics/edges_examples.svg index 31e9901f..31e9901f 100644 --- a/doc/src/declarative/pics/edges_examples.svg +++ b/src/doc/src/declarative/pics/edges_examples.svg diff --git a/doc/src/declarative/pics/edges_qml.png b/src/doc/src/declarative/pics/edges_qml.png Binary files differindex 73f22f92..73f22f92 100644 --- a/doc/src/declarative/pics/edges_qml.png +++ b/src/doc/src/declarative/pics/edges_qml.png diff --git a/doc/src/declarative/pics/edges_qml.svg b/src/doc/src/declarative/pics/edges_qml.svg index 1814ec6b..1814ec6b 100644 --- a/doc/src/declarative/pics/edges_qml.svg +++ b/src/doc/src/declarative/pics/edges_qml.svg diff --git a/doc/src/declarative/pics/extending-tutorial-chapter1.png b/src/doc/src/declarative/pics/extending-tutorial-chapter1.png Binary files differindex 9f5836b0..9f5836b0 100644 --- a/doc/src/declarative/pics/extending-tutorial-chapter1.png +++ b/src/doc/src/declarative/pics/extending-tutorial-chapter1.png diff --git a/doc/src/declarative/pics/extending-tutorial-chapter2.png b/src/doc/src/declarative/pics/extending-tutorial-chapter2.png Binary files differindex 5c8f222a..5c8f222a 100644 --- a/doc/src/declarative/pics/extending-tutorial-chapter2.png +++ b/src/doc/src/declarative/pics/extending-tutorial-chapter2.png diff --git a/doc/src/declarative/pics/extending-tutorial-chapter3.png b/src/doc/src/declarative/pics/extending-tutorial-chapter3.png Binary files differindex 825553fc..825553fc 100644 --- a/doc/src/declarative/pics/extending-tutorial-chapter3.png +++ b/src/doc/src/declarative/pics/extending-tutorial-chapter3.png diff --git a/doc/src/declarative/pics/extending-tutorial-chapter5.png b/src/doc/src/declarative/pics/extending-tutorial-chapter5.png Binary files differindex 0c2e69e1..0c2e69e1 100644 --- a/doc/src/declarative/pics/extending-tutorial-chapter5.png +++ b/src/doc/src/declarative/pics/extending-tutorial-chapter5.png diff --git a/doc/src/declarative/pics/flickable.gif b/src/doc/src/declarative/pics/flickable.gif Binary files differindex f7a33194..f7a33194 100644 --- a/doc/src/declarative/pics/flickable.gif +++ b/src/doc/src/declarative/pics/flickable.gif diff --git a/doc/src/declarative/pics/flipable.gif b/src/doc/src/declarative/pics/flipable.gif Binary files differindex fd187906..fd187906 100644 --- a/doc/src/declarative/pics/flipable.gif +++ b/src/doc/src/declarative/pics/flipable.gif diff --git a/doc/src/declarative/pics/gridLayout_example.png b/src/doc/src/declarative/pics/gridLayout_example.png Binary files differindex 6b120e96..6b120e96 100644 --- a/doc/src/declarative/pics/gridLayout_example.png +++ b/src/doc/src/declarative/pics/gridLayout_example.png diff --git a/doc/src/declarative/pics/gridview-highlight.png b/src/doc/src/declarative/pics/gridview-highlight.png Binary files differindex b54af37f..b54af37f 100644 --- a/doc/src/declarative/pics/gridview-highlight.png +++ b/src/doc/src/declarative/pics/gridview-highlight.png diff --git a/doc/src/declarative/pics/gridview-simple.png b/src/doc/src/declarative/pics/gridview-simple.png Binary files differindex a102939f..a102939f 100644 --- a/doc/src/declarative/pics/gridview-simple.png +++ b/src/doc/src/declarative/pics/gridview-simple.png diff --git a/doc/src/declarative/pics/highlight.gif b/src/doc/src/declarative/pics/highlight.gif Binary files differindex fbef256f..fbef256f 100644 --- a/doc/src/declarative/pics/highlight.gif +++ b/src/doc/src/declarative/pics/highlight.gif diff --git a/doc/src/declarative/pics/horizontalpositioner_example.png b/src/doc/src/declarative/pics/horizontalpositioner_example.png Binary files differindex 42f90ec7..42f90ec7 100644 --- a/doc/src/declarative/pics/horizontalpositioner_example.png +++ b/src/doc/src/declarative/pics/horizontalpositioner_example.png diff --git a/doc/src/declarative/pics/imageprovider.png b/src/doc/src/declarative/pics/imageprovider.png Binary files differindex 422103cb..422103cb 100644 --- a/doc/src/declarative/pics/imageprovider.png +++ b/src/doc/src/declarative/pics/imageprovider.png diff --git a/doc/src/declarative/pics/layoutmirroring.png b/src/doc/src/declarative/pics/layoutmirroring.png Binary files differindex df90ac4f..df90ac4f 100644 --- a/doc/src/declarative/pics/layoutmirroring.png +++ b/src/doc/src/declarative/pics/layoutmirroring.png diff --git a/doc/src/declarative/pics/listmodel-nested.png b/src/doc/src/declarative/pics/listmodel-nested.png Binary files differindex ee7ffba6..ee7ffba6 100644 --- a/doc/src/declarative/pics/listmodel-nested.png +++ b/src/doc/src/declarative/pics/listmodel-nested.png diff --git a/doc/src/declarative/pics/listmodel.png b/src/doc/src/declarative/pics/listmodel.png Binary files differindex 7ab1771f..7ab1771f 100644 --- a/doc/src/declarative/pics/listmodel.png +++ b/src/doc/src/declarative/pics/listmodel.png diff --git a/doc/src/declarative/pics/listview-highlight.png b/src/doc/src/declarative/pics/listview-highlight.png Binary files differindex dc5c6b3b..dc5c6b3b 100644 --- a/doc/src/declarative/pics/listview-highlight.png +++ b/src/doc/src/declarative/pics/listview-highlight.png diff --git a/doc/src/declarative/pics/listview-simple.png b/src/doc/src/declarative/pics/listview-simple.png Binary files differindex 71a1c517..71a1c517 100644 --- a/doc/src/declarative/pics/listview-simple.png +++ b/src/doc/src/declarative/pics/listview-simple.png diff --git a/doc/src/declarative/pics/margins_qml.png b/src/doc/src/declarative/pics/margins_qml.png Binary files differindex d7d73a3f..d7d73a3f 100644 --- a/doc/src/declarative/pics/margins_qml.png +++ b/src/doc/src/declarative/pics/margins_qml.png diff --git a/doc/src/declarative/pics/margins_qml.svg b/src/doc/src/declarative/pics/margins_qml.svg index 1f0ff022..1f0ff022 100644 --- a/doc/src/declarative/pics/margins_qml.svg +++ b/src/doc/src/declarative/pics/margins_qml.svg diff --git a/doc/src/declarative/pics/parentchange.png b/src/doc/src/declarative/pics/parentchange.png Binary files differindex 93206fbb..93206fbb 100644 --- a/doc/src/declarative/pics/parentchange.png +++ b/src/doc/src/declarative/pics/parentchange.png diff --git a/doc/src/declarative/pics/particles.gif b/src/doc/src/declarative/pics/particles.gif Binary files differindex 763a8a86..763a8a86 100644 --- a/doc/src/declarative/pics/particles.gif +++ b/src/doc/src/declarative/pics/particles.gif diff --git a/doc/src/declarative/pics/pathview.gif b/src/doc/src/declarative/pics/pathview.gif Binary files differindex 4052eb26..4052eb26 100644 --- a/doc/src/declarative/pics/pathview.gif +++ b/src/doc/src/declarative/pics/pathview.gif diff --git a/doc/src/declarative/pics/positioner-add.gif b/src/doc/src/declarative/pics/positioner-add.gif Binary files differindex 86e92470..86e92470 100644 --- a/doc/src/declarative/pics/positioner-add.gif +++ b/src/doc/src/declarative/pics/positioner-add.gif diff --git a/doc/src/declarative/pics/positioner-move.gif b/src/doc/src/declarative/pics/positioner-move.gif Binary files differindex 1825c228..1825c228 100644 --- a/doc/src/declarative/pics/positioner-move.gif +++ b/src/doc/src/declarative/pics/positioner-move.gif diff --git a/doc/src/declarative/pics/positioner-remove.gif b/src/doc/src/declarative/pics/positioner-remove.gif Binary files differindex 70865119..70865119 100644 --- a/doc/src/declarative/pics/positioner-remove.gif +++ b/src/doc/src/declarative/pics/positioner-remove.gif diff --git a/doc/src/declarative/pics/propanim.gif b/src/doc/src/declarative/pics/propanim.gif Binary files differindex f86406ee..f86406ee 100644 --- a/doc/src/declarative/pics/propanim.gif +++ b/src/doc/src/declarative/pics/propanim.gif diff --git a/doc/src/declarative/pics/qml-context-object.png b/src/doc/src/declarative/pics/qml-context-object.png Binary files differindex 1b91aff6..1b91aff6 100644 --- a/doc/src/declarative/pics/qml-context-object.png +++ b/src/doc/src/declarative/pics/qml-context-object.png diff --git a/doc/src/declarative/pics/qml-context-tree.png b/src/doc/src/declarative/pics/qml-context-tree.png Binary files differindex 6bba5f4f..6bba5f4f 100644 --- a/doc/src/declarative/pics/qml-context-tree.png +++ b/src/doc/src/declarative/pics/qml-context-tree.png diff --git a/doc/src/declarative/pics/qml-context.png b/src/doc/src/declarative/pics/qml-context.png Binary files differindex bdf2ecd2..bdf2ecd2 100644 --- a/doc/src/declarative/pics/qml-context.png +++ b/src/doc/src/declarative/pics/qml-context.png diff --git a/doc/src/declarative/pics/qml-extending-types.png b/src/doc/src/declarative/pics/qml-extending-types.png Binary files differindex 6990d7c1..6990d7c1 100644 --- a/doc/src/declarative/pics/qml-extending-types.png +++ b/src/doc/src/declarative/pics/qml-extending-types.png diff --git a/doc/src/declarative/pics/qml-gradient.png b/src/doc/src/declarative/pics/qml-gradient.png Binary files differindex 5eefdd20..5eefdd20 100644 --- a/doc/src/declarative/pics/qml-gradient.png +++ b/src/doc/src/declarative/pics/qml-gradient.png diff --git a/doc/src/declarative/pics/qml-scope.png b/src/doc/src/declarative/pics/qml-scope.png Binary files differindex be025c8c..be025c8c 100644 --- a/doc/src/declarative/pics/qml-scope.png +++ b/src/doc/src/declarative/pics/qml-scope.png diff --git a/doc/src/declarative/pics/qtlogo.png b/src/doc/src/declarative/pics/qtlogo.png Binary files differindex 399bd0b1..399bd0b1 100644 --- a/doc/src/declarative/pics/qtlogo.png +++ b/src/doc/src/declarative/pics/qtlogo.png diff --git a/doc/src/declarative/pics/rect-border-width.png b/src/doc/src/declarative/pics/rect-border-width.png Binary files differindex e232cf3e..e232cf3e 100644 --- a/doc/src/declarative/pics/rect-border-width.png +++ b/src/doc/src/declarative/pics/rect-border-width.png diff --git a/doc/src/declarative/pics/rect-color.png b/src/doc/src/declarative/pics/rect-color.png Binary files differindex b258ba9b..b258ba9b 100644 --- a/doc/src/declarative/pics/rect-color.png +++ b/src/doc/src/declarative/pics/rect-color.png diff --git a/doc/src/declarative/pics/rect-smooth.png b/src/doc/src/declarative/pics/rect-smooth.png Binary files differindex 7ffd8aba..7ffd8aba 100644 --- a/doc/src/declarative/pics/rect-smooth.png +++ b/src/doc/src/declarative/pics/rect-smooth.png diff --git a/doc/src/declarative/pics/reflection_example.png b/src/doc/src/declarative/pics/reflection_example.png Binary files differindex fd9bb480..fd9bb480 100644 --- a/doc/src/declarative/pics/reflection_example.png +++ b/src/doc/src/declarative/pics/reflection_example.png diff --git a/doc/src/declarative/pics/repeater-index.png b/src/doc/src/declarative/pics/repeater-index.png Binary files differindex 3dbe6d05..3dbe6d05 100644 --- a/doc/src/declarative/pics/repeater-index.png +++ b/src/doc/src/declarative/pics/repeater-index.png diff --git a/doc/src/declarative/pics/repeater-modeldata.png b/src/doc/src/declarative/pics/repeater-modeldata.png Binary files differindex 6d8df0d9..6d8df0d9 100644 --- a/doc/src/declarative/pics/repeater-modeldata.png +++ b/src/doc/src/declarative/pics/repeater-modeldata.png diff --git a/doc/src/declarative/pics/repeater-simple.png b/src/doc/src/declarative/pics/repeater-simple.png Binary files differindex 6da62951..6da62951 100644 --- a/doc/src/declarative/pics/repeater-simple.png +++ b/src/doc/src/declarative/pics/repeater-simple.png diff --git a/doc/src/declarative/pics/repeater.png b/src/doc/src/declarative/pics/repeater.png Binary files differindex 973df27a..973df27a 100644 --- a/doc/src/declarative/pics/repeater.png +++ b/src/doc/src/declarative/pics/repeater.png diff --git a/doc/src/declarative/pics/scalegrid.svg b/src/doc/src/declarative/pics/scalegrid.svg index e386f3d7..e386f3d7 100644 --- a/doc/src/declarative/pics/scalegrid.svg +++ b/src/doc/src/declarative/pics/scalegrid.svg diff --git a/doc/src/declarative/pics/shaderexample.png b/src/doc/src/declarative/pics/shaderexample.png Binary files differindex dbc7291a..dbc7291a 100644 --- a/doc/src/declarative/pics/shaderexample.png +++ b/src/doc/src/declarative/pics/shaderexample.png diff --git a/doc/src/declarative/pics/shadow_example.png b/src/doc/src/declarative/pics/shadow_example.png Binary files differindex 6214620f..6214620f 100644 --- a/doc/src/declarative/pics/shadow_example.png +++ b/src/doc/src/declarative/pics/shadow_example.png diff --git a/doc/src/declarative/pics/squish-transform.png b/src/doc/src/declarative/pics/squish-transform.png Binary files differindex 0eb848ed..0eb848ed 100644 --- a/doc/src/declarative/pics/squish-transform.png +++ b/src/doc/src/declarative/pics/squish-transform.png diff --git a/doc/src/declarative/pics/squish.png b/src/doc/src/declarative/pics/squish.png Binary files differindex 73bf2920..73bf2920 100644 --- a/doc/src/declarative/pics/squish.png +++ b/src/doc/src/declarative/pics/squish.png diff --git a/doc/src/declarative/pics/switch-example.gif b/src/doc/src/declarative/pics/switch-example.gif Binary files differindex 3d6582fe..3d6582fe 100644 --- a/doc/src/declarative/pics/switch-example.gif +++ b/src/doc/src/declarative/pics/switch-example.gif diff --git a/doc/src/declarative/pics/translate.png b/src/doc/src/declarative/pics/translate.png Binary files differindex baf58b0e..baf58b0e 100644 --- a/doc/src/declarative/pics/translate.png +++ b/src/doc/src/declarative/pics/translate.png diff --git a/doc/src/declarative/pics/verticalpositioner_example.png b/src/doc/src/declarative/pics/verticalpositioner_example.png Binary files differindex 458dc7f4..458dc7f4 100644 --- a/doc/src/declarative/pics/verticalpositioner_example.png +++ b/src/doc/src/declarative/pics/verticalpositioner_example.png diff --git a/doc/src/declarative/pics/verticalpositioner_transition.gif b/src/doc/src/declarative/pics/verticalpositioner_transition.gif Binary files differindex ed61adb5..ed61adb5 100644 --- a/doc/src/declarative/pics/verticalpositioner_transition.gif +++ b/src/doc/src/declarative/pics/verticalpositioner_transition.gif diff --git a/doc/src/declarative/pics/visualitemmodel.png b/src/doc/src/declarative/pics/visualitemmodel.png Binary files differindex 5e6d1325..5e6d1325 100644 --- a/doc/src/declarative/pics/visualitemmodel.png +++ b/src/doc/src/declarative/pics/visualitemmodel.png diff --git a/doc/src/declarative/pics/webview.png b/src/doc/src/declarative/pics/webview.png Binary files differindex 0d245865..0d245865 100644 --- a/doc/src/declarative/pics/webview.png +++ b/src/doc/src/declarative/pics/webview.png diff --git a/doc/src/declarative/positioners.qdoc b/src/doc/src/declarative/positioners.qdoc index 4ea4aec5..4ea4aec5 100644 --- a/doc/src/declarative/positioners.qdoc +++ b/src/doc/src/declarative/positioners.qdoc diff --git a/doc/src/declarative/propertybinding.qdoc b/src/doc/src/declarative/propertybinding.qdoc index 652772fe..652772fe 100644 --- a/doc/src/declarative/propertybinding.qdoc +++ b/src/doc/src/declarative/propertybinding.qdoc diff --git a/doc/src/declarative/qdeclarativedebugging.qdoc b/src/doc/src/declarative/qdeclarativedebugging.qdoc index 1c6a09a9..1c6a09a9 100644 --- a/doc/src/declarative/qdeclarativedebugging.qdoc +++ b/src/doc/src/declarative/qdeclarativedebugging.qdoc diff --git a/doc/src/declarative/qdeclarativedocument.qdoc b/src/doc/src/declarative/qdeclarativedocument.qdoc index 7d665b06..7d665b06 100644 --- a/doc/src/declarative/qdeclarativedocument.qdoc +++ b/src/doc/src/declarative/qdeclarativedocument.qdoc diff --git a/doc/src/declarative/qdeclarativei18n.qdoc b/src/doc/src/declarative/qdeclarativei18n.qdoc index 81beb42c..81beb42c 100644 --- a/doc/src/declarative/qdeclarativei18n.qdoc +++ b/src/doc/src/declarative/qdeclarativei18n.qdoc diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/src/doc/src/declarative/qdeclarativeintro.qdoc index 97f88af8..97f88af8 100644 --- a/doc/src/declarative/qdeclarativeintro.qdoc +++ b/src/doc/src/declarative/qdeclarativeintro.qdoc diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/src/doc/src/declarative/qdeclarativemodels.qdoc index 206bbcdb..206bbcdb 100644 --- a/doc/src/declarative/qdeclarativemodels.qdoc +++ b/src/doc/src/declarative/qdeclarativemodels.qdoc diff --git a/doc/src/declarative/qdeclarativeperformance.qdoc b/src/doc/src/declarative/qdeclarativeperformance.qdoc index bd95b974..bd95b974 100644 --- a/doc/src/declarative/qdeclarativeperformance.qdoc +++ b/src/doc/src/declarative/qdeclarativeperformance.qdoc diff --git a/doc/src/declarative/qdeclarativesecurity.qdoc b/src/doc/src/declarative/qdeclarativesecurity.qdoc index f3c958fc..f3c958fc 100644 --- a/doc/src/declarative/qdeclarativesecurity.qdoc +++ b/src/doc/src/declarative/qdeclarativesecurity.qdoc diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/src/doc/src/declarative/qdeclarativestates.qdoc index 22b6d762..22b6d762 100644 --- a/doc/src/declarative/qdeclarativestates.qdoc +++ b/src/doc/src/declarative/qdeclarativestates.qdoc diff --git a/doc/src/declarative/qmlevents.qdoc b/src/doc/src/declarative/qmlevents.qdoc index 1acbd37f..1acbd37f 100644 --- a/doc/src/declarative/qmlevents.qdoc +++ b/src/doc/src/declarative/qmlevents.qdoc diff --git a/doc/src/declarative/qmlinuse.qdoc b/src/doc/src/declarative/qmlinuse.qdoc index 2a4f591a..2a4f591a 100644 --- a/doc/src/declarative/qmlinuse.qdoc +++ b/src/doc/src/declarative/qmlinuse.qdoc diff --git a/doc/src/declarative/qmlreusablecomponents.qdoc b/src/doc/src/declarative/qmlreusablecomponents.qdoc index 404c6aa7..404c6aa7 100644 --- a/doc/src/declarative/qmlreusablecomponents.qdoc +++ b/src/doc/src/declarative/qmlreusablecomponents.qdoc diff --git a/doc/src/declarative/qmlruntime.qdoc b/src/doc/src/declarative/qmlruntime.qdoc index 562f8402..562f8402 100644 --- a/doc/src/declarative/qmlruntime.qdoc +++ b/src/doc/src/declarative/qmlruntime.qdoc diff --git a/doc/src/declarative/qmlsyntax.qdoc b/src/doc/src/declarative/qmlsyntax.qdoc index fa88c84f..fa88c84f 100644 --- a/doc/src/declarative/qmlsyntax.qdoc +++ b/src/doc/src/declarative/qmlsyntax.qdoc diff --git a/doc/src/declarative/qmltexthandling.qdoc b/src/doc/src/declarative/qmltexthandling.qdoc index 74d18e69..74d18e69 100644 --- a/doc/src/declarative/qmltexthandling.qdoc +++ b/src/doc/src/declarative/qmltexthandling.qdoc diff --git a/doc/src/declarative/qmlviewer.qdoc b/src/doc/src/declarative/qmlviewer.qdoc index ccd86112..ccd86112 100644 --- a/doc/src/declarative/qmlviewer.qdoc +++ b/src/doc/src/declarative/qmlviewer.qdoc diff --git a/doc/src/declarative/qmlviews.qdoc b/src/doc/src/declarative/qmlviews.qdoc index f5020e0e..f5020e0e 100644 --- a/doc/src/declarative/qmlviews.qdoc +++ b/src/doc/src/declarative/qmlviews.qdoc diff --git a/doc/src/declarative/qmlwebkit.qdoc b/src/doc/src/declarative/qmlwebkit.qdoc index a093bb2e..a093bb2e 100644 --- a/doc/src/declarative/qmlwebkit.qdoc +++ b/src/doc/src/declarative/qmlwebkit.qdoc diff --git a/doc/src/declarative/qtbinding.qdoc b/src/doc/src/declarative/qtbinding.qdoc index 2c80aa8c..2c80aa8c 100644 --- a/doc/src/declarative/qtbinding.qdoc +++ b/src/doc/src/declarative/qtbinding.qdoc diff --git a/doc/src/declarative/qtdeclarative.qdoc b/src/doc/src/declarative/qtdeclarative.qdoc index 0c195a8e..0c195a8e 100644 --- a/doc/src/declarative/qtdeclarative.qdoc +++ b/src/doc/src/declarative/qtdeclarative.qdoc diff --git a/doc/src/declarative/qtprogrammers.qdoc b/src/doc/src/declarative/qtprogrammers.qdoc index 7421ec2a..7421ec2a 100644 --- a/doc/src/declarative/qtprogrammers.qdoc +++ b/src/doc/src/declarative/qtprogrammers.qdoc diff --git a/doc/src/declarative/qtquick-intro.qdoc b/src/doc/src/declarative/qtquick-intro.qdoc index 92f28ade..92f28ade 100644 --- a/doc/src/declarative/qtquick-intro.qdoc +++ b/src/doc/src/declarative/qtquick-intro.qdoc diff --git a/doc/src/declarative/righttoleft.qdoc b/src/doc/src/declarative/righttoleft.qdoc index c25fe8a0..c25fe8a0 100644 --- a/doc/src/declarative/righttoleft.qdoc +++ b/src/doc/src/declarative/righttoleft.qdoc diff --git a/doc/src/declarative/scope.qdoc b/src/doc/src/declarative/scope.qdoc index 8ee8d69c..8ee8d69c 100644 --- a/doc/src/declarative/scope.qdoc +++ b/src/doc/src/declarative/scope.qdoc diff --git a/doc/src/declarative/tutorial.qdoc b/src/doc/src/declarative/tutorial.qdoc index 41260a13..41260a13 100644 --- a/doc/src/declarative/tutorial.qdoc +++ b/src/doc/src/declarative/tutorial.qdoc diff --git a/doc/src/declarative/whatsnew.qdoc b/src/doc/src/declarative/whatsnew.qdoc index 80e1c3a5..80e1c3a5 100644 --- a/doc/src/declarative/whatsnew.qdoc +++ b/src/doc/src/declarative/whatsnew.qdoc diff --git a/doc/src/demos/qml-qtbubblelevel.qdoc b/src/doc/src/demos/qml-qtbubblelevel.qdoc index 9fe8c412..9fe8c412 100644 --- a/doc/src/demos/qml-qtbubblelevel.qdoc +++ b/src/doc/src/demos/qml-qtbubblelevel.qdoc diff --git a/doc/src/examples/qml-calculator.qdoc b/src/doc/src/examples/qml-calculator.qdoc index 0bb918c6..0bb918c6 100644 --- a/doc/src/examples/qml-calculator.qdoc +++ b/src/doc/src/examples/qml-calculator.qdoc diff --git a/doc/src/examples/qml-examples.qdoc b/src/doc/src/examples/qml-examples.qdoc index 4df8b76d..3975955a 100644 --- a/doc/src/examples/qml-examples.qdoc +++ b/src/doc/src/examples/qml-examples.qdoc @@ -27,25 +27,16 @@ /*! \title Animation: Basics Example - \example declarative/animation/basics/color-animation - \depends helper/qmlapplicationviewer - - \brief This example shows how to create and combine \l{QML Animation}{animations} in QML. + \example declarative/animation/basics + + This example shows how to create and combine \l{QML Animation and Transitions}{animations} in QML. \table \row \li \image qml-coloranim-example.png \row \li color-animation.qml - \endtable -*/ - -/*! - \title Animation: Basics Property Animation Example - \example declarative/animation/basics/property-animation - \depends helper/qmlapplicationviewer - - \brief This example shows how to create and combine \l{QML Animation}{animations} in QML. + \endtable \table \row @@ -56,30 +47,19 @@ */ /*! - \title Animation: Behavior Example - \example declarative/animation/behaviors/behavior-example - \depends helper/qmlapplicationviewer + \title Animation: Behavior Examples + \example declarative/animation/behaviors - \brief This example shows how to use QML behaviors. + This example shows how to use QML behaviors. \image qml-behaviors-example.png */ /*! - \title Animation: Wiggly Text Example - \example declarative/animation/behaviors/wigglytext - \depends helper/qmlapplicationviewer - - \brief This example shows how to animate text. - -*/ - -/*! \title Animation: Easing Example \example declarative/animation/easing - \depends helper/qmlapplicationviewer - \brief This example shows the different easing modes available for \l{QML Animation}{animations}. + This example shows the different easing modes available for \l{QML Animation and Transitions}{animations}. \image qml-easing-example.png */ @@ -88,16 +68,11 @@ \title Animation: States Example \example declarative/animation/states - \brief These examples show how to use states and transitions. - - \depends helper/qmlapplicationviewer + These examples show how to use \l{State}{states} and \l{Transition}{transitions}. The \c states.qml example shows how an item can change between states, and \c transitions.qml shows how these state changes can be animated. - \note Due to deployment configurations transitions.qml is opened by default when running this example. - states.qml can be opened by editing the main.cpp file. - \table \row \li \image qml-states-example.png @@ -117,9 +92,7 @@ \title Image Elements: Border Image Example \example declarative/imageelements/borderimage - \brief These examples show how to use the BorderImage element. - - \depends helper/qmlapplicationviewer + These examples show how to use the BorderImage element. \table \row @@ -127,14 +100,6 @@ \row \li borderimage.qml \endtable -*/ - -/*! - \title Image Elements: Shadows Image Example - \example declarative/imageelements/shadows - \depends helper/qmlapplicationviewer - - \brief This example shows how to use the BorderImage element. \table \row @@ -147,10 +112,8 @@ /*! \title Image Elements: Image Example \example declarative/imageelements/image - \depends helper/qmlapplicationviewer - - \brief This example shows how to use the \l Image element and its \l{Image::fillMode}{fillModes}. + This example shows how to use the \l Image element and its \l{Image::fillMode}{fillModes}. \image qml-image-example.png */ @@ -159,8 +122,8 @@ \page declarative-cppextensions-reference.html \title C++ Extensions: Reference examples - \brief These examples show how QML can be extended from C++ in various ways. - + These examples show how QML can be extended from C++ in various ways. + The code for these examples is used throughout the \l {Extending QML Functionalities using C++} reference documentation, which highlights the main principles demonstrated in each example. @@ -188,7 +151,7 @@ \title C++ Extensions: Plugins Example \example declarative/cppextensions/plugins - \brief This example shows how to create a C++ plugin extension by subclassing QDeclarativeExtensionPlugin. + This example shows how to create a C++ plugin extension by subclassing QDeclarativeExtensionPlugin. \image qml-plugins-example.png */ @@ -197,7 +160,7 @@ \title LayoutItem Example \example declarative/cppextensions/qgraphicslayouts/layoutitem - \brief This example show how to use the LayoutItem element to integrate QML items into an existing + This example show how to use the LayoutItem element to integrate QML items into an existing \l{Graphics View Framework}{Graphics View}-based application. \image qml-layoutitem-example.png @@ -206,7 +169,7 @@ \title QGraphicsGridLayout Example \example declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout - \brief This example shows how to use QGraphicsGridLayout to lay out QML items. This is + This example shows how to use QGraphicsGridLayout to lay out QML items. This is useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with QML. @@ -216,7 +179,7 @@ \title QGraphicsLinearLayout Example \example declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout - \brief This example shows how to use QGraphicsLinearLayout to lay out QML items. This is + This example shows how to use QGraphicsLinearLayout to lay out QML items. This is useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with QML. @@ -226,7 +189,7 @@ \title C++ Extensions: QGraphicsLayouts examples \page declarative-cppextensions-qgraphicslayouts.html - \brief These examples show how to integrate \l{Graphics View Framework}{Graphics View} + These examples show how to integrate \l{Graphics View Framework}{Graphics View} layout components with QML: \list @@ -243,7 +206,7 @@ \title C++ Extensions: QWidgets Example \example declarative/cppextensions/qwidgets - \brief This example shows how to embed QWidget-based objects into QML using QGraphicsProxyWidget. + This example shows how to embed QWidget-based objects into QML using QGraphicsProxyWidget. \image qml-qwidgets-example.png */ @@ -252,7 +215,7 @@ \title C++ Extensions: Image Provider Example \example declarative/cppextensions/imageprovider - \brief This examples shows how to use QDeclarativeImageProvider to serve images + This examples shows how to use QDeclarativeImageProvider to serve images to QML image elements. \image qml-imageprovider-example.png @@ -262,7 +225,7 @@ \title C++ Extensions: Network Access Manager Factory Example \example declarative/cppextensions/networkaccessmanagerfactory - \brief This example shows how to use QDeclarativeNetworkAccessManagerFactory to create a QNetworkAccessManager + This example shows how to use QDeclarativeNetworkAccessManagerFactory to create a QNetworkAccessManager with a proxy. */ @@ -270,9 +233,8 @@ \title Internationalization Example \example declarative/i18n \ingroup internationalization - \depends helper/qmlapplicationviewer - \brief This example shows how to enable text translation in QML. + This example shows how to enable text translation in QML. \image qml-i18n-example.png @@ -311,13 +273,10 @@ /*! \title Right-to-left User Interfaces: Text Alignment Example \example declarative/righttoleft/textalignment - \depends helper/qmlapplicationviewer - \brief This example shows how the horizontal alignment of \l Text, + This example shows how the horizontal alignment of \l Text, \l TextInput and \l TextEdit is affected by the reading direction - of the text and by the layout mirrroring. - - Click on the gray buttons + of the text and by the layout mirrroring. Click on the gray buttons shown at the bottom of the example to toggle between different horizontal alignment options. @@ -327,13 +286,10 @@ /*! \title Right-to-left User Interfaces: Layout Direction Example \example declarative/righttoleft/layoutdirection - \depends helper/qmlapplicationviewer - \ brief This example shows how to control the horizontal layout direction of + This example shows how to control the horizontal layout direction of \l Row, \l Grid and \l Flow positioners, and \l ListView and \l GridView - model views. - - Click on the gray buttons shown at the bottom of the example + model views. Click on the gray buttons shown at the bottom of the example to toggle the layout direction of the shown elements. \image qml-righttoleft-layoutdirection-example.png @@ -345,13 +301,11 @@ /*! \title Right-to-left User Interfaces: Layout Mirroring Example \example declarative/righttoleft/layoutmirroring - \depends helper/qmlapplicationviewer - - \brief This example shows how to mirror the application layouts - using \l LayoutMirroring attached property. - Click on the grey button shown at the bottom of the example to - enable or disable the layout mirroring. + This example shows how to mirror the application layouts + using \l LayoutMirroring attached property. Click on the grey button + shown at the bottom of the example to enable or disable the + layout mirroring. \image qml-righttoleft-layoutmirroring-example.png @@ -361,9 +315,8 @@ /*! \title Positioners Example \example declarative/positioners - \depends helper/qmlapplicationviewer - \brief This example shows how to use positioner elements such as \l Row, \l Column, + This example shows how to use the positioner elements such as \l Row, \l Column, \l Grid and \l Flow. \image qml-positioners-example.png @@ -372,19 +325,19 @@ /*! \title Key Interaction: Focus Example \example declarative/keyinteraction/focus - \depends helper/qmlapplicationviewer - \brief This example shows how to handle keyboard input and focus in QML. + This example shows how to handle keyboard input and focus in QML. \image qml-focus-example.png + + \sa {Keyboard Focus in Qt Quick} */ /*! \title Models and Views: AbstractItemModel Example \example declarative/modelviews/abstractitemmodel - \depends helper/qmlapplicationviewer - \brief This example shows how to use a QAbstractItemModel subclass as a model in QML. + This example shows how to use a QAbstractItemModel subclass as a model in QML. \image qml-abstractitemmodel-example.png */ @@ -392,35 +345,17 @@ /*! \title Models and Views: GridView Example \example declarative/modelviews/gridview - \depends helper/qmlapplicationviewer - \brief This example shows how to use the GridView element. + This example shows how to use the GridView element. \image qml-gridview-example.png */ /*! - \title Models and Views: ListView Examples - \page qml-listview-examples.html - - \list - \li \l {Models and Views: Dynamic List ListView Example} - \li \l {Models and Views: Expanding Delegate ListView Example} - \li \l {Models and Views: Highlight ListView Example} - \li \l {Models and Views: Highlight Ranges ListView Example} - \li \l {Models and Views: Sections ListView Example} - \endlist - -*/ - -/*! - \title Models and Views: Dynamic List ListView Example - \example declarative/modelviews/listview/dynamiclist - \depends helper/qmlapplicationviewer + \title Models and Views: ListView Example + \example declarative/modelviews/listview - \brief This example shows how items can be dynamically added to - and removed from a ListModel, and how these list - modifications can be animated. + These examples show how to use the ListView element. \table \row @@ -428,15 +363,6 @@ \row \li dynamiclist.qml \endtable -*/ - -/*! - \title Models and Views: Expanding Delegate ListView Example - \example declarative/modelviews/listview/expandingdelegates - \depends helper/qmlapplicationviewer - - \brief This example shows how to create a dynamic delegate, which - expands when selected. \table \row @@ -444,16 +370,6 @@ \row \li expandingdelegates.qml \endtable -*/ - -/*! - \title Models and Views: Highlight ListView Example - \example declarative/modelviews/listview/highlight - \depends helper/qmlapplicationviewer - - - \brief This example shows how to highlight one item - inside a ListView element. \table \row @@ -461,16 +377,6 @@ \row \li highlight.qml \endtable -*/ - -/*! - \title Models and Views: Highlight Ranges ListView Example - \example declarative/modelviews/listview/highlightranges - \depends helper/qmlapplicationviewer - - - \brief This example shows how to highlight ranges within a - ListView element. \table \row @@ -478,15 +384,6 @@ \row \li highlightranges.qml \endtable -*/ - -/*! - \title Models and Views: Sections ListView Example - \example declarative/modelviews/listview/sections - \depends helper/qmlapplicationviewer - - - \brief This example shows how to use the ListView element. \table \row @@ -499,9 +396,8 @@ /*! \title Models and Views: PathView Example \example declarative/modelviews/pathview - \depends helper/qmlapplicationviewer - \brief This example shows how to use the PathView element. + This example shows how to use the PathView element. \image qml-pathview-example.png */ @@ -509,9 +405,8 @@ /*! \title Models and Views: Object ListModel Example \example declarative/modelviews/objectlistmodel - \depends helper/qmlapplicationviewer - \brief This example shows how to use a QList<QObject*> as a model in QML. + This example shows how to use a QList<QObject*> as a model in QML. \image qml-objectlistmodel-example.png */ @@ -519,9 +414,8 @@ /*! \title Models and Views: Package Example \example declarative/modelviews/package - \depends helper/qmlapplicationviewer - \brief This example shows how to use the \l Package element. + This example shows how to use the \l Package element. \image qml-package-example.png */ @@ -529,9 +423,8 @@ /*! \title Models and Views: Parallax Example \example declarative/modelviews/parallax - \depends helper/qmlapplicationviewer - \brief This example shows how to combine and switch between views. + This example shows how to combine and switch between views. \image qml-parallax-example.png */ @@ -539,9 +432,8 @@ /*! \title Models and Views: String ListModel Example \example declarative/modelviews/stringlistmodel - \depends helper/qmlapplicationviewer - \brief This example shows how to use a QStringList as a model in QML. + This example shows how to use a QStringList as a model in QML. \image qml-stringlistmodel-example.png */ @@ -549,35 +441,17 @@ /*! \title Models and Views: VisualItemModel Example \example declarative/modelviews/visualitemmodel - \depends helper/qmlapplicationviewer - \brief This example shows how to use the VisualItemModel element. + This example shows how to use the VisualItemModel element. \image qml-visualitemmodel-example.png */ /*! - \title Models and Views: WebView Examples - \page qml-webview-examples.html - - \brief These examples show how to use the WebView element. - - \list - \li \l {Models and Views: Alert WebView Example} - \li \l {Models and Views: Autosize WebView Example} - \li \l {Models and Views: GoogleMaps WebView Example} - \li \l {Models and Views: Inline HTML WebView Example} - \li \l {Models and Views: New Windows WebView Example} - \endlist - - -*/ -/*! - \title Models and Views: Alert WebView Example - \example declarative/modelviews/webview/alerts - \depends helper/qmlapplicationviewer + \title Models and Views: WebView Example + \example declarative/modelviews/webview - \brief This example shows how to create an alert in the WebView element. + These examples show how to use the WebView element. \table \row @@ -585,14 +459,6 @@ \row \li alert.qml \endtable -*/ - -/*! - \title Models and Views: Autosize WebView Example - \example declarative/modelviews/webview/autosize - \depends helper/qmlapplicationviewer - - \brief This example show how to use autosizing in the WebView element. \table \row @@ -600,14 +466,6 @@ \row \li autosize.qml \endtable -*/ - -/*! - \title Models and Views: GoogleMaps WebView Example - \example declarative/modelviews/webview/googlemaps - \depends helper/qmlapplicationviewer - - \brief This example shows how to use a web service API and the WebView element. \table \row @@ -615,14 +473,6 @@ \row \li googlemaps.qml \endtable -*/ - -/*! - \title Models and Views: Inline HTML WebView Example - \example declarative/modelviews/webview/inlinehtml - \depends helper/qmlapplicationviewer - - \brief This example shows how to use inline HTML with the WebView element. \table \row @@ -630,14 +480,6 @@ \row \li inlinehtml.qml \endtable -*/ - -/*! - \title Models and Views: New Windows WebView Example - \example declarative/modelviews/webview/newwindows - \depends helper/qmlapplicationviewer - - \brief These examples show how to create new windows in the WebView element. \table \row @@ -647,28 +489,27 @@ \endtable */ + /*! \title Screen Orientation \example declarative/screenorientation - \depends helper/qmlapplicationviewer - \brief This example shows how to implement screen orientation support for your application. + This example shows how to implement screen orientation support for your application. */ /*! \title SQL Local Storage Example \example declarative/sqllocalstorage - \depends helper/qmlapplicationviewer - \brief This example shows how to use the SQL Local Storage API in QML. + This example shows how to use the SQL Local Storage API in QML. */ /*! \title Text: Fonts Example \example declarative/text/fonts - \depends helper/qmlapplicationviewer - \brief These examples show how to discover available fonts from QML. + These examples show how to discover available fonts from QML and manipulate + text in various ways. \table \row @@ -676,14 +517,6 @@ \row \li availableFonts.qml \endtable -*/ - -/*! - \title Text: Banner Fonts Example - \example declarative/text/fonts/banner - \depends helper/qmlapplicationviewer - - \brief These example shows how to manipulate text in various ways. \table \row @@ -691,14 +524,6 @@ \row \li banner.qml \endtable -*/ - -/*! - \title Text: Fonts Example - \example declarative/text/fonts/fonts - \depends helper/qmlapplicationviewer - - \brief These examples shows how to display a text with multiple fonts. \table \row @@ -706,14 +531,6 @@ \row \li fonts.qml \endtable -*/ - -/*! - \title Text: Hello Fonts Example - \example declarative/text/fonts/hello - \depends helper/qmlapplicationviewer - - \brief This example shows how to manipulate text in various ways. \table \row @@ -726,9 +543,8 @@ /*! \title Text: Text Selection Example \example declarative/text/textselection - \depends helper/qmlapplicationviewer - \brief This example shows how text selection, copy and paste operations + This example shows how text selection, copy and paste operations can be implemented on top of the TextEdit element. \image qml-textselection-example.png @@ -737,28 +553,24 @@ /*! \title Threading: Threaded ListModel Example \example declarative/threading/threadedlistmodel - \depends helper/qmlapplicationviewer - \brief This example shows how to use a ListModel from multiple threads using + This example shows how to use a ListModel from multiple threads using WorkerScript. */ /*! \title Threading: WorkerScript Example \example declarative/threading/workerscript - \depends helper/qmlapplicationviewer - \brief This example shows how to use the WorkerScript element for threading in QML. + This example shows how to use the WorkerScript element for threading in QML. */ /*! \title Toys: Clocks Example \example declarative/toys/clocks - \depends helper/qmlapplicationviewer - \brief This example displays a set of clocks with different times for different cities. - - Each clock is created by combining \l Image elements with \l Rotation transforms + This example displays a set of clocks with different times for different cities. + Each clock is created by combining \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors. \image qml-clocks-example.png @@ -767,9 +579,8 @@ /*! \title Toys: Corkboards Example \example declarative/toys/corkboards - \depends helper/qmlapplicationviewer - \brief This example presents a flickable set of interactive corkboards. It is created + This example presents a flickable set of interactive corkboards. It is created through a combination of elements like \l ListModel, \l Repeater and \l TextEdit together with rotation and scaling transforms, animation and mouse interaction. @@ -779,9 +590,8 @@ /*! \title Toys: Dynamic Scene Example \example declarative/toys/dynamicscene - \depends helper/qmlapplicationviewer - \brief This example presents an interactive drag-and-drop scene. It demonstrates + This example presents an interactive drag-and-drop scene. It demonstrates how to use QML's \l{Dynamic Object Creation} support to dynamically create and destroy objects. @@ -791,9 +601,8 @@ /*! \title Toys: Tic-Tac-Toe Example \example declarative/toys/tic-tac-toe - \depends helper/qmlapplicationviewer - \brief This example presents a simple implementation of Tic Tac Toe. + This example presents a simple implementation of Tic Tac Toe. \image qml-tic-tac-toe-example.png */ @@ -801,28 +610,18 @@ /*! \title Toys: TV Tennis Example \example declarative/toys/tvtennis - \depends helper/qmlapplicationviewer - \brief This example shows how to use animation components such as \l SpringAnimation, + This example shows how to use animation components such as \l SpringAnimation, \l SequentialAnimation and \l PropertyAction to create a game of TV tennis. \image qml-tvtennis-example.png */ /*! - \title Touch Interaction: Gestures Example - \example declarative/touchinteraction/gestures - \depends helper/qmlapplicationviewer - - \brief This example shows how to use the GestureArea element. -*/ - -/*! \title Touch Interaction: MouseArea Example \example declarative/touchinteraction/mousearea - \depends helper/qmlapplicationviewer - \brief This example shows how to use the MouseArea element to access information + This example shows how to use the MouseArea element to access information about mouse input. \image qml-mousearea-example.png @@ -831,9 +630,8 @@ /*! \title UI Components: Dial Control Example \example declarative/ui-components/dialcontrol - \depends helper/qmlapplicationviewer - \brief This example shows how to create a dial-type control. It combines + This example shows how to create a dial-type control. It combines \l Image elements with \l Rotation transforms and \l SpringAnimation behaviors to produce an interactive speedometer-type dial. @@ -844,9 +642,8 @@ /*! \title UI Components: Flipable Example \example declarative/ui-components/flipable - \depends helper/qmlapplicationviewer - \brief This example shows how to use the \l Flipable element. + This example shows how to use the \l Flipable element. \image qml-flipable-example.png */ @@ -854,9 +651,8 @@ /*! \title UI Components: Progress Bars Example \example declarative/ui-components/progressbar - \depends helper/qmlapplicationviewer - \brief This example shows how to create a progress bar. + This example shows how to create a progress bar. \image qml-progressbar-example.png */ @@ -864,9 +660,8 @@ /*! \title UI Components: Scroll Bar Example \example declarative/ui-components/scrollbar - \depends helper/qmlapplicationviewer - \brief This example shows how to create scroll bars for a \l Flickable element + This example shows how to create scroll bars for a \l Flickable element using the \l {Flickable::visibleArea.xPosition}{Flickable::visibleArea} properties. @@ -876,9 +671,8 @@ /*! \title UI Components: Search Box Example \example declarative/ui-components/searchbox - \depends helper/qmlapplicationviewer - \brief This example shows how to combine TextInput, FocusScope and BorderImage + This example shows how to combine TextInput, FocusScope and BorderImage elements to display multiple text input fields. \image qml-searchbox-example.png @@ -887,9 +681,8 @@ /*! \title UI Components: Slide Switch Example \example declarative/ui-components/slideswitch - \depends helper/qmlapplicationviewer - \brief This example shows how to create a slide switch control. + This example shows how to create a slide switch control. \image qml-slideswitch-example.png */ @@ -897,9 +690,8 @@ /*! \title UI Components: Spinner Example \example declarative/ui-components/spinner - \depends helper/qmlapplicationviewer - \brief This example shows how to create a spinner-type component using the PathView element. + This example shows how to create a spinner-type component using the PathView element. \image qml-spinner-example.png */ @@ -907,9 +699,8 @@ /*! \title UI Components: Tab Widget Example \example declarative/ui-components/tabwidget - \depends helper/qmlapplicationviewer - \brief This example shows how to create a tab widget. It also demonstrates how + This example shows how to create a tab widget. It also demonstrates how \l {Property aliases}{property aliases} and \l {Introduction to the QML Language#Default Properties}{default properties} can be used to collect and assemble the child items declared within an \l Item. @@ -920,20 +711,8 @@ /*! \title XML: XMLHttpRequest Example \example declarative/xml/xmlhttprequest - \depends helper/qmlapplicationviewer - \brief This example shows how to use the \l XmlHttpRequest API in QML. + This example shows how to use the \l XmlHttpRequest API in QML. \image qml-xmlhttprequest-example.png */ - -/*! - \title Labs: Shader Effects - \example declarative/shadereffects - \depends helper/qmlapplicationviewer - - \brief This example shows how to create visual effects by using OpenGL shading language together with QML using \l ShaderEffectItem and \l ShaderEffectSource APIs. - - \image qml-shadereffects-example.png -*/ - diff --git a/doc/src/examples/qml-extending.qdoc b/src/doc/src/examples/qml-extending.qdoc index b36d6568..b36d6568 100644 --- a/doc/src/examples/qml-extending.qdoc +++ b/src/doc/src/examples/qml-extending.qdoc diff --git a/doc/src/examples/qml-flickr.qdoc b/src/doc/src/examples/qml-flickr.qdoc index 52098ada..52098ada 100644 --- a/doc/src/examples/qml-flickr.qdoc +++ b/src/doc/src/examples/qml-flickr.qdoc diff --git a/doc/src/examples/qml-folderlistmodel.qdoc b/src/doc/src/examples/qml-folderlistmodel.qdoc index 21aa6f64..21aa6f64 100644 --- a/doc/src/examples/qml-folderlistmodel.qdoc +++ b/src/doc/src/examples/qml-folderlistmodel.qdoc diff --git a/doc/src/examples/qml-minehunt.qdoc b/src/doc/src/examples/qml-minehunt.qdoc index c52f6dd5..c52f6dd5 100644 --- a/doc/src/examples/qml-minehunt.qdoc +++ b/src/doc/src/examples/qml-minehunt.qdoc diff --git a/doc/src/examples/qml-photoviewer.qdoc b/src/doc/src/examples/qml-photoviewer.qdoc index b254c35c..b254c35c 100644 --- a/doc/src/examples/qml-photoviewer.qdoc +++ b/src/doc/src/examples/qml-photoviewer.qdoc diff --git a/doc/src/examples/qml-rssnews.qdoc b/src/doc/src/examples/qml-rssnews.qdoc index fa39db5d..fa39db5d 100644 --- a/doc/src/examples/qml-rssnews.qdoc +++ b/src/doc/src/examples/qml-rssnews.qdoc diff --git a/doc/src/examples/qml-samegame.qdoc b/src/doc/src/examples/qml-samegame.qdoc index c7391911..c7391911 100644 --- a/doc/src/examples/qml-samegame.qdoc +++ b/src/doc/src/examples/qml-samegame.qdoc diff --git a/doc/src/examples/qml-snake.qdoc b/src/doc/src/examples/qml-snake.qdoc index cfa1b86f..cfa1b86f 100644 --- a/doc/src/examples/qml-snake.qdoc +++ b/src/doc/src/examples/qml-snake.qdoc diff --git a/doc/src/examples/qml-twitter.qdoc b/src/doc/src/examples/qml-twitter.qdoc index da78ac6a..da78ac6a 100644 --- a/doc/src/examples/qml-twitter.qdoc +++ b/src/doc/src/examples/qml-twitter.qdoc diff --git a/doc/src/examples/qml-webbrowser.qdoc b/src/doc/src/examples/qml-webbrowser.qdoc index 87fb73fa..87fb73fa 100644 --- a/doc/src/examples/qml-webbrowser.qdoc +++ b/src/doc/src/examples/qml-webbrowser.qdoc diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/src/doc/src/getting-started/gettingstartedqml.qdoc index 686fc906..686fc906 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/src/doc/src/getting-started/gettingstartedqml.qdoc diff --git a/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc b/src/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc index ffa013f5..ffa013f5 100644 --- a/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc +++ b/src/doc/src/howtos/qmlbestpractices/qmlbestpractices-coding.qdoc diff --git a/doc/src/howtos/qmlbestpractices/qmlbestpractices-datatypes.qdoc b/src/doc/src/howtos/qmlbestpractices/qmlbestpractices-datatypes.qdoc index 518f76e4..518f76e4 100644 --- a/doc/src/howtos/qmlbestpractices/qmlbestpractices-datatypes.qdoc +++ b/src/doc/src/howtos/qmlbestpractices/qmlbestpractices-datatypes.qdoc diff --git a/doc/src/images/declarative-anchors_example.png b/src/doc/src/images/declarative-anchors_example.png Binary files differindex 293cd4b3..293cd4b3 100644 --- a/doc/src/images/declarative-anchors_example.png +++ b/src/doc/src/images/declarative-anchors_example.png diff --git a/doc/src/images/declarative-anchors_example2.png b/src/doc/src/images/declarative-anchors_example2.png Binary files differindex 6d3be7d0..6d3be7d0 100644 --- a/doc/src/images/declarative-anchors_example2.png +++ b/src/doc/src/images/declarative-anchors_example2.png diff --git a/doc/src/images/declarative-colors.png b/src/doc/src/images/declarative-colors.png Binary files differindex f2eacd88..f2eacd88 100644 --- a/doc/src/images/declarative-colors.png +++ b/src/doc/src/images/declarative-colors.png diff --git a/doc/src/images/declarative-examples.png b/src/doc/src/images/declarative-examples.png Binary files differindex 913dfac1..913dfac1 100644 --- a/doc/src/images/declarative-examples.png +++ b/src/doc/src/images/declarative-examples.png diff --git a/doc/src/images/declarative-folderlistmodel.png b/src/doc/src/images/declarative-folderlistmodel.png Binary files differindex fbed4f84..fbed4f84 100644 --- a/doc/src/images/declarative-folderlistmodel.png +++ b/src/doc/src/images/declarative-folderlistmodel.png diff --git a/doc/src/images/declarative-image_tile.png b/src/doc/src/images/declarative-image_tile.png Binary files differindex b946a6de..b946a6de 100644 --- a/doc/src/images/declarative-image_tile.png +++ b/src/doc/src/images/declarative-image_tile.png diff --git a/doc/src/images/declarative-item_opacity1.png b/src/doc/src/images/declarative-item_opacity1.png Binary files differindex cde973be..cde973be 100644 --- a/doc/src/images/declarative-item_opacity1.png +++ b/src/doc/src/images/declarative-item_opacity1.png diff --git a/doc/src/images/declarative-item_opacity2.png b/src/doc/src/images/declarative-item_opacity2.png Binary files differindex 86273607..86273607 100644 --- a/doc/src/images/declarative-item_opacity2.png +++ b/src/doc/src/images/declarative-item_opacity2.png diff --git a/doc/src/images/declarative-item_stacking1.png b/src/doc/src/images/declarative-item_stacking1.png Binary files differindex 18f41484..18f41484 100644 --- a/doc/src/images/declarative-item_stacking1.png +++ b/src/doc/src/images/declarative-item_stacking1.png diff --git a/doc/src/images/declarative-item_stacking2.png b/src/doc/src/images/declarative-item_stacking2.png Binary files differindex 7a71bcd3..7a71bcd3 100644 --- a/doc/src/images/declarative-item_stacking2.png +++ b/src/doc/src/images/declarative-item_stacking2.png diff --git a/doc/src/images/declarative-item_stacking3.png b/src/doc/src/images/declarative-item_stacking3.png Binary files differindex cde973be..cde973be 100644 --- a/doc/src/images/declarative-item_stacking3.png +++ b/src/doc/src/images/declarative-item_stacking3.png diff --git a/doc/src/images/declarative-item_stacking4.png b/src/doc/src/images/declarative-item_stacking4.png Binary files differindex 3fdf627f..3fdf627f 100644 --- a/doc/src/images/declarative-item_stacking4.png +++ b/src/doc/src/images/declarative-item_stacking4.png diff --git a/doc/src/images/declarative-nopercent.png b/src/doc/src/images/declarative-nopercent.png Binary files differindex 28b00a91..28b00a91 100644 --- a/doc/src/images/declarative-nopercent.png +++ b/src/doc/src/images/declarative-nopercent.png diff --git a/doc/src/images/declarative-pathattribute.png b/src/doc/src/images/declarative-pathattribute.png Binary files differindex 57cd049e..57cd049e 100644 --- a/doc/src/images/declarative-pathattribute.png +++ b/src/doc/src/images/declarative-pathattribute.png diff --git a/doc/src/images/declarative-pathcubic.png b/src/doc/src/images/declarative-pathcubic.png Binary files differindex ffbca5d9..ffbca5d9 100644 --- a/doc/src/images/declarative-pathcubic.png +++ b/src/doc/src/images/declarative-pathcubic.png diff --git a/doc/src/images/declarative-pathquad.png b/src/doc/src/images/declarative-pathquad.png Binary files differindex 65f19997..65f19997 100644 --- a/doc/src/images/declarative-pathquad.png +++ b/src/doc/src/images/declarative-pathquad.png diff --git a/doc/src/images/declarative-percent.png b/src/doc/src/images/declarative-percent.png Binary files differindex c2770552..c2770552 100644 --- a/doc/src/images/declarative-percent.png +++ b/src/doc/src/images/declarative-percent.png diff --git a/doc/src/images/declarative-qmlfocus1.png b/src/doc/src/images/declarative-qmlfocus1.png Binary files differindex 317b34b1..317b34b1 100644 --- a/doc/src/images/declarative-qmlfocus1.png +++ b/src/doc/src/images/declarative-qmlfocus1.png diff --git a/doc/src/images/declarative-qmlfocus2.png b/src/doc/src/images/declarative-qmlfocus2.png Binary files differindex e3f96431..e3f96431 100644 --- a/doc/src/images/declarative-qmlfocus2.png +++ b/src/doc/src/images/declarative-qmlfocus2.png diff --git a/doc/src/images/declarative-qmlfocus3.png b/src/doc/src/images/declarative-qmlfocus3.png Binary files differindex a5897ce9..a5897ce9 100644 --- a/doc/src/images/declarative-qmlfocus3.png +++ b/src/doc/src/images/declarative-qmlfocus3.png diff --git a/doc/src/images/declarative-qmlfocus4.png b/src/doc/src/images/declarative-qmlfocus4.png Binary files differindex f2e64cdc..f2e64cdc 100644 --- a/doc/src/images/declarative-qmlfocus4.png +++ b/src/doc/src/images/declarative-qmlfocus4.png diff --git a/doc/src/images/declarative-qmlfocus5.png b/src/doc/src/images/declarative-qmlfocus5.png Binary files differindex ec7307bd..ec7307bd 100644 --- a/doc/src/images/declarative-qmlfocus5.png +++ b/src/doc/src/images/declarative-qmlfocus5.png diff --git a/doc/src/images/declarative-qtlogo-preserveaspectcrop.png b/src/doc/src/images/declarative-qtlogo-preserveaspectcrop.png Binary files differindex 64fb086f..64fb086f 100644 --- a/doc/src/images/declarative-qtlogo-preserveaspectcrop.png +++ b/src/doc/src/images/declarative-qtlogo-preserveaspectcrop.png diff --git a/doc/src/images/declarative-qtlogo-preserveaspectfit.png b/src/doc/src/images/declarative-qtlogo-preserveaspectfit.png Binary files differindex 2585fa5f..2585fa5f 100644 --- a/doc/src/images/declarative-qtlogo-preserveaspectfit.png +++ b/src/doc/src/images/declarative-qtlogo-preserveaspectfit.png diff --git a/doc/src/images/declarative-qtlogo-stretch.png b/src/doc/src/images/declarative-qtlogo-stretch.png Binary files differindex 32a0114e..32a0114e 100644 --- a/doc/src/images/declarative-qtlogo-stretch.png +++ b/src/doc/src/images/declarative-qtlogo-stretch.png diff --git a/doc/src/images/declarative-qtlogo-tile.png b/src/doc/src/images/declarative-qtlogo-tile.png Binary files differindex 7d1b9d04..7d1b9d04 100644 --- a/doc/src/images/declarative-qtlogo-tile.png +++ b/src/doc/src/images/declarative-qtlogo-tile.png diff --git a/doc/src/images/declarative-qtlogo-tilehorizontally.png b/src/doc/src/images/declarative-qtlogo-tilehorizontally.png Binary files differindex 367a8c7d..367a8c7d 100644 --- a/doc/src/images/declarative-qtlogo-tilehorizontally.png +++ b/src/doc/src/images/declarative-qtlogo-tilehorizontally.png diff --git a/doc/src/images/declarative-qtlogo-tilevertically.png b/src/doc/src/images/declarative-qtlogo-tilevertically.png Binary files differindex 68afafa8..68afafa8 100644 --- a/doc/src/images/declarative-qtlogo-tilevertically.png +++ b/src/doc/src/images/declarative-qtlogo-tilevertically.png diff --git a/doc/src/images/declarative-qtlogo.png b/src/doc/src/images/declarative-qtlogo.png Binary files differindex 940d159a..940d159a 100644 --- a/doc/src/images/declarative-qtlogo.png +++ b/src/doc/src/images/declarative-qtlogo.png diff --git a/doc/src/images/declarative-rect.png b/src/doc/src/images/declarative-rect.png Binary files differindex 173759ae..173759ae 100644 --- a/doc/src/images/declarative-rect.png +++ b/src/doc/src/images/declarative-rect.png diff --git a/doc/src/images/declarative-rect_gradient.png b/src/doc/src/images/declarative-rect_gradient.png Binary files differindex f79d579b..f79d579b 100644 --- a/doc/src/images/declarative-rect_gradient.png +++ b/src/doc/src/images/declarative-rect_gradient.png diff --git a/doc/src/images/declarative-rect_tint.png b/src/doc/src/images/declarative-rect_tint.png Binary files differindex 3a440137..3a440137 100644 --- a/doc/src/images/declarative-rect_tint.png +++ b/src/doc/src/images/declarative-rect_tint.png diff --git a/doc/src/images/declarative-removebutton-close.png b/src/doc/src/images/declarative-removebutton-close.png Binary files differindex d73f8e18..d73f8e18 100644 --- a/doc/src/images/declarative-removebutton-close.png +++ b/src/doc/src/images/declarative-removebutton-close.png diff --git a/doc/src/images/declarative-removebutton-open.png b/src/doc/src/images/declarative-removebutton-open.png Binary files differindex b54d797d..b54d797d 100644 --- a/doc/src/images/declarative-removebutton-open.png +++ b/src/doc/src/images/declarative-removebutton-open.png diff --git a/doc/src/images/declarative-removebutton.gif b/src/doc/src/images/declarative-removebutton.gif Binary files differindex ca4d7e6b..ca4d7e6b 100644 --- a/doc/src/images/declarative-removebutton.gif +++ b/src/doc/src/images/declarative-removebutton.gif diff --git a/doc/src/images/declarative-removebutton.png b/src/doc/src/images/declarative-removebutton.png Binary files differindex f783e6ab..f783e6ab 100644 --- a/doc/src/images/declarative-removebutton.png +++ b/src/doc/src/images/declarative-removebutton.png diff --git a/doc/src/images/declarative-reuse-1.png b/src/doc/src/images/declarative-reuse-1.png Binary files differindex c7044573..c7044573 100644 --- a/doc/src/images/declarative-reuse-1.png +++ b/src/doc/src/images/declarative-reuse-1.png diff --git a/doc/src/images/declarative-reuse-2.png b/src/doc/src/images/declarative-reuse-2.png Binary files differindex 0b6006b8..0b6006b8 100644 --- a/doc/src/images/declarative-reuse-2.png +++ b/src/doc/src/images/declarative-reuse-2.png diff --git a/doc/src/images/declarative-reuse-3.png b/src/doc/src/images/declarative-reuse-3.png Binary files differindex 695a7253..695a7253 100644 --- a/doc/src/images/declarative-reuse-3.png +++ b/src/doc/src/images/declarative-reuse-3.png diff --git a/doc/src/images/declarative-reuse-bluerect.png b/src/doc/src/images/declarative-reuse-bluerect.png Binary files differindex 97dbb5f5..97dbb5f5 100644 --- a/doc/src/images/declarative-reuse-bluerect.png +++ b/src/doc/src/images/declarative-reuse-bluerect.png diff --git a/doc/src/images/declarative-reuse-focus.png b/src/doc/src/images/declarative-reuse-focus.png Binary files differindex f91d374e..f91d374e 100644 --- a/doc/src/images/declarative-reuse-focus.png +++ b/src/doc/src/images/declarative-reuse-focus.png diff --git a/doc/src/images/declarative-rotation.png b/src/doc/src/images/declarative-rotation.png Binary files differindex b4031f5a..b4031f5a 100644 --- a/doc/src/images/declarative-rotation.png +++ b/src/doc/src/images/declarative-rotation.png diff --git a/doc/src/images/declarative-roundrect.png b/src/doc/src/images/declarative-roundrect.png Binary files differindex 607da81d..607da81d 100644 --- a/doc/src/images/declarative-roundrect.png +++ b/src/doc/src/images/declarative-roundrect.png diff --git a/doc/src/images/declarative-samegame.png b/src/doc/src/images/declarative-samegame.png Binary files differindex 2232df20..2232df20 100644 --- a/doc/src/images/declarative-samegame.png +++ b/src/doc/src/images/declarative-samegame.png diff --git a/doc/src/images/declarative-scale.png b/src/doc/src/images/declarative-scale.png Binary files differindex bab729e2..bab729e2 100644 --- a/doc/src/images/declarative-scale.png +++ b/src/doc/src/images/declarative-scale.png diff --git a/doc/src/images/declarative-scalegrid.png b/src/doc/src/images/declarative-scalegrid.png Binary files differindex 32d87125..32d87125 100644 --- a/doc/src/images/declarative-scalegrid.png +++ b/src/doc/src/images/declarative-scalegrid.png diff --git a/doc/src/images/declarative-text.png b/src/doc/src/images/declarative-text.png Binary files differindex c1a41125..c1a41125 100644 --- a/doc/src/images/declarative-text.png +++ b/src/doc/src/images/declarative-text.png diff --git a/doc/src/images/declarative-textedit.gif b/src/doc/src/images/declarative-textedit.gif Binary files differindex 7186eb9f..7186eb9f 100644 --- a/doc/src/images/declarative-textedit.gif +++ b/src/doc/src/images/declarative-textedit.gif diff --git a/doc/src/images/declarative-textformat.png b/src/doc/src/images/declarative-textformat.png Binary files differindex ade1b454..ade1b454 100644 --- a/doc/src/images/declarative-textformat.png +++ b/src/doc/src/images/declarative-textformat.png diff --git a/doc/src/images/declarative-textstyle.png b/src/doc/src/images/declarative-textstyle.png Binary files differindex 858c1bcb..858c1bcb 100644 --- a/doc/src/images/declarative-textstyle.png +++ b/src/doc/src/images/declarative-textstyle.png diff --git a/doc/src/images/declarative-transformorigin.png b/src/doc/src/images/declarative-transformorigin.png Binary files differindex 4af320fb..4af320fb 100644 --- a/doc/src/images/declarative-transformorigin.png +++ b/src/doc/src/images/declarative-transformorigin.png diff --git a/doc/src/images/declarative-tutorial-list-closed.png b/src/doc/src/images/declarative-tutorial-list-closed.png Binary files differindex 4a0fee9f..4a0fee9f 100644 --- a/doc/src/images/declarative-tutorial-list-closed.png +++ b/src/doc/src/images/declarative-tutorial-list-closed.png diff --git a/doc/src/images/declarative-tutorial-list-open.png b/src/doc/src/images/declarative-tutorial-list-open.png Binary files differindex 16a9c94b..16a9c94b 100644 --- a/doc/src/images/declarative-tutorial-list-open.png +++ b/src/doc/src/images/declarative-tutorial-list-open.png diff --git a/doc/src/images/declarative-tutorial-list.png b/src/doc/src/images/declarative-tutorial-list.png Binary files differindex 723fe2fa..723fe2fa 100644 --- a/doc/src/images/declarative-tutorial-list.png +++ b/src/doc/src/images/declarative-tutorial-list.png diff --git a/doc/src/images/declarative-tutorial1.png b/src/doc/src/images/declarative-tutorial1.png Binary files differindex c9d3844c..c9d3844c 100644 --- a/doc/src/images/declarative-tutorial1.png +++ b/src/doc/src/images/declarative-tutorial1.png diff --git a/doc/src/images/declarative-tutorial2.png b/src/doc/src/images/declarative-tutorial2.png Binary files differindex 835484aa..835484aa 100644 --- a/doc/src/images/declarative-tutorial2.png +++ b/src/doc/src/images/declarative-tutorial2.png diff --git a/doc/src/images/declarative-tutorial3.gif b/src/doc/src/images/declarative-tutorial3.gif Binary files differindex e2eae81b..e2eae81b 100644 --- a/doc/src/images/declarative-tutorial3.gif +++ b/src/doc/src/images/declarative-tutorial3.gif diff --git a/doc/src/images/declarative-tutorial3_animation.gif b/src/doc/src/images/declarative-tutorial3_animation.gif Binary files differindex 80b78dea..80b78dea 100644 --- a/doc/src/images/declarative-tutorial3_animation.gif +++ b/src/doc/src/images/declarative-tutorial3_animation.gif diff --git a/doc/src/images/qml-abstractitemmodel-example.png b/src/doc/src/images/qml-abstractitemmodel-example.png Binary files differindex 1d7ff197..1d7ff197 100644 --- a/doc/src/images/qml-abstractitemmodel-example.png +++ b/src/doc/src/images/qml-abstractitemmodel-example.png diff --git a/doc/src/images/qml-behaviors-example.png b/src/doc/src/images/qml-behaviors-example.png Binary files differindex aee5c2bc..aee5c2bc 100644 --- a/doc/src/images/qml-behaviors-example.png +++ b/src/doc/src/images/qml-behaviors-example.png diff --git a/doc/src/images/qml-borderimage-example.png b/src/doc/src/images/qml-borderimage-example.png Binary files differindex 7e488f2c..7e488f2c 100644 --- a/doc/src/images/qml-borderimage-example.png +++ b/src/doc/src/images/qml-borderimage-example.png diff --git a/doc/src/images/qml-borderimage-normal-image.png b/src/doc/src/images/qml-borderimage-normal-image.png Binary files differindex ae7460a7..ae7460a7 100644 --- a/doc/src/images/qml-borderimage-normal-image.png +++ b/src/doc/src/images/qml-borderimage-normal-image.png diff --git a/doc/src/images/qml-borderimage-scaled.png b/src/doc/src/images/qml-borderimage-scaled.png Binary files differindex 8035c79f..8035c79f 100644 --- a/doc/src/images/qml-borderimage-scaled.png +++ b/src/doc/src/images/qml-borderimage-scaled.png diff --git a/doc/src/images/qml-borderimage-shadows-example.png b/src/doc/src/images/qml-borderimage-shadows-example.png Binary files differindex 47008681..47008681 100644 --- a/doc/src/images/qml-borderimage-shadows-example.png +++ b/src/doc/src/images/qml-borderimage-shadows-example.png diff --git a/doc/src/images/qml-borderimage-tiled.png b/src/doc/src/images/qml-borderimage-tiled.png Binary files differindex 14883d0d..14883d0d 100644 --- a/doc/src/images/qml-borderimage-tiled.png +++ b/src/doc/src/images/qml-borderimage-tiled.png diff --git a/doc/src/images/qml-calculator-example-small.png b/src/doc/src/images/qml-calculator-example-small.png Binary files differindex 9e0370f4..9e0370f4 100644 --- a/doc/src/images/qml-calculator-example-small.png +++ b/src/doc/src/images/qml-calculator-example-small.png diff --git a/src/doc/src/images/qml-calculator-example.png b/src/doc/src/images/qml-calculator-example.png Binary files differnew file mode 100644 index 00000000..0f9ced80 --- /dev/null +++ b/src/doc/src/images/qml-calculator-example.png diff --git a/doc/src/images/qml-clocks-example.png b/src/doc/src/images/qml-clocks-example.png Binary files differindex 1b352b58..1b352b58 100644 --- a/doc/src/images/qml-clocks-example.png +++ b/src/doc/src/images/qml-clocks-example.png diff --git a/doc/src/images/qml-coloranim-example.png b/src/doc/src/images/qml-coloranim-example.png Binary files differindex 12edc998..12edc998 100644 --- a/doc/src/images/qml-coloranim-example.png +++ b/src/doc/src/images/qml-coloranim-example.png diff --git a/doc/src/images/qml-column.png b/src/doc/src/images/qml-column.png Binary files differindex c589ad82..c589ad82 100644 --- a/doc/src/images/qml-column.png +++ b/src/doc/src/images/qml-column.png diff --git a/doc/src/images/qml-corkboards-example.png b/src/doc/src/images/qml-corkboards-example.png Binary files differindex 8acffa7b..8acffa7b 100644 --- a/doc/src/images/qml-corkboards-example.png +++ b/src/doc/src/images/qml-corkboards-example.png diff --git a/doc/src/images/qml-dialcontrol-example.png b/src/doc/src/images/qml-dialcontrol-example.png Binary files differindex 74cd645d..74cd645d 100644 --- a/doc/src/images/qml-dialcontrol-example.png +++ b/src/doc/src/images/qml-dialcontrol-example.png diff --git a/doc/src/images/qml-dynamicscene-example.png b/src/doc/src/images/qml-dynamicscene-example.png Binary files differindex 4179ebec..4179ebec 100644 --- a/doc/src/images/qml-dynamicscene-example.png +++ b/src/doc/src/images/qml-dynamicscene-example.png diff --git a/doc/src/images/qml-easing-example.png b/src/doc/src/images/qml-easing-example.png Binary files differindex fef5b706..fef5b706 100644 --- a/doc/src/images/qml-easing-example.png +++ b/src/doc/src/images/qml-easing-example.png diff --git a/doc/src/images/qml-flickr-demo-small.png b/src/doc/src/images/qml-flickr-demo-small.png Binary files differindex 370ffcf8..370ffcf8 100644 --- a/doc/src/images/qml-flickr-demo-small.png +++ b/src/doc/src/images/qml-flickr-demo-small.png diff --git a/doc/src/images/qml-flickr-demo.png b/src/doc/src/images/qml-flickr-demo.png Binary files differindex 71ea5679..71ea5679 100644 --- a/doc/src/images/qml-flickr-demo.png +++ b/src/doc/src/images/qml-flickr-demo.png diff --git a/doc/src/images/qml-flipable-example.png b/src/doc/src/images/qml-flipable-example.png Binary files differindex dd68a66c..dd68a66c 100644 --- a/doc/src/images/qml-flipable-example.png +++ b/src/doc/src/images/qml-flipable-example.png diff --git a/doc/src/images/qml-flow-snippet.png b/src/doc/src/images/qml-flow-snippet.png Binary files differindex af873d1b..af873d1b 100644 --- a/doc/src/images/qml-flow-snippet.png +++ b/src/doc/src/images/qml-flow-snippet.png diff --git a/doc/src/images/qml-flow-text1.png b/src/doc/src/images/qml-flow-text1.png Binary files differindex 99ce7523..99ce7523 100644 --- a/doc/src/images/qml-flow-text1.png +++ b/src/doc/src/images/qml-flow-text1.png diff --git a/doc/src/images/qml-flow-text2.png b/src/doc/src/images/qml-flow-text2.png Binary files differindex 844e0def..844e0def 100644 --- a/doc/src/images/qml-flow-text2.png +++ b/src/doc/src/images/qml-flow-text2.png diff --git a/doc/src/images/qml-focus-example.png b/src/doc/src/images/qml-focus-example.png Binary files differindex 107d2cb3..107d2cb3 100644 --- a/doc/src/images/qml-focus-example.png +++ b/src/doc/src/images/qml-focus-example.png diff --git a/doc/src/images/qml-fonts-availableFonts-example.png b/src/doc/src/images/qml-fonts-availableFonts-example.png Binary files differindex 4d8440ce..4d8440ce 100644 --- a/doc/src/images/qml-fonts-availableFonts-example.png +++ b/src/doc/src/images/qml-fonts-availableFonts-example.png diff --git a/doc/src/images/qml-fonts-banner-example.png b/src/doc/src/images/qml-fonts-banner-example.png Binary files differindex b415161c..b415161c 100644 --- a/doc/src/images/qml-fonts-banner-example.png +++ b/src/doc/src/images/qml-fonts-banner-example.png diff --git a/doc/src/images/qml-fonts-fonts-example.png b/src/doc/src/images/qml-fonts-fonts-example.png Binary files differindex 4481397f..4481397f 100644 --- a/doc/src/images/qml-fonts-fonts-example.png +++ b/src/doc/src/images/qml-fonts-fonts-example.png diff --git a/doc/src/images/qml-fonts-hello-example.png b/src/doc/src/images/qml-fonts-hello-example.png Binary files differindex 18da8673..18da8673 100644 --- a/doc/src/images/qml-fonts-hello-example.png +++ b/src/doc/src/images/qml-fonts-hello-example.png diff --git a/doc/src/images/qml-grid-no-spacing.png b/src/doc/src/images/qml-grid-no-spacing.png Binary files differindex c2092e0b..c2092e0b 100644 --- a/doc/src/images/qml-grid-no-spacing.png +++ b/src/doc/src/images/qml-grid-no-spacing.png diff --git a/doc/src/images/qml-grid-spacing.png b/src/doc/src/images/qml-grid-spacing.png Binary files differindex 1083bee5..1083bee5 100644 --- a/doc/src/images/qml-grid-spacing.png +++ b/src/doc/src/images/qml-grid-spacing.png diff --git a/doc/src/images/qml-gridview-example.png b/src/doc/src/images/qml-gridview-example.png Binary files differindex 8a092b5b..8a092b5b 100644 --- a/doc/src/images/qml-gridview-example.png +++ b/src/doc/src/images/qml-gridview-example.png diff --git a/doc/src/images/qml-guitartuner-example.png b/src/doc/src/images/qml-guitartuner-example.png Binary files differindex 2f13e8d9..2f13e8d9 100644 --- a/doc/src/images/qml-guitartuner-example.png +++ b/src/doc/src/images/qml-guitartuner-example.png diff --git a/doc/src/images/qml-i18n-example.png b/src/doc/src/images/qml-i18n-example.png Binary files differindex 8e734ea3..8e734ea3 100644 --- a/doc/src/images/qml-i18n-example.png +++ b/src/doc/src/images/qml-i18n-example.png diff --git a/doc/src/images/qml-image-example.png b/src/doc/src/images/qml-image-example.png Binary files differindex 8d9846f8..8d9846f8 100644 --- a/doc/src/images/qml-image-example.png +++ b/src/doc/src/images/qml-image-example.png diff --git a/doc/src/images/qml-imageprovider-example.png b/src/doc/src/images/qml-imageprovider-example.png Binary files differindex e82548ae..e82548ae 100644 --- a/doc/src/images/qml-imageprovider-example.png +++ b/src/doc/src/images/qml-imageprovider-example.png diff --git a/doc/src/images/qml-layoutitem-example.png b/src/doc/src/images/qml-layoutitem-example.png Binary files differindex b3c778ad..b3c778ad 100644 --- a/doc/src/images/qml-layoutitem-example.png +++ b/src/doc/src/images/qml-layoutitem-example.png diff --git a/doc/src/images/qml-listview-dynamiclist-example.png b/src/doc/src/images/qml-listview-dynamiclist-example.png Binary files differindex 6acc3d98..6acc3d98 100644 --- a/doc/src/images/qml-listview-dynamiclist-example.png +++ b/src/doc/src/images/qml-listview-dynamiclist-example.png diff --git a/doc/src/images/qml-listview-expandingdelegates-example.png b/src/doc/src/images/qml-listview-expandingdelegates-example.png Binary files differindex e7ffc335..e7ffc335 100644 --- a/doc/src/images/qml-listview-expandingdelegates-example.png +++ b/src/doc/src/images/qml-listview-expandingdelegates-example.png diff --git a/doc/src/images/qml-listview-highlight-example.png b/src/doc/src/images/qml-listview-highlight-example.png Binary files differindex 4f95c136..4f95c136 100644 --- a/doc/src/images/qml-listview-highlight-example.png +++ b/src/doc/src/images/qml-listview-highlight-example.png diff --git a/doc/src/images/qml-listview-highlightranges-example.png b/src/doc/src/images/qml-listview-highlightranges-example.png Binary files differindex f499caa8..f499caa8 100644 --- a/doc/src/images/qml-listview-highlightranges-example.png +++ b/src/doc/src/images/qml-listview-highlightranges-example.png diff --git a/doc/src/images/qml-listview-sections-example.png b/src/doc/src/images/qml-listview-sections-example.png Binary files differindex 4e8f0768..4e8f0768 100644 --- a/doc/src/images/qml-listview-sections-example.png +++ b/src/doc/src/images/qml-listview-sections-example.png diff --git a/doc/src/images/qml-listview-snippet.png b/src/doc/src/images/qml-listview-snippet.png Binary files differindex 0ee0ffcd..0ee0ffcd 100644 --- a/doc/src/images/qml-listview-snippet.png +++ b/src/doc/src/images/qml-listview-snippet.png diff --git a/doc/src/images/qml-minehunt-demo-small.png b/src/doc/src/images/qml-minehunt-demo-small.png Binary files differindex e5badac8..e5badac8 100644 --- a/doc/src/images/qml-minehunt-demo-small.png +++ b/src/doc/src/images/qml-minehunt-demo-small.png diff --git a/src/doc/src/images/qml-minehunt-demo.png b/src/doc/src/images/qml-minehunt-demo.png Binary files differnew file mode 100644 index 00000000..3b695693 --- /dev/null +++ b/src/doc/src/images/qml-minehunt-demo.png diff --git a/doc/src/images/qml-mousearea-example.png b/src/doc/src/images/qml-mousearea-example.png Binary files differindex c0eef7f9..c0eef7f9 100644 --- a/doc/src/images/qml-mousearea-example.png +++ b/src/doc/src/images/qml-mousearea-example.png diff --git a/doc/src/images/qml-mousearea-snippet.png b/src/doc/src/images/qml-mousearea-snippet.png Binary files differindex 15229446..15229446 100644 --- a/doc/src/images/qml-mousearea-snippet.png +++ b/src/doc/src/images/qml-mousearea-snippet.png diff --git a/doc/src/images/qml-objectlistmodel-example.png b/src/doc/src/images/qml-objectlistmodel-example.png Binary files differindex c0fc490c..c0fc490c 100644 --- a/doc/src/images/qml-objectlistmodel-example.png +++ b/src/doc/src/images/qml-objectlistmodel-example.png diff --git a/doc/src/images/qml-package-example.png b/src/doc/src/images/qml-package-example.png Binary files differindex f7749aa5..f7749aa5 100644 --- a/doc/src/images/qml-package-example.png +++ b/src/doc/src/images/qml-package-example.png diff --git a/doc/src/images/qml-parallax-example.png b/src/doc/src/images/qml-parallax-example.png Binary files differindex 2df52ed2..2df52ed2 100644 --- a/doc/src/images/qml-parallax-example.png +++ b/src/doc/src/images/qml-parallax-example.png diff --git a/doc/src/images/qml-pathview-example.png b/src/doc/src/images/qml-pathview-example.png Binary files differindex c874c5c1..c874c5c1 100644 --- a/doc/src/images/qml-pathview-example.png +++ b/src/doc/src/images/qml-pathview-example.png diff --git a/doc/src/images/qml-photoviewer-demo-small.png b/src/doc/src/images/qml-photoviewer-demo-small.png Binary files differindex b16fb4e5..b16fb4e5 100644 --- a/doc/src/images/qml-photoviewer-demo-small.png +++ b/src/doc/src/images/qml-photoviewer-demo-small.png diff --git a/src/doc/src/images/qml-photoviewer-demo.png b/src/doc/src/images/qml-photoviewer-demo.png Binary files differnew file mode 100644 index 00000000..be6f1bf1 --- /dev/null +++ b/src/doc/src/images/qml-photoviewer-demo.png diff --git a/doc/src/images/qml-plugins-example.png b/src/doc/src/images/qml-plugins-example.png Binary files differindex c2d4886e..c2d4886e 100644 --- a/doc/src/images/qml-plugins-example.png +++ b/src/doc/src/images/qml-plugins-example.png diff --git a/doc/src/images/qml-positioners-example.png b/src/doc/src/images/qml-positioners-example.png Binary files differindex 721c1b34..721c1b34 100644 --- a/doc/src/images/qml-positioners-example.png +++ b/src/doc/src/images/qml-positioners-example.png diff --git a/doc/src/images/qml-positioners-layoutdirection-example.png b/src/doc/src/images/qml-positioners-layoutdirection-example.png Binary files differindex 2c42b094..2c42b094 100644 --- a/doc/src/images/qml-positioners-layoutdirection-example.png +++ b/src/doc/src/images/qml-positioners-layoutdirection-example.png diff --git a/doc/src/images/qml-progressbar-example.png b/src/doc/src/images/qml-progressbar-example.png Binary files differindex 3ddd6c64..3ddd6c64 100644 --- a/doc/src/images/qml-progressbar-example.png +++ b/src/doc/src/images/qml-progressbar-example.png diff --git a/doc/src/images/qml-propertyanim-example.png b/src/doc/src/images/qml-propertyanim-example.png Binary files differindex 46efc641..46efc641 100644 --- a/doc/src/images/qml-propertyanim-example.png +++ b/src/doc/src/images/qml-propertyanim-example.png diff --git a/doc/src/images/qml-qgraphicsgridlayout-example.png b/src/doc/src/images/qml-qgraphicsgridlayout-example.png Binary files differindex 1a3bd47b..1a3bd47b 100644 --- a/doc/src/images/qml-qgraphicsgridlayout-example.png +++ b/src/doc/src/images/qml-qgraphicsgridlayout-example.png diff --git a/doc/src/images/qml-qgraphicslinearlayout-example.png b/src/doc/src/images/qml-qgraphicslinearlayout-example.png Binary files differindex 3964f5b9..3964f5b9 100644 --- a/doc/src/images/qml-qgraphicslinearlayout-example.png +++ b/src/doc/src/images/qml-qgraphicslinearlayout-example.png diff --git a/doc/src/images/qml-qtbubblelevel-demo.png b/src/doc/src/images/qml-qtbubblelevel-demo.png Binary files differindex 9d5bc4b0..9d5bc4b0 100644 --- a/doc/src/images/qml-qtbubblelevel-demo.png +++ b/src/doc/src/images/qml-qtbubblelevel-demo.png diff --git a/doc/src/images/qml-qwidgets-example.png b/src/doc/src/images/qml-qwidgets-example.png Binary files differindex 262b3dfa..262b3dfa 100644 --- a/doc/src/images/qml-qwidgets-example.png +++ b/src/doc/src/images/qml-qwidgets-example.png diff --git a/doc/src/images/qml-repeater-grid-index.png b/src/doc/src/images/qml-repeater-grid-index.png Binary files differindex 44aed24f..44aed24f 100644 --- a/doc/src/images/qml-repeater-grid-index.png +++ b/src/doc/src/images/qml-repeater-grid-index.png diff --git a/doc/src/images/qml-righttoleft-layoutdirection-example.png b/src/doc/src/images/qml-righttoleft-layoutdirection-example.png Binary files differindex 381ecd71..381ecd71 100644 --- a/doc/src/images/qml-righttoleft-layoutdirection-example.png +++ b/src/doc/src/images/qml-righttoleft-layoutdirection-example.png diff --git a/doc/src/images/qml-righttoleft-layoutmirroring-example.png b/src/doc/src/images/qml-righttoleft-layoutmirroring-example.png Binary files differindex 992c8763..992c8763 100644 --- a/doc/src/images/qml-righttoleft-layoutmirroring-example.png +++ b/src/doc/src/images/qml-righttoleft-layoutmirroring-example.png diff --git a/doc/src/images/qml-row.png b/src/doc/src/images/qml-row.png Binary files differindex 30d9caad..30d9caad 100644 --- a/doc/src/images/qml-row.png +++ b/src/doc/src/images/qml-row.png diff --git a/doc/src/images/qml-rssnews-demo-small.png b/src/doc/src/images/qml-rssnews-demo-small.png Binary files differindex 451a4206..451a4206 100644 --- a/doc/src/images/qml-rssnews-demo-small.png +++ b/src/doc/src/images/qml-rssnews-demo-small.png diff --git a/src/doc/src/images/qml-rssnews-demo.png b/src/doc/src/images/qml-rssnews-demo.png Binary files differnew file mode 100644 index 00000000..b4143b46 --- /dev/null +++ b/src/doc/src/images/qml-rssnews-demo.png diff --git a/doc/src/images/qml-samegame-demo-small.png b/src/doc/src/images/qml-samegame-demo-small.png Binary files differindex ec9ad769..ec9ad769 100644 --- a/doc/src/images/qml-samegame-demo-small.png +++ b/src/doc/src/images/qml-samegame-demo-small.png diff --git a/src/doc/src/images/qml-samegame-demo.png b/src/doc/src/images/qml-samegame-demo.png Binary files differnew file mode 100644 index 00000000..945f2b96 --- /dev/null +++ b/src/doc/src/images/qml-samegame-demo.png diff --git a/doc/src/images/qml-scrollbar-example.png b/src/doc/src/images/qml-scrollbar-example.png Binary files differindex 4cf7c2cb..4cf7c2cb 100644 --- a/doc/src/images/qml-scrollbar-example.png +++ b/src/doc/src/images/qml-scrollbar-example.png diff --git a/doc/src/images/qml-searchbox-example.png b/src/doc/src/images/qml-searchbox-example.png Binary files differindex 97d12bba..97d12bba 100644 --- a/doc/src/images/qml-searchbox-example.png +++ b/src/doc/src/images/qml-searchbox-example.png diff --git a/doc/src/images/qml-shadereffects-example.png b/src/doc/src/images/qml-shadereffects-example.png Binary files differindex 9649fe1f..9649fe1f 100644 --- a/doc/src/images/qml-shadereffects-example.png +++ b/src/doc/src/images/qml-shadereffects-example.png diff --git a/doc/src/images/qml-slideswitch-example.png b/src/doc/src/images/qml-slideswitch-example.png Binary files differindex 17cb3eb3..17cb3eb3 100644 --- a/doc/src/images/qml-slideswitch-example.png +++ b/src/doc/src/images/qml-slideswitch-example.png diff --git a/doc/src/images/qml-snake-demo-small.png b/src/doc/src/images/qml-snake-demo-small.png Binary files differindex 23a7b3b3..23a7b3b3 100644 --- a/doc/src/images/qml-snake-demo-small.png +++ b/src/doc/src/images/qml-snake-demo-small.png diff --git a/src/doc/src/images/qml-snake-demo.png b/src/doc/src/images/qml-snake-demo.png Binary files differnew file mode 100644 index 00000000..d3c077d1 --- /dev/null +++ b/src/doc/src/images/qml-snake-demo.png diff --git a/doc/src/images/qml-spinner-example.png b/src/doc/src/images/qml-spinner-example.png Binary files differindex ed381f8a..ed381f8a 100644 --- a/doc/src/images/qml-spinner-example.png +++ b/src/doc/src/images/qml-spinner-example.png diff --git a/doc/src/images/qml-states-example.png b/src/doc/src/images/qml-states-example.png Binary files differindex 30514ecc..30514ecc 100644 --- a/doc/src/images/qml-states-example.png +++ b/src/doc/src/images/qml-states-example.png diff --git a/doc/src/images/qml-stringlistmodel-example.png b/src/doc/src/images/qml-stringlistmodel-example.png Binary files differindex c8c888b6..c8c888b6 100644 --- a/doc/src/images/qml-stringlistmodel-example.png +++ b/src/doc/src/images/qml-stringlistmodel-example.png diff --git a/doc/src/images/qml-tabwidget-example.png b/src/doc/src/images/qml-tabwidget-example.png Binary files differindex 847052d3..847052d3 100644 --- a/doc/src/images/qml-tabwidget-example.png +++ b/src/doc/src/images/qml-tabwidget-example.png diff --git a/src/doc/src/images/qml-texteditor1_button.png b/src/doc/src/images/qml-texteditor1_button.png Binary files differnew file mode 100644 index 00000000..aab64bcf --- /dev/null +++ b/src/doc/src/images/qml-texteditor1_button.png diff --git a/doc/src/images/qml-texteditor1_editmenu.png b/src/doc/src/images/qml-texteditor1_editmenu.png Binary files differindex af8028ba..af8028ba 100644 --- a/doc/src/images/qml-texteditor1_editmenu.png +++ b/src/doc/src/images/qml-texteditor1_editmenu.png diff --git a/doc/src/images/qml-texteditor1_filemenu.png b/src/doc/src/images/qml-texteditor1_filemenu.png Binary files differindex ccc008c5..ccc008c5 100644 --- a/doc/src/images/qml-texteditor1_filemenu.png +++ b/src/doc/src/images/qml-texteditor1_filemenu.png diff --git a/src/doc/src/images/qml-texteditor1_simplebutton.png b/src/doc/src/images/qml-texteditor1_simplebutton.png Binary files differnew file mode 100644 index 00000000..21ce5092 --- /dev/null +++ b/src/doc/src/images/qml-texteditor1_simplebutton.png diff --git a/doc/src/images/qml-texteditor2_menubar.png b/src/doc/src/images/qml-texteditor2_menubar.png Binary files differindex 691a833e..691a833e 100644 --- a/doc/src/images/qml-texteditor2_menubar.png +++ b/src/doc/src/images/qml-texteditor2_menubar.png diff --git a/doc/src/images/qml-texteditor3_textarea.png b/src/doc/src/images/qml-texteditor3_textarea.png Binary files differindex 95abcd60..95abcd60 100644 --- a/doc/src/images/qml-texteditor3_textarea.png +++ b/src/doc/src/images/qml-texteditor3_textarea.png diff --git a/doc/src/images/qml-texteditor3_texteditor.png b/src/doc/src/images/qml-texteditor3_texteditor.png Binary files differindex bdf69573..bdf69573 100644 --- a/doc/src/images/qml-texteditor3_texteditor.png +++ b/src/doc/src/images/qml-texteditor3_texteditor.png diff --git a/doc/src/images/qml-texteditor4_texteditor.png b/src/doc/src/images/qml-texteditor4_texteditor.png Binary files differindex 85d216bf..85d216bf 100644 --- a/doc/src/images/qml-texteditor4_texteditor.png +++ b/src/doc/src/images/qml-texteditor4_texteditor.png diff --git a/doc/src/images/qml-texteditor5_editmenu.png b/src/doc/src/images/qml-texteditor5_editmenu.png Binary files differindex 7365690a..7365690a 100644 --- a/doc/src/images/qml-texteditor5_editmenu.png +++ b/src/doc/src/images/qml-texteditor5_editmenu.png diff --git a/doc/src/images/qml-texteditor5_filemenu.png b/src/doc/src/images/qml-texteditor5_filemenu.png Binary files differindex 70780227..70780227 100644 --- a/doc/src/images/qml-texteditor5_filemenu.png +++ b/src/doc/src/images/qml-texteditor5_filemenu.png diff --git a/doc/src/images/qml-texteditor5_newfile.png b/src/doc/src/images/qml-texteditor5_newfile.png Binary files differindex e4939416..e4939416 100644 --- a/doc/src/images/qml-texteditor5_newfile.png +++ b/src/doc/src/images/qml-texteditor5_newfile.png diff --git a/doc/src/images/qml-textselection-example.png b/src/doc/src/images/qml-textselection-example.png Binary files differindex 284ef535..284ef535 100644 --- a/doc/src/images/qml-textselection-example.png +++ b/src/doc/src/images/qml-textselection-example.png diff --git a/doc/src/images/qml-tic-tac-toe-example.png b/src/doc/src/images/qml-tic-tac-toe-example.png Binary files differindex 5a5cc826..5a5cc826 100644 --- a/doc/src/images/qml-tic-tac-toe-example.png +++ b/src/doc/src/images/qml-tic-tac-toe-example.png diff --git a/doc/src/images/qml-transitions-example.png b/src/doc/src/images/qml-transitions-example.png Binary files differindex 8656bfe1..8656bfe1 100644 --- a/doc/src/images/qml-transitions-example.png +++ b/src/doc/src/images/qml-transitions-example.png diff --git a/doc/src/images/qml-tvtennis-example.png b/src/doc/src/images/qml-tvtennis-example.png Binary files differindex 1a380342..1a380342 100644 --- a/doc/src/images/qml-tvtennis-example.png +++ b/src/doc/src/images/qml-tvtennis-example.png diff --git a/doc/src/images/qml-twitter-demo-small.png b/src/doc/src/images/qml-twitter-demo-small.png Binary files differindex b55cebab..b55cebab 100644 --- a/doc/src/images/qml-twitter-demo-small.png +++ b/src/doc/src/images/qml-twitter-demo-small.png diff --git a/src/doc/src/images/qml-twitter-demo.png b/src/doc/src/images/qml-twitter-demo.png Binary files differnew file mode 100644 index 00000000..63d6486a --- /dev/null +++ b/src/doc/src/images/qml-twitter-demo.png diff --git a/doc/src/images/qml-visualitemmodel-example.png b/src/doc/src/images/qml-visualitemmodel-example.png Binary files differindex c716a59c..c716a59c 100644 --- a/doc/src/images/qml-visualitemmodel-example.png +++ b/src/doc/src/images/qml-visualitemmodel-example.png diff --git a/doc/src/images/qml-webbrowser-demo-small.png b/src/doc/src/images/qml-webbrowser-demo-small.png Binary files differindex 6c5d57d5..6c5d57d5 100644 --- a/doc/src/images/qml-webbrowser-demo-small.png +++ b/src/doc/src/images/qml-webbrowser-demo-small.png diff --git a/doc/src/images/qml-webbrowser-demo.png b/src/doc/src/images/qml-webbrowser-demo.png Binary files differindex 9ff471eb..9ff471eb 100644 --- a/doc/src/images/qml-webbrowser-demo.png +++ b/src/doc/src/images/qml-webbrowser-demo.png diff --git a/doc/src/images/qml-webview-alert-example.png b/src/doc/src/images/qml-webview-alert-example.png Binary files differindex c1cddce4..c1cddce4 100644 --- a/doc/src/images/qml-webview-alert-example.png +++ b/src/doc/src/images/qml-webview-alert-example.png diff --git a/doc/src/images/qml-webview-autosize-example.png b/src/doc/src/images/qml-webview-autosize-example.png Binary files differindex 5cec6141..5cec6141 100644 --- a/doc/src/images/qml-webview-autosize-example.png +++ b/src/doc/src/images/qml-webview-autosize-example.png diff --git a/doc/src/images/qml-webview-googlemaps-example.png b/src/doc/src/images/qml-webview-googlemaps-example.png Binary files differindex d6c77a19..d6c77a19 100644 --- a/doc/src/images/qml-webview-googlemaps-example.png +++ b/src/doc/src/images/qml-webview-googlemaps-example.png diff --git a/doc/src/images/qml-webview-inlinehtml-example.png b/src/doc/src/images/qml-webview-inlinehtml-example.png Binary files differindex 426cf8ae..426cf8ae 100644 --- a/doc/src/images/qml-webview-inlinehtml-example.png +++ b/src/doc/src/images/qml-webview-inlinehtml-example.png diff --git a/doc/src/images/qml-webview-newwindows-example.png b/src/doc/src/images/qml-webview-newwindows-example.png Binary files differindex bd98b574..bd98b574 100644 --- a/doc/src/images/qml-webview-newwindows-example.png +++ b/src/doc/src/images/qml-webview-newwindows-example.png diff --git a/doc/src/images/qml-xmlhttprequest-example.png b/src/doc/src/images/qml-xmlhttprequest-example.png Binary files differindex f5856134..f5856134 100644 --- a/doc/src/images/qml-xmlhttprequest-example.png +++ b/src/doc/src/images/qml-xmlhttprequest-example.png diff --git a/doc/src/images/qml-xmllistmodel-example.png b/src/doc/src/images/qml-xmllistmodel-example.png Binary files differindex be2d15d3..be2d15d3 100644 --- a/doc/src/images/qml-xmllistmodel-example.png +++ b/src/doc/src/images/qml-xmllistmodel-example.png diff --git a/doc/src/images/qml.png b/src/doc/src/images/qml.png Binary files differindex b1e4ab66..b1e4ab66 100644 --- a/doc/src/images/qml.png +++ b/src/doc/src/images/qml.png diff --git a/doc/src/images/qmldesigner-visual-editor.png b/src/doc/src/images/qmldesigner-visual-editor.png Binary files differindex 9cd4b8b2..9cd4b8b2 100644 --- a/doc/src/images/qmldesigner-visual-editor.png +++ b/src/doc/src/images/qmldesigner-visual-editor.png diff --git a/doc/src/images/quick_screens.png b/src/doc/src/images/quick_screens.png Binary files differindex 76b25d9d..76b25d9d 100644 --- a/doc/src/images/quick_screens.png +++ b/src/doc/src/images/quick_screens.png diff --git a/doc/src/legal/qtdeclarativelicense.qdoc b/src/doc/src/legal/qtdeclarativelicense.qdoc index 8dbd5e0a..8dbd5e0a 100644 --- a/doc/src/legal/qtdeclarativelicense.qdoc +++ b/src/doc/src/legal/qtdeclarativelicense.qdoc diff --git a/doc/src/snippets/declarative/Button.qml b/src/doc/src/snippets/declarative/Button.qml index 541cb9b9..541cb9b9 100644 --- a/doc/src/snippets/declarative/Button.qml +++ b/src/doc/src/snippets/declarative/Button.qml diff --git a/doc/src/snippets/declarative/SelfDestroyingRect.qml b/src/doc/src/snippets/declarative/SelfDestroyingRect.qml index 3f59b3cf..3f59b3cf 100644 --- a/doc/src/snippets/declarative/SelfDestroyingRect.qml +++ b/src/doc/src/snippets/declarative/SelfDestroyingRect.qml diff --git a/doc/src/snippets/declarative/Sprite.qml b/src/doc/src/snippets/declarative/Sprite.qml index 3c47f8ac..3c47f8ac 100644 --- a/doc/src/snippets/declarative/Sprite.qml +++ b/src/doc/src/snippets/declarative/Sprite.qml diff --git a/doc/src/snippets/declarative/anchoranimation.qml b/src/doc/src/snippets/declarative/anchoranimation.qml index 58836def..58836def 100644 --- a/doc/src/snippets/declarative/anchoranimation.qml +++ b/src/doc/src/snippets/declarative/anchoranimation.qml diff --git a/doc/src/snippets/declarative/anchorchanges.qml b/src/doc/src/snippets/declarative/anchorchanges.qml index a643df29..a643df29 100644 --- a/doc/src/snippets/declarative/anchorchanges.qml +++ b/src/doc/src/snippets/declarative/anchorchanges.qml diff --git a/doc/src/snippets/declarative/animatedimage.qml b/src/doc/src/snippets/declarative/animatedimage.qml index bd5ca5fa..bd5ca5fa 100644 --- a/doc/src/snippets/declarative/animatedimage.qml +++ b/src/doc/src/snippets/declarative/animatedimage.qml diff --git a/doc/src/snippets/declarative/animation.qml b/src/doc/src/snippets/declarative/animation.qml index 0921926c..0921926c 100644 --- a/doc/src/snippets/declarative/animation.qml +++ b/src/doc/src/snippets/declarative/animation.qml diff --git a/doc/src/snippets/declarative/application.qml b/src/doc/src/snippets/declarative/application.qml index fc9ec6a0..fc9ec6a0 100644 --- a/doc/src/snippets/declarative/application.qml +++ b/src/doc/src/snippets/declarative/application.qml diff --git a/doc/src/snippets/declarative/arrow.png b/src/doc/src/snippets/declarative/arrow.png Binary files differindex f0cae21f..f0cae21f 100644 --- a/doc/src/snippets/declarative/arrow.png +++ b/src/doc/src/snippets/declarative/arrow.png diff --git a/doc/src/snippets/declarative/behavior.qml b/src/doc/src/snippets/declarative/behavior.qml index be5cb11b..be5cb11b 100644 --- a/doc/src/snippets/declarative/behavior.qml +++ b/src/doc/src/snippets/declarative/behavior.qml diff --git a/doc/src/snippets/declarative/bestpractices/group.qml b/src/doc/src/snippets/declarative/bestpractices/group.qml index ee547207..ee547207 100644 --- a/doc/src/snippets/declarative/bestpractices/group.qml +++ b/src/doc/src/snippets/declarative/bestpractices/group.qml diff --git a/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml b/src/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml index 8333bc4d..8333bc4d 100644 --- a/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml +++ b/src/doc/src/snippets/declarative/borderimage/borderimage-defaults.qml diff --git a/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml b/src/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml index 1ac2c137..1ac2c137 100644 --- a/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml +++ b/src/doc/src/snippets/declarative/borderimage/borderimage-scaled.qml diff --git a/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml b/src/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml index 9c48a92c..9c48a92c 100644 --- a/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml +++ b/src/doc/src/snippets/declarative/borderimage/borderimage-tiled.qml diff --git a/doc/src/snippets/declarative/borderimage/normal-image.qml b/src/doc/src/snippets/declarative/borderimage/normal-image.qml index 377b5c26..377b5c26 100644 --- a/doc/src/snippets/declarative/borderimage/normal-image.qml +++ b/src/doc/src/snippets/declarative/borderimage/normal-image.qml diff --git a/doc/src/snippets/declarative/borderimage/pics/borderframe.png b/src/doc/src/snippets/declarative/borderimage/pics/borderframe.png Binary files differindex 97a9452d..97a9452d 100644 --- a/doc/src/snippets/declarative/borderimage/pics/borderframe.png +++ b/src/doc/src/snippets/declarative/borderimage/pics/borderframe.png diff --git a/doc/src/snippets/declarative/borderimage/pics/borderframe.svg b/src/doc/src/snippets/declarative/borderimage/pics/borderframe.svg index 9286c829..9286c829 100644 --- a/doc/src/snippets/declarative/borderimage/pics/borderframe.svg +++ b/src/doc/src/snippets/declarative/borderimage/pics/borderframe.svg diff --git a/doc/src/snippets/declarative/codingconventions/dotproperties.qml b/src/doc/src/snippets/declarative/codingconventions/dotproperties.qml index 2161889f..2161889f 100644 --- a/doc/src/snippets/declarative/codingconventions/dotproperties.qml +++ b/src/doc/src/snippets/declarative/codingconventions/dotproperties.qml diff --git a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml b/src/doc/src/snippets/declarative/codingconventions/javascript-imports.qml index b25d60a4..b25d60a4 100644 --- a/doc/src/snippets/declarative/codingconventions/javascript-imports.qml +++ b/src/doc/src/snippets/declarative/codingconventions/javascript-imports.qml diff --git a/doc/src/snippets/declarative/codingconventions/javascript.qml b/src/doc/src/snippets/declarative/codingconventions/javascript.qml index 0d144a8e..0d144a8e 100644 --- a/doc/src/snippets/declarative/codingconventions/javascript.qml +++ b/src/doc/src/snippets/declarative/codingconventions/javascript.qml diff --git a/doc/src/snippets/declarative/codingconventions/lists.qml b/src/doc/src/snippets/declarative/codingconventions/lists.qml index e324bd1b..e324bd1b 100644 --- a/doc/src/snippets/declarative/codingconventions/lists.qml +++ b/src/doc/src/snippets/declarative/codingconventions/lists.qml diff --git a/doc/src/snippets/declarative/codingconventions/myscript.js b/src/doc/src/snippets/declarative/codingconventions/myscript.js index cfa64625..cfa64625 100644 --- a/doc/src/snippets/declarative/codingconventions/myscript.js +++ b/src/doc/src/snippets/declarative/codingconventions/myscript.js diff --git a/doc/src/snippets/declarative/codingconventions/photo.qml b/src/doc/src/snippets/declarative/codingconventions/photo.qml index 1b2c1751..1b2c1751 100644 --- a/doc/src/snippets/declarative/codingconventions/photo.qml +++ b/src/doc/src/snippets/declarative/codingconventions/photo.qml diff --git a/doc/src/snippets/declarative/codingconventions/private.qml b/src/doc/src/snippets/declarative/codingconventions/private.qml index 8375e33d..8375e33d 100644 --- a/doc/src/snippets/declarative/codingconventions/private.qml +++ b/src/doc/src/snippets/declarative/codingconventions/private.qml diff --git a/doc/src/snippets/declarative/coloranimation.qml b/src/doc/src/snippets/declarative/coloranimation.qml index a010f917..a010f917 100644 --- a/doc/src/snippets/declarative/coloranimation.qml +++ b/src/doc/src/snippets/declarative/coloranimation.qml diff --git a/doc/src/snippets/declarative/colors.qml b/src/doc/src/snippets/declarative/colors.qml index e0441721..e0441721 100644 --- a/doc/src/snippets/declarative/colors.qml +++ b/src/doc/src/snippets/declarative/colors.qml diff --git a/doc/src/snippets/declarative/column/column.qml b/src/doc/src/snippets/declarative/column/column.qml index d94edbc7..d94edbc7 100644 --- a/doc/src/snippets/declarative/column/column.qml +++ b/src/doc/src/snippets/declarative/column/column.qml diff --git a/doc/src/snippets/declarative/column/vertical-positioner-transition.qml b/src/doc/src/snippets/declarative/column/vertical-positioner-transition.qml index 123be542..123be542 100644 --- a/doc/src/snippets/declarative/column/vertical-positioner-transition.qml +++ b/src/doc/src/snippets/declarative/column/vertical-positioner-transition.qml diff --git a/doc/src/snippets/declarative/column/vertical-positioner.qml b/src/doc/src/snippets/declarative/column/vertical-positioner.qml index 6c8d28b1..6c8d28b1 100644 --- a/doc/src/snippets/declarative/column/vertical-positioner.qml +++ b/src/doc/src/snippets/declarative/column/vertical-positioner.qml diff --git a/doc/src/snippets/declarative/comments.qml b/src/doc/src/snippets/declarative/comments.qml index ad0dfec3..ad0dfec3 100644 --- a/doc/src/snippets/declarative/comments.qml +++ b/src/doc/src/snippets/declarative/comments.qml diff --git a/doc/src/snippets/declarative/component.qml b/src/doc/src/snippets/declarative/component.qml index 9f66e9e5..9f66e9e5 100644 --- a/doc/src/snippets/declarative/component.qml +++ b/src/doc/src/snippets/declarative/component.qml diff --git a/doc/src/snippets/declarative/componentCreation.js b/src/doc/src/snippets/declarative/componentCreation.js index 7364139d..7364139d 100644 --- a/doc/src/snippets/declarative/componentCreation.js +++ b/src/doc/src/snippets/declarative/componentCreation.js diff --git a/doc/src/snippets/declarative/createComponent-simple.qml b/src/doc/src/snippets/declarative/createComponent-simple.qml index bd9de638..bd9de638 100644 --- a/doc/src/snippets/declarative/createComponent-simple.qml +++ b/src/doc/src/snippets/declarative/createComponent-simple.qml diff --git a/doc/src/snippets/declarative/createComponent.qml b/src/doc/src/snippets/declarative/createComponent.qml index 25233c58..25233c58 100644 --- a/doc/src/snippets/declarative/createComponent.qml +++ b/src/doc/src/snippets/declarative/createComponent.qml diff --git a/doc/src/snippets/declarative/createQmlObject.qml b/src/doc/src/snippets/declarative/createQmlObject.qml index c693becb..c693becb 100644 --- a/doc/src/snippets/declarative/createQmlObject.qml +++ b/src/doc/src/snippets/declarative/createQmlObject.qml diff --git a/doc/src/snippets/declarative/dynamicObjects-destroy.qml b/src/doc/src/snippets/declarative/dynamicObjects-destroy.qml index dc2ffeb2..dc2ffeb2 100644 --- a/doc/src/snippets/declarative/dynamicObjects-destroy.qml +++ b/src/doc/src/snippets/declarative/dynamicObjects-destroy.qml diff --git a/doc/src/snippets/declarative/events.qml b/src/doc/src/snippets/declarative/events.qml index c5002470..c5002470 100644 --- a/doc/src/snippets/declarative/events.qml +++ b/src/doc/src/snippets/declarative/events.qml diff --git a/doc/src/snippets/declarative/flickable.qml b/src/doc/src/snippets/declarative/flickable.qml index 78e2cb3a..78e2cb3a 100644 --- a/doc/src/snippets/declarative/flickable.qml +++ b/src/doc/src/snippets/declarative/flickable.qml diff --git a/doc/src/snippets/declarative/flickableScrollbar.qml b/src/doc/src/snippets/declarative/flickableScrollbar.qml index 5883521d..5883521d 100644 --- a/doc/src/snippets/declarative/flickableScrollbar.qml +++ b/src/doc/src/snippets/declarative/flickableScrollbar.qml diff --git a/doc/src/snippets/declarative/flipable/flipable.qml b/src/doc/src/snippets/declarative/flipable/flipable.qml index 6daeb528..6daeb528 100644 --- a/doc/src/snippets/declarative/flipable/flipable.qml +++ b/src/doc/src/snippets/declarative/flipable/flipable.qml diff --git a/doc/src/snippets/declarative/flow-diagram.qml b/src/doc/src/snippets/declarative/flow-diagram.qml index 7c1ed0a1..7c1ed0a1 100644 --- a/doc/src/snippets/declarative/flow-diagram.qml +++ b/src/doc/src/snippets/declarative/flow-diagram.qml diff --git a/doc/src/snippets/declarative/flow.qml b/src/doc/src/snippets/declarative/flow.qml index 976cc3e2..976cc3e2 100644 --- a/doc/src/snippets/declarative/flow.qml +++ b/src/doc/src/snippets/declarative/flow.qml diff --git a/doc/src/snippets/declarative/focus/advancedFocus.qml b/src/doc/src/snippets/declarative/focus/advancedFocus.qml index ced76092..ced76092 100644 --- a/doc/src/snippets/declarative/focus/advancedFocus.qml +++ b/src/doc/src/snippets/declarative/focus/advancedFocus.qml diff --git a/doc/src/snippets/declarative/focus/basicwidget.qml b/src/doc/src/snippets/declarative/focus/basicwidget.qml index e1b1aeed..e1b1aeed 100644 --- a/doc/src/snippets/declarative/focus/basicwidget.qml +++ b/src/doc/src/snippets/declarative/focus/basicwidget.qml diff --git a/doc/src/snippets/declarative/focus/clickablewidget.qml b/src/doc/src/snippets/declarative/focus/clickablewidget.qml index 361d3905..361d3905 100644 --- a/doc/src/snippets/declarative/focus/clickablewidget.qml +++ b/src/doc/src/snippets/declarative/focus/clickablewidget.qml diff --git a/doc/src/snippets/declarative/focus/focusColumn.qml b/src/doc/src/snippets/declarative/focus/focusColumn.qml index 7f86787a..7f86787a 100644 --- a/doc/src/snippets/declarative/focus/focusColumn.qml +++ b/src/doc/src/snippets/declarative/focus/focusColumn.qml diff --git a/doc/src/snippets/declarative/focus/focusscopewidget.qml b/src/doc/src/snippets/declarative/focus/focusscopewidget.qml index 5d2731dc..5d2731dc 100644 --- a/doc/src/snippets/declarative/focus/focusscopewidget.qml +++ b/src/doc/src/snippets/declarative/focus/focusscopewidget.qml diff --git a/doc/src/snippets/declarative/focus/myclickablewidget.qml b/src/doc/src/snippets/declarative/focus/myclickablewidget.qml index 190fe661..190fe661 100644 --- a/doc/src/snippets/declarative/focus/myclickablewidget.qml +++ b/src/doc/src/snippets/declarative/focus/myclickablewidget.qml diff --git a/doc/src/snippets/declarative/focus/myfocusscopewidget.qml b/src/doc/src/snippets/declarative/focus/myfocusscopewidget.qml index e8e37cfb..e8e37cfb 100644 --- a/doc/src/snippets/declarative/focus/myfocusscopewidget.qml +++ b/src/doc/src/snippets/declarative/focus/myfocusscopewidget.qml diff --git a/doc/src/snippets/declarative/focus/mywidget.qml b/src/doc/src/snippets/declarative/focus/mywidget.qml index dd98b648..dd98b648 100644 --- a/doc/src/snippets/declarative/focus/mywidget.qml +++ b/src/doc/src/snippets/declarative/focus/mywidget.qml diff --git a/doc/src/snippets/declarative/focus/qmldir b/src/doc/src/snippets/declarative/focus/qmldir index d0683b2b..d0683b2b 100644 --- a/doc/src/snippets/declarative/focus/qmldir +++ b/src/doc/src/snippets/declarative/focus/qmldir diff --git a/doc/src/snippets/declarative/focus/rectangle.qml b/src/doc/src/snippets/declarative/focus/rectangle.qml index 3ef59853..3ef59853 100644 --- a/doc/src/snippets/declarative/focus/rectangle.qml +++ b/src/doc/src/snippets/declarative/focus/rectangle.qml diff --git a/doc/src/snippets/declarative/focus/widget.qml b/src/doc/src/snippets/declarative/focus/widget.qml index 13b4759e..13b4759e 100644 --- a/doc/src/snippets/declarative/focus/widget.qml +++ b/src/doc/src/snippets/declarative/focus/widget.qml diff --git a/doc/src/snippets/declarative/focusscopes.qml b/src/doc/src/snippets/declarative/focusscopes.qml index 878ca8e9..878ca8e9 100644 --- a/doc/src/snippets/declarative/focusscopes.qml +++ b/src/doc/src/snippets/declarative/focusscopes.qml diff --git a/doc/src/snippets/declarative/folderlistmodel.qml b/src/doc/src/snippets/declarative/folderlistmodel.qml index 0a32de44..0a32de44 100644 --- a/doc/src/snippets/declarative/folderlistmodel.qml +++ b/src/doc/src/snippets/declarative/folderlistmodel.qml diff --git a/doc/src/snippets/declarative/gradient.qml b/src/doc/src/snippets/declarative/gradient.qml index 5f663cf3..5f663cf3 100644 --- a/doc/src/snippets/declarative/gradient.qml +++ b/src/doc/src/snippets/declarative/gradient.qml diff --git a/doc/src/snippets/declarative/grid-spacing.qml b/src/doc/src/snippets/declarative/grid-spacing.qml index e3f8e716..e3f8e716 100644 --- a/doc/src/snippets/declarative/grid-spacing.qml +++ b/src/doc/src/snippets/declarative/grid-spacing.qml diff --git a/doc/src/snippets/declarative/grid/grid-items.qml b/src/doc/src/snippets/declarative/grid/grid-items.qml index 0339fa0e..0339fa0e 100644 --- a/doc/src/snippets/declarative/grid/grid-items.qml +++ b/src/doc/src/snippets/declarative/grid/grid-items.qml diff --git a/doc/src/snippets/declarative/grid/grid-no-spacing.qml b/src/doc/src/snippets/declarative/grid/grid-no-spacing.qml index e4ee6d28..e4ee6d28 100644 --- a/doc/src/snippets/declarative/grid/grid-no-spacing.qml +++ b/src/doc/src/snippets/declarative/grid/grid-no-spacing.qml diff --git a/doc/src/snippets/declarative/grid/grid-spacing.qml b/src/doc/src/snippets/declarative/grid/grid-spacing.qml index e3f8e716..e3f8e716 100644 --- a/doc/src/snippets/declarative/grid/grid-spacing.qml +++ b/src/doc/src/snippets/declarative/grid/grid-spacing.qml diff --git a/doc/src/snippets/declarative/grid/grid.qml b/src/doc/src/snippets/declarative/grid/grid.qml index d85000db..d85000db 100644 --- a/doc/src/snippets/declarative/grid/grid.qml +++ b/src/doc/src/snippets/declarative/grid/grid.qml diff --git a/doc/src/snippets/declarative/gridview/ContactModel.qml b/src/doc/src/snippets/declarative/gridview/ContactModel.qml index 164e8d58..164e8d58 100644 --- a/doc/src/snippets/declarative/gridview/ContactModel.qml +++ b/src/doc/src/snippets/declarative/gridview/ContactModel.qml diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/src/doc/src/snippets/declarative/gridview/gridview.qml index 4cdd5601..4cdd5601 100644 --- a/doc/src/snippets/declarative/gridview/gridview.qml +++ b/src/doc/src/snippets/declarative/gridview/gridview.qml diff --git a/doc/src/snippets/declarative/gridview/pics/portrait.png b/src/doc/src/snippets/declarative/gridview/pics/portrait.png Binary files differindex fb5052ad..fb5052ad 100644 --- a/doc/src/snippets/declarative/gridview/pics/portrait.png +++ b/src/doc/src/snippets/declarative/gridview/pics/portrait.png diff --git a/doc/src/snippets/declarative/image.qml b/src/doc/src/snippets/declarative/image.qml index b6dcba58..b6dcba58 100644 --- a/doc/src/snippets/declarative/image.qml +++ b/src/doc/src/snippets/declarative/image.qml diff --git a/doc/src/snippets/declarative/imports/best-practices.qml b/src/doc/src/snippets/declarative/imports/best-practices.qml index d605f1dc..d605f1dc 100644 --- a/doc/src/snippets/declarative/imports/best-practices.qml +++ b/src/doc/src/snippets/declarative/imports/best-practices.qml diff --git a/doc/src/snippets/declarative/imports/chart.qml b/src/doc/src/snippets/declarative/imports/chart.qml index d5da6597..d5da6597 100644 --- a/doc/src/snippets/declarative/imports/chart.qml +++ b/src/doc/src/snippets/declarative/imports/chart.qml diff --git a/doc/src/snippets/declarative/imports/installed-module.qml b/src/doc/src/snippets/declarative/imports/installed-module.qml index a5b2bb53..a5b2bb53 100644 --- a/doc/src/snippets/declarative/imports/installed-module.qml +++ b/src/doc/src/snippets/declarative/imports/installed-module.qml diff --git a/doc/src/snippets/declarative/imports/merged-named-imports.qml b/src/doc/src/snippets/declarative/imports/merged-named-imports.qml index f68946b6..f68946b6 100644 --- a/doc/src/snippets/declarative/imports/merged-named-imports.qml +++ b/src/doc/src/snippets/declarative/imports/merged-named-imports.qml diff --git a/doc/src/snippets/declarative/imports/named-imports.qml b/src/doc/src/snippets/declarative/imports/named-imports.qml index 0f594e8d..0f594e8d 100644 --- a/doc/src/snippets/declarative/imports/named-imports.qml +++ b/src/doc/src/snippets/declarative/imports/named-imports.qml diff --git a/doc/src/snippets/declarative/imports/network-imports.qml b/src/doc/src/snippets/declarative/imports/network-imports.qml index 6d82743d..6d82743d 100644 --- a/doc/src/snippets/declarative/imports/network-imports.qml +++ b/src/doc/src/snippets/declarative/imports/network-imports.qml diff --git a/doc/src/snippets/declarative/imports/qtquick-1.0.qml b/src/doc/src/snippets/declarative/imports/qtquick-1.0.qml index 4fe13685..4fe13685 100644 --- a/doc/src/snippets/declarative/imports/qtquick-1.0.qml +++ b/src/doc/src/snippets/declarative/imports/qtquick-1.0.qml diff --git a/doc/src/snippets/declarative/imports/timeexample.qml b/src/doc/src/snippets/declarative/imports/timeexample.qml index f9c2411d..f9c2411d 100644 --- a/doc/src/snippets/declarative/imports/timeexample.qml +++ b/src/doc/src/snippets/declarative/imports/timeexample.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/connectjs.qml b/src/doc/src/snippets/declarative/integrating-javascript/connectjs.qml index 9405429e..9405429e 100644 --- a/doc/src/snippets/declarative/integrating-javascript/connectjs.qml +++ b/src/doc/src/snippets/declarative/integrating-javascript/connectjs.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml b/src/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml index 399e06a6..399e06a6 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml +++ b/src/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js b/src/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js index 0d75bfcd..0d75bfcd 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js +++ b/src/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/script.js b/src/doc/src/snippets/declarative/integrating-javascript/includejs/script.js index cacf62aa..cacf62aa 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/script.js +++ b/src/doc/src/snippets/declarative/integrating-javascript/includejs/script.js diff --git a/doc/src/snippets/declarative/integrating-javascript/script.js b/src/doc/src/snippets/declarative/integrating-javascript/script.js index 1dcb5b0d..1dcb5b0d 100644 --- a/doc/src/snippets/declarative/integrating-javascript/script.js +++ b/src/doc/src/snippets/declarative/integrating-javascript/script.js diff --git a/doc/src/snippets/declarative/keynavigation.qml b/src/doc/src/snippets/declarative/keynavigation.qml index 532f5bd4..532f5bd4 100644 --- a/doc/src/snippets/declarative/keynavigation.qml +++ b/src/doc/src/snippets/declarative/keynavigation.qml diff --git a/doc/src/snippets/declarative/keys/keys-handler.qml b/src/doc/src/snippets/declarative/keys/keys-handler.qml index 02cebf5e..02cebf5e 100644 --- a/doc/src/snippets/declarative/keys/keys-handler.qml +++ b/src/doc/src/snippets/declarative/keys/keys-handler.qml diff --git a/doc/src/snippets/declarative/keys/keys-pressed.qml b/src/doc/src/snippets/declarative/keys/keys-pressed.qml index 80a0899e..80a0899e 100644 --- a/doc/src/snippets/declarative/keys/keys-pressed.qml +++ b/src/doc/src/snippets/declarative/keys/keys-pressed.qml diff --git a/doc/src/snippets/declarative/layoutmirroring.qml b/src/doc/src/snippets/declarative/layoutmirroring.qml index 1f923799..1f923799 100644 --- a/doc/src/snippets/declarative/layoutmirroring.qml +++ b/src/doc/src/snippets/declarative/layoutmirroring.qml diff --git a/doc/src/snippets/declarative/listmodel-modify.qml b/src/doc/src/snippets/declarative/listmodel-modify.qml index aae889e7..aae889e7 100644 --- a/doc/src/snippets/declarative/listmodel-modify.qml +++ b/src/doc/src/snippets/declarative/listmodel-modify.qml diff --git a/doc/src/snippets/declarative/listmodel-nested.qml b/src/doc/src/snippets/declarative/listmodel-nested.qml index 71076531..71076531 100644 --- a/doc/src/snippets/declarative/listmodel-nested.qml +++ b/src/doc/src/snippets/declarative/listmodel-nested.qml diff --git a/doc/src/snippets/declarative/listmodel-simple.qml b/src/doc/src/snippets/declarative/listmodel-simple.qml index 6a1764ae..6a1764ae 100644 --- a/doc/src/snippets/declarative/listmodel-simple.qml +++ b/src/doc/src/snippets/declarative/listmodel-simple.qml diff --git a/doc/src/snippets/declarative/listmodel.qml b/src/doc/src/snippets/declarative/listmodel.qml index 4d0dbed3..4d0dbed3 100644 --- a/doc/src/snippets/declarative/listmodel.qml +++ b/src/doc/src/snippets/declarative/listmodel.qml diff --git a/doc/src/snippets/declarative/listview-decorations.qml b/src/doc/src/snippets/declarative/listview-decorations.qml index ba5a91bb..ba5a91bb 100644 --- a/doc/src/snippets/declarative/listview-decorations.qml +++ b/src/doc/src/snippets/declarative/listview-decorations.qml diff --git a/doc/src/snippets/declarative/listview-sections.qml b/src/doc/src/snippets/declarative/listview-sections.qml index 3bbc0d6e..3bbc0d6e 100644 --- a/doc/src/snippets/declarative/listview-sections.qml +++ b/src/doc/src/snippets/declarative/listview-sections.qml diff --git a/doc/src/snippets/declarative/listview.qml b/src/doc/src/snippets/declarative/listview.qml index 6c720af1..6c720af1 100644 --- a/doc/src/snippets/declarative/listview.qml +++ b/src/doc/src/snippets/declarative/listview.qml diff --git a/doc/src/snippets/declarative/listview/ContactModel.qml b/src/doc/src/snippets/declarative/listview/ContactModel.qml index 83c17043..83c17043 100644 --- a/doc/src/snippets/declarative/listview/ContactModel.qml +++ b/src/doc/src/snippets/declarative/listview/ContactModel.qml diff --git a/doc/src/snippets/declarative/listview/listview-snippet.qml b/src/doc/src/snippets/declarative/listview/listview-snippet.qml index 2f0003f6..2f0003f6 100644 --- a/doc/src/snippets/declarative/listview/listview-snippet.qml +++ b/src/doc/src/snippets/declarative/listview/listview-snippet.qml diff --git a/doc/src/snippets/declarative/listview/listview.qml b/src/doc/src/snippets/declarative/listview/listview.qml index d85161b8..d85161b8 100644 --- a/doc/src/snippets/declarative/listview/listview.qml +++ b/src/doc/src/snippets/declarative/listview/listview.qml diff --git a/doc/src/snippets/declarative/loader/KeyReader.qml b/src/doc/src/snippets/declarative/loader/KeyReader.qml index 36732569..36732569 100644 --- a/doc/src/snippets/declarative/loader/KeyReader.qml +++ b/src/doc/src/snippets/declarative/loader/KeyReader.qml diff --git a/doc/src/snippets/declarative/loader/MyItem.qml b/src/doc/src/snippets/declarative/loader/MyItem.qml index 89d136e0..89d136e0 100644 --- a/doc/src/snippets/declarative/loader/MyItem.qml +++ b/src/doc/src/snippets/declarative/loader/MyItem.qml diff --git a/doc/src/snippets/declarative/loader/connections.qml b/src/doc/src/snippets/declarative/loader/connections.qml index ed4080ee..ed4080ee 100644 --- a/doc/src/snippets/declarative/loader/connections.qml +++ b/src/doc/src/snippets/declarative/loader/connections.qml diff --git a/doc/src/snippets/declarative/loader/focus.qml b/src/doc/src/snippets/declarative/loader/focus.qml index 0daf65ee..0daf65ee 100644 --- a/doc/src/snippets/declarative/loader/focus.qml +++ b/src/doc/src/snippets/declarative/loader/focus.qml diff --git a/doc/src/snippets/declarative/loader/simple.qml b/src/doc/src/snippets/declarative/loader/simple.qml index 61768cc2..61768cc2 100644 --- a/doc/src/snippets/declarative/loader/simple.qml +++ b/src/doc/src/snippets/declarative/loader/simple.qml diff --git a/doc/src/snippets/declarative/loader/sizeitem.qml b/src/doc/src/snippets/declarative/loader/sizeitem.qml index 7db259fc..7db259fc 100644 --- a/doc/src/snippets/declarative/loader/sizeitem.qml +++ b/src/doc/src/snippets/declarative/loader/sizeitem.qml diff --git a/doc/src/snippets/declarative/loader/sizeloader.qml b/src/doc/src/snippets/declarative/loader/sizeloader.qml index 735adc23..735adc23 100644 --- a/doc/src/snippets/declarative/loader/sizeloader.qml +++ b/src/doc/src/snippets/declarative/loader/sizeloader.qml diff --git a/doc/src/snippets/declarative/models/views-models-delegates.qml b/src/doc/src/snippets/declarative/models/views-models-delegates.qml index 4f4c0c07..4f4c0c07 100644 --- a/doc/src/snippets/declarative/models/views-models-delegates.qml +++ b/src/doc/src/snippets/declarative/models/views-models-delegates.qml diff --git a/doc/src/snippets/declarative/models/visual-model-and-view.qml b/src/doc/src/snippets/declarative/models/visual-model-and-view.qml index d78bbea3..d78bbea3 100644 --- a/doc/src/snippets/declarative/models/visual-model-and-view.qml +++ b/src/doc/src/snippets/declarative/models/visual-model-and-view.qml diff --git a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml b/src/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml index 26a414d4..26a414d4 100644 --- a/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml +++ b/src/doc/src/snippets/declarative/mousearea/mousearea-snippet.qml diff --git a/doc/src/snippets/declarative/mousearea/mousearea.qml b/src/doc/src/snippets/declarative/mousearea/mousearea.qml index 90f5e5a5..90f5e5a5 100644 --- a/doc/src/snippets/declarative/mousearea/mousearea.qml +++ b/src/doc/src/snippets/declarative/mousearea/mousearea.qml diff --git a/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml b/src/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml index 78de7d4d..78de7d4d 100644 --- a/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml +++ b/src/doc/src/snippets/declarative/mousearea/mouseareadragfilter.qml diff --git a/doc/src/snippets/declarative/numberanimation.qml b/src/doc/src/snippets/declarative/numberanimation.qml index 0622e945..0622e945 100644 --- a/doc/src/snippets/declarative/numberanimation.qml +++ b/src/doc/src/snippets/declarative/numberanimation.qml diff --git a/doc/src/snippets/declarative/parallelanimation.qml b/src/doc/src/snippets/declarative/parallelanimation.qml index feb7c1e6..feb7c1e6 100644 --- a/doc/src/snippets/declarative/parallelanimation.qml +++ b/src/doc/src/snippets/declarative/parallelanimation.qml diff --git a/doc/src/snippets/declarative/parentanimation.qml b/src/doc/src/snippets/declarative/parentanimation.qml index a8de9080..a8de9080 100644 --- a/doc/src/snippets/declarative/parentanimation.qml +++ b/src/doc/src/snippets/declarative/parentanimation.qml diff --git a/doc/src/snippets/declarative/parentchange.qml b/src/doc/src/snippets/declarative/parentchange.qml index dd0bd5d1..dd0bd5d1 100644 --- a/doc/src/snippets/declarative/parentchange.qml +++ b/src/doc/src/snippets/declarative/parentchange.qml diff --git a/doc/src/snippets/declarative/pathview/ContactModel.qml b/src/doc/src/snippets/declarative/pathview/ContactModel.qml index 6ecf60b7..6ecf60b7 100644 --- a/doc/src/snippets/declarative/pathview/ContactModel.qml +++ b/src/doc/src/snippets/declarative/pathview/ContactModel.qml diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/src/doc/src/snippets/declarative/pathview/pathattributes.qml index 03bb231d..03bb231d 100644 --- a/doc/src/snippets/declarative/pathview/pathattributes.qml +++ b/src/doc/src/snippets/declarative/pathview/pathattributes.qml diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/src/doc/src/snippets/declarative/pathview/pathview.qml index 34a6fe16..34a6fe16 100644 --- a/doc/src/snippets/declarative/pathview/pathview.qml +++ b/src/doc/src/snippets/declarative/pathview/pathview.qml diff --git a/doc/src/snippets/declarative/pathview/pics/qtlogo.png b/src/doc/src/snippets/declarative/pathview/pics/qtlogo.png Binary files differindex 4f68e162..4f68e162 100644 --- a/doc/src/snippets/declarative/pathview/pics/qtlogo.png +++ b/src/doc/src/snippets/declarative/pathview/pics/qtlogo.png diff --git a/doc/src/snippets/declarative/pics/checker.svg b/src/doc/src/snippets/declarative/pics/checker.svg index 374d89dc..374d89dc 100644 --- a/doc/src/snippets/declarative/pics/checker.svg +++ b/src/doc/src/snippets/declarative/pics/checker.svg diff --git a/doc/src/snippets/declarative/pics/qt.png b/src/doc/src/snippets/declarative/pics/qt.png Binary files differindex 4f68e162..4f68e162 100644 --- a/doc/src/snippets/declarative/pics/qt.png +++ b/src/doc/src/snippets/declarative/pics/qt.png diff --git a/doc/src/snippets/declarative/pics/qtlogo.png b/src/doc/src/snippets/declarative/pics/qtlogo.png Binary files differindex 4f68e162..4f68e162 100644 --- a/doc/src/snippets/declarative/pics/qtlogo.png +++ b/src/doc/src/snippets/declarative/pics/qtlogo.png diff --git a/doc/src/snippets/declarative/properties.qml b/src/doc/src/snippets/declarative/properties.qml index 8d3fef63..8d3fef63 100644 --- a/doc/src/snippets/declarative/properties.qml +++ b/src/doc/src/snippets/declarative/properties.qml diff --git a/doc/src/snippets/declarative/propertyaction-sequential.qml b/src/doc/src/snippets/declarative/propertyaction-sequential.qml index 64411e2f..64411e2f 100644 --- a/doc/src/snippets/declarative/propertyaction-sequential.qml +++ b/src/doc/src/snippets/declarative/propertyaction-sequential.qml diff --git a/doc/src/snippets/declarative/propertyaction.qml b/src/doc/src/snippets/declarative/propertyaction.qml index 4d57421a..4d57421a 100644 --- a/doc/src/snippets/declarative/propertyaction.qml +++ b/src/doc/src/snippets/declarative/propertyaction.qml diff --git a/doc/src/snippets/declarative/propertyanimation.qml b/src/doc/src/snippets/declarative/propertyanimation.qml index 0bf5fbee..0bf5fbee 100644 --- a/doc/src/snippets/declarative/propertyanimation.qml +++ b/src/doc/src/snippets/declarative/propertyanimation.qml diff --git a/doc/src/snippets/declarative/propertychanges.qml b/src/doc/src/snippets/declarative/propertychanges.qml index a0aa6758..a0aa6758 100644 --- a/doc/src/snippets/declarative/propertychanges.qml +++ b/src/doc/src/snippets/declarative/propertychanges.qml diff --git a/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml b/src/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml index cbfeaf6c..cbfeaf6c 100644 --- a/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml +++ b/src/doc/src/snippets/declarative/qml-data-models/dynamic-listmodel.qml diff --git a/doc/src/snippets/declarative/qml-data-models/listelements.qml b/src/doc/src/snippets/declarative/qml-data-models/listelements.qml index 73a63ef7..73a63ef7 100644 --- a/doc/src/snippets/declarative/qml-data-models/listelements.qml +++ b/src/doc/src/snippets/declarative/qml-data-models/listelements.qml diff --git a/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml b/src/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml index 83f5fc94..83f5fc94 100644 --- a/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml +++ b/src/doc/src/snippets/declarative/qml-data-models/listmodel-listview.qml diff --git a/doc/src/snippets/declarative/qml-documents/inline-component.qml b/src/doc/src/snippets/declarative/qml-documents/inline-component.qml index ff7c3ace..ff7c3ace 100644 --- a/doc/src/snippets/declarative/qml-documents/inline-component.qml +++ b/src/doc/src/snippets/declarative/qml-documents/inline-component.qml diff --git a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml b/src/doc/src/snippets/declarative/qml-documents/inline-text-component.qml index b0f862c8..b0f862c8 100644 --- a/doc/src/snippets/declarative/qml-documents/inline-text-component.qml +++ b/src/doc/src/snippets/declarative/qml-documents/inline-text-component.qml diff --git a/doc/src/snippets/declarative/qml-documents/non-trivial.qml b/src/doc/src/snippets/declarative/qml-documents/non-trivial.qml index a75be103..a75be103 100644 --- a/doc/src/snippets/declarative/qml-documents/non-trivial.qml +++ b/src/doc/src/snippets/declarative/qml-documents/non-trivial.qml diff --git a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml b/src/doc/src/snippets/declarative/qml-documents/qmldocuments.qml index c284e087..c284e087 100644 --- a/doc/src/snippets/declarative/qml-documents/qmldocuments.qml +++ b/src/doc/src/snippets/declarative/qml-documents/qmldocuments.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/components/Button.qml b/src/doc/src/snippets/declarative/qml-extending-types/components/Button.qml index 27e4546a..27e4546a 100644 --- a/doc/src/snippets/declarative/qml-extending-types/components/Button.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/components/Button.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/components/application.qml b/src/doc/src/snippets/declarative/qml-extending-types/components/application.qml index 5bf2d044..5bf2d044 100644 --- a/doc/src/snippets/declarative/qml-extending-types/components/application.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/components/application.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/methods/app.qml b/src/doc/src/snippets/declarative/qml-extending-types/methods/app.qml index e170c0ff..e170c0ff 100644 --- a/doc/src/snippets/declarative/qml-extending-types/methods/app.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/methods/app.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml index aeb0dc22..aeb0dc22 100644 --- a/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/ImageViewer.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml index b85c72ba..b85c72ba 100644 --- a/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias-override.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml index 8bcc2f51..8bcc2f51 100644 --- a/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml index 1f8c2817..1f8c2817 100644 --- a/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/ImageViewer.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml index 64edf85f..64edf85f 100644 --- a/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/alias/application.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/application.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/application.qml index eb8836d5..eb8836d5 100644 --- a/doc/src/snippets/declarative/qml-extending-types/properties/application.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/application.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml b/src/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml index b9e791ac..b9e791ac 100644 --- a/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/properties/property-signals.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml index 6611e2b2..6611e2b2 100644 --- a/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/Button.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml index d4594f44..d4594f44 100644 --- a/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/basic.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml index 81c00ebc..81c00ebc 100644 --- a/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/connectdynamic.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml index c58cbcd6..c58cbcd6 100644 --- a/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/connectslots.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml index 1bd16cad..1bd16cad 100644 --- a/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/no-parameters.qml diff --git a/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml b/src/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml index 88d15800..88d15800 100644 --- a/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml +++ b/src/doc/src/snippets/declarative/qml-extending-types/signals/parameters.qml diff --git a/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg b/src/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg index 8c018be6..8c018be6 100644 --- a/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg +++ b/src/doc/src/snippets/declarative/qml-intro/images/qt-logo.svg diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml index dba6ef9b..dba6ef9b 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h b/src/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h index e64dffc6..e64dffc6 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h +++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/applicationdata.h diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml b/src/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml index 6e0ecf5f..6e0ecf5f 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml +++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/connections.qml diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro b/src/doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro index 188a9fb9..188a9fb9 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro +++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/context-advanced.pro diff --git a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp b/src/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp index aaa7f645..aaa7f645 100644 --- a/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/context-advanced/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/context/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/context/MyItem.qml index 80e384c1..80e384c1 100644 --- a/doc/src/snippets/declarative/qtbinding/context/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/context/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/context/context.pro b/src/doc/src/snippets/declarative/qtbinding/context/context.pro index 68eeaf21..68eeaf21 100644 --- a/doc/src/snippets/declarative/qtbinding/context/context.pro +++ b/src/doc/src/snippets/declarative/qtbinding/context/context.pro diff --git a/doc/src/snippets/declarative/qtbinding/context/main.cpp b/src/doc/src/snippets/declarative/qtbinding/context/main.cpp index 0f1cd090..0f1cd090 100644 --- a/doc/src/snippets/declarative/qtbinding/context/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/context/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/enums/enums.pro b/src/doc/src/snippets/declarative/qtbinding/enums/enums.pro index 82bc1234..82bc1234 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/enums.pro +++ b/src/doc/src/snippets/declarative/qtbinding/enums/enums.pro diff --git a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h b/src/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h index f071fc9f..f071fc9f 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h +++ b/src/doc/src/snippets/declarative/qtbinding/enums/imageviewer.h diff --git a/doc/src/snippets/declarative/qtbinding/enums/main.cpp b/src/doc/src/snippets/declarative/qtbinding/enums/main.cpp index 868c62fe..868c62fe 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/enums/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/enums/standalone.qml b/src/doc/src/snippets/declarative/qtbinding/enums/standalone.qml index 42c64258..42c64258 100644 --- a/doc/src/snippets/declarative/qtbinding/enums/standalone.qml +++ b/src/doc/src/snippets/declarative/qtbinding/enums/standalone.qml diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml index d14cbf34..d14cbf34 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro index 01066c1b..01066c1b 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro +++ b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/functions-qml.pro diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp index dc288662..dc288662 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h index d6dc4819..d6dc4819 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h +++ b/src/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml index 27509475..27509475 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/functions-qml/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro b/src/doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro index 68eeaf21..68eeaf21 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro +++ b/src/doc/src/snippets/declarative/qtbinding/functions-qml/functions-qml.pro diff --git a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp b/src/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp index 4894d36e..4894d36e 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/functions-qml/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml index 0ce25d97..0ce25d97 100644 --- a/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/loading/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/loading/loading.pro b/src/doc/src/snippets/declarative/qtbinding/loading/loading.pro index 68eeaf21..68eeaf21 100644 --- a/doc/src/snippets/declarative/qtbinding/loading/loading.pro +++ b/src/doc/src/snippets/declarative/qtbinding/loading/loading.pro diff --git a/doc/src/snippets/declarative/qtbinding/loading/main.cpp b/src/doc/src/snippets/declarative/qtbinding/loading/main.cpp index 163b461b..163b461b 100644 --- a/doc/src/snippets/declarative/qtbinding/loading/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/loading/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h b/src/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h index ce711435..ce711435 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h +++ b/src/doc/src/snippets/declarative/qtbinding/newelements/imageviewer.h diff --git a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp b/src/doc/src/snippets/declarative/qtbinding/newelements/main.cpp index bd389d78..bd389d78 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/newelements/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/newelements/newelements.pro b/src/doc/src/snippets/declarative/qtbinding/newelements/newelements.pro index 82bc1234..82bc1234 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/newelements.pro +++ b/src/doc/src/snippets/declarative/qtbinding/newelements/newelements.pro diff --git a/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml b/src/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml index d4f35fd9..d4f35fd9 100644 --- a/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml +++ b/src/doc/src/snippets/declarative/qtbinding/newelements/standalone.qml diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml index 234d5ebd..234d5ebd 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h index 6a159904..6a159904 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h +++ b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/applicationdata.h diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp index e2a26d57..e2a26d57 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro index 188a9fb9..188a9fb9 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro +++ b/src/doc/src/snippets/declarative/qtbinding/properties-cpp/properties-cpp.pro diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml index 96743247..96743247 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/properties-qml/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp b/src/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp index e7beaa8e..e7beaa8e 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/properties-qml/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro b/src/doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro index 68eeaf21..68eeaf21 100644 --- a/doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro +++ b/src/doc/src/snippets/declarative/qtbinding/properties-qml/properties-qml.pro diff --git a/doc/src/snippets/declarative/qtbinding/resources/example.qrc b/src/doc/src/snippets/declarative/qtbinding/resources/example.qrc index 5e494151..5e494151 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/example.qrc +++ b/src/doc/src/snippets/declarative/qtbinding/resources/example.qrc diff --git a/doc/src/snippets/declarative/qtbinding/resources/images/background.png b/src/doc/src/snippets/declarative/qtbinding/resources/images/background.png index e69de29b..e69de29b 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/images/background.png +++ b/src/doc/src/snippets/declarative/qtbinding/resources/images/background.png diff --git a/doc/src/snippets/declarative/qtbinding/resources/main.cpp b/src/doc/src/snippets/declarative/qtbinding/resources/main.cpp index e7943375..e7943375 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/resources/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/resources/main.qml b/src/doc/src/snippets/declarative/qtbinding/resources/main.qml index 725e35fa..725e35fa 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/main.qml +++ b/src/doc/src/snippets/declarative/qtbinding/resources/main.qml diff --git a/doc/src/snippets/declarative/qtbinding/resources/resources.pro b/src/doc/src/snippets/declarative/qtbinding/resources/resources.pro index cc01ee12..cc01ee12 100644 --- a/doc/src/snippets/declarative/qtbinding/resources/resources.pro +++ b/src/doc/src/snippets/declarative/qtbinding/resources/resources.pro diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml index b3510d10..b3510d10 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h index c67f924d..c67f924d 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h +++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/imageviewer.h diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp index a0d41d6c..a0d41d6c 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro index 9aa87024..9aa87024 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro +++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/signals-cpp.pro diff --git a/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml index 4ee45939..4ee45939 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml +++ b/src/doc/src/snippets/declarative/qtbinding/signals-cpp/standalone.qml diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml index b2afb148..b2afb148 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/signals-qml/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp b/src/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp index ef045cfe..ef045cfe 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/signals-qml/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h b/src/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h index 41066fdd..41066fdd 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h +++ b/src/doc/src/snippets/declarative/qtbinding/signals-qml/myclass.h diff --git a/doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro b/src/doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro index 01066c1b..01066c1b 100644 --- a/doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro +++ b/src/doc/src/snippets/declarative/qtbinding/signals-qml/signals-qml.pro diff --git a/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml index ef526b3f..ef526b3f 100644 --- a/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml +++ b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/MyItem.qml diff --git a/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp index e48bf211..e48bf211 100644 --- a/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp +++ b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/main.cpp diff --git a/doc/src/snippets/declarative/qtbinding/variantlistmap/variantlistmap.pro b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/variantlistmap.pro index 68eeaf21..68eeaf21 100644 --- a/doc/src/snippets/declarative/qtbinding/variantlistmap/variantlistmap.pro +++ b/src/doc/src/snippets/declarative/qtbinding/variantlistmap/variantlistmap.pro diff --git a/doc/src/snippets/declarative/qtobject.qml b/src/doc/src/snippets/declarative/qtobject.qml index 6073f9d0..6073f9d0 100644 --- a/doc/src/snippets/declarative/qtobject.qml +++ b/src/doc/src/snippets/declarative/qtobject.qml diff --git a/doc/src/snippets/declarative/rectangle/rect-border-width.qml b/src/doc/src/snippets/declarative/rectangle/rect-border-width.qml index 1ace16e9..1ace16e9 100644 --- a/doc/src/snippets/declarative/rectangle/rect-border-width.qml +++ b/src/doc/src/snippets/declarative/rectangle/rect-border-width.qml diff --git a/doc/src/snippets/declarative/rectangle/rectangle-colors.qml b/src/doc/src/snippets/declarative/rectangle/rectangle-colors.qml index a7347c32..a7347c32 100644 --- a/doc/src/snippets/declarative/rectangle/rectangle-colors.qml +++ b/src/doc/src/snippets/declarative/rectangle/rectangle-colors.qml diff --git a/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml b/src/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml index 5019c729..5019c729 100644 --- a/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml +++ b/src/doc/src/snippets/declarative/rectangle/rectangle-gradient.qml diff --git a/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml b/src/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml index ffe40bfd..ffe40bfd 100644 --- a/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml +++ b/src/doc/src/snippets/declarative/rectangle/rectangle-smooth.qml diff --git a/doc/src/snippets/declarative/rectangle/rectangle.qml b/src/doc/src/snippets/declarative/rectangle/rectangle.qml index d56225b3..d56225b3 100644 --- a/doc/src/snippets/declarative/rectangle/rectangle.qml +++ b/src/doc/src/snippets/declarative/rectangle/rectangle.qml diff --git a/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml b/src/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml index 58d92c62..58d92c62 100644 --- a/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml +++ b/src/doc/src/snippets/declarative/repeaters/repeater-grid-index.qml diff --git a/doc/src/snippets/declarative/repeaters/repeater.qml b/src/doc/src/snippets/declarative/repeaters/repeater.qml index bd55688d..bd55688d 100644 --- a/doc/src/snippets/declarative/repeaters/repeater.qml +++ b/src/doc/src/snippets/declarative/repeaters/repeater.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/Button.qml b/src/doc/src/snippets/declarative/reusablecomponents/Button.qml index 92452413..92452413 100644 --- a/doc/src/snippets/declarative/reusablecomponents/Button.qml +++ b/src/doc/src/snippets/declarative/reusablecomponents/Button.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/application.qml b/src/doc/src/snippets/declarative/reusablecomponents/application.qml index ab4829e1..ab4829e1 100644 --- a/doc/src/snippets/declarative/reusablecomponents/application.qml +++ b/src/doc/src/snippets/declarative/reusablecomponents/application.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/component.qml b/src/doc/src/snippets/declarative/reusablecomponents/component.qml index a9b7ed2b..a9b7ed2b 100644 --- a/doc/src/snippets/declarative/reusablecomponents/component.qml +++ b/src/doc/src/snippets/declarative/reusablecomponents/component.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/focusbutton.qml b/src/doc/src/snippets/declarative/reusablecomponents/focusbutton.qml index 74797a1e..74797a1e 100644 --- a/doc/src/snippets/declarative/reusablecomponents/focusbutton.qml +++ b/src/doc/src/snippets/declarative/reusablecomponents/focusbutton.qml diff --git a/doc/src/snippets/declarative/reusablecomponents/qmldir b/src/doc/src/snippets/declarative/reusablecomponents/qmldir index 253732de..253732de 100644 --- a/doc/src/snippets/declarative/reusablecomponents/qmldir +++ b/src/doc/src/snippets/declarative/reusablecomponents/qmldir diff --git a/doc/src/snippets/declarative/righttoleft.qml b/src/doc/src/snippets/declarative/righttoleft.qml index efef2ce0..efef2ce0 100644 --- a/doc/src/snippets/declarative/righttoleft.qml +++ b/src/doc/src/snippets/declarative/righttoleft.qml diff --git a/doc/src/snippets/declarative/righttoleft/Child.qml b/src/doc/src/snippets/declarative/righttoleft/Child.qml index 321e5e48..321e5e48 100644 --- a/doc/src/snippets/declarative/righttoleft/Child.qml +++ b/src/doc/src/snippets/declarative/righttoleft/Child.qml diff --git a/doc/src/snippets/declarative/rotation.qml b/src/doc/src/snippets/declarative/rotation.qml index 0c9ed9a7..0c9ed9a7 100644 --- a/doc/src/snippets/declarative/rotation.qml +++ b/src/doc/src/snippets/declarative/rotation.qml diff --git a/doc/src/snippets/declarative/rotationanimation.qml b/src/doc/src/snippets/declarative/rotationanimation.qml index 76df7862..76df7862 100644 --- a/doc/src/snippets/declarative/rotationanimation.qml +++ b/src/doc/src/snippets/declarative/rotationanimation.qml diff --git a/doc/src/snippets/declarative/row.qml b/src/doc/src/snippets/declarative/row.qml index a093b202..a093b202 100644 --- a/doc/src/snippets/declarative/row.qml +++ b/src/doc/src/snippets/declarative/row.qml diff --git a/doc/src/snippets/declarative/row/row.qml b/src/doc/src/snippets/declarative/row/row.qml index 07fc26f6..07fc26f6 100644 --- a/doc/src/snippets/declarative/row/row.qml +++ b/src/doc/src/snippets/declarative/row/row.qml diff --git a/doc/src/snippets/declarative/script.js b/src/doc/src/snippets/declarative/script.js index f55dee35..f55dee35 100644 --- a/doc/src/snippets/declarative/script.js +++ b/src/doc/src/snippets/declarative/script.js diff --git a/doc/src/snippets/declarative/sequentialanimation.qml b/src/doc/src/snippets/declarative/sequentialanimation.qml index cad768ae..cad768ae 100644 --- a/doc/src/snippets/declarative/sequentialanimation.qml +++ b/src/doc/src/snippets/declarative/sequentialanimation.qml diff --git a/doc/src/snippets/declarative/smoothedanimation.qml b/src/doc/src/snippets/declarative/smoothedanimation.qml index 9f3e2490..9f3e2490 100644 --- a/doc/src/snippets/declarative/smoothedanimation.qml +++ b/src/doc/src/snippets/declarative/smoothedanimation.qml diff --git a/doc/src/snippets/declarative/springanimation.qml b/src/doc/src/snippets/declarative/springanimation.qml index d77a854f..d77a854f 100644 --- a/doc/src/snippets/declarative/springanimation.qml +++ b/src/doc/src/snippets/declarative/springanimation.qml diff --git a/doc/src/snippets/declarative/state-when.qml b/src/doc/src/snippets/declarative/state-when.qml index 32a7cc92..32a7cc92 100644 --- a/doc/src/snippets/declarative/state-when.qml +++ b/src/doc/src/snippets/declarative/state-when.qml diff --git a/doc/src/snippets/declarative/state.qml b/src/doc/src/snippets/declarative/state.qml index fb52df82..fb52df82 100644 --- a/doc/src/snippets/declarative/state.qml +++ b/src/doc/src/snippets/declarative/state.qml diff --git a/doc/src/snippets/declarative/states.qml b/src/doc/src/snippets/declarative/states.qml index 1eb87fc4..1eb87fc4 100644 --- a/doc/src/snippets/declarative/states.qml +++ b/src/doc/src/snippets/declarative/states.qml diff --git a/doc/src/snippets/declarative/states/statechangescript.qml b/src/doc/src/snippets/declarative/states/statechangescript.qml index 29c43cc1..29c43cc1 100644 --- a/doc/src/snippets/declarative/states/statechangescript.qml +++ b/src/doc/src/snippets/declarative/states/statechangescript.qml diff --git a/doc/src/snippets/declarative/systempalette.qml b/src/doc/src/snippets/declarative/systempalette.qml index 5be7728e..5be7728e 100644 --- a/doc/src/snippets/declarative/systempalette.qml +++ b/src/doc/src/snippets/declarative/systempalette.qml diff --git a/doc/src/snippets/declarative/text/onLinkActivated.qml b/src/doc/src/snippets/declarative/text/onLinkActivated.qml index 2393908b..2393908b 100644 --- a/doc/src/snippets/declarative/text/onLinkActivated.qml +++ b/src/doc/src/snippets/declarative/text/onLinkActivated.qml diff --git a/doc/src/snippets/declarative/texteditor.qml b/src/doc/src/snippets/declarative/texteditor.qml index 8a1dc6b2..8a1dc6b2 100644 --- a/doc/src/snippets/declarative/texteditor.qml +++ b/src/doc/src/snippets/declarative/texteditor.qml diff --git a/doc/src/snippets/declarative/texthandling.qml b/src/doc/src/snippets/declarative/texthandling.qml index 5d0e1666..5d0e1666 100644 --- a/doc/src/snippets/declarative/texthandling.qml +++ b/src/doc/src/snippets/declarative/texthandling.qml diff --git a/doc/src/snippets/declarative/transition-from-to-modified.qml b/src/doc/src/snippets/declarative/transition-from-to-modified.qml index 06e77896..06e77896 100644 --- a/doc/src/snippets/declarative/transition-from-to-modified.qml +++ b/src/doc/src/snippets/declarative/transition-from-to-modified.qml diff --git a/doc/src/snippets/declarative/transition-from-to.qml b/src/doc/src/snippets/declarative/transition-from-to.qml index 1bc0c41d..1bc0c41d 100644 --- a/doc/src/snippets/declarative/transition-from-to.qml +++ b/src/doc/src/snippets/declarative/transition-from-to.qml diff --git a/doc/src/snippets/declarative/transition-reversible.qml b/src/doc/src/snippets/declarative/transition-reversible.qml index 746ac6f0..746ac6f0 100644 --- a/doc/src/snippets/declarative/transition-reversible.qml +++ b/src/doc/src/snippets/declarative/transition-reversible.qml diff --git a/doc/src/snippets/declarative/transition.qml b/src/doc/src/snippets/declarative/transition.qml index 82e06c30..82e06c30 100644 --- a/doc/src/snippets/declarative/transition.qml +++ b/src/doc/src/snippets/declarative/transition.qml diff --git a/doc/src/snippets/declarative/transitions-list.qml b/src/doc/src/snippets/declarative/transitions-list.qml index d7f27590..d7f27590 100644 --- a/doc/src/snippets/declarative/transitions-list.qml +++ b/src/doc/src/snippets/declarative/transitions-list.qml diff --git a/doc/src/snippets/declarative/visualdatamodel.qml b/src/doc/src/snippets/declarative/visualdatamodel.qml index bd22c1a9..bd22c1a9 100644 --- a/doc/src/snippets/declarative/visualdatamodel.qml +++ b/src/doc/src/snippets/declarative/visualdatamodel.qml diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp b/src/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp index c7cbed38..c7cbed38 100644 --- a/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp +++ b/src/doc/src/snippets/declarative/visualdatamodel_rootindex/main.cpp diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml b/src/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml index 73384568..73384568 100644 --- a/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml +++ b/src/doc/src/snippets/declarative/visualdatamodel_rootindex/view.qml diff --git a/doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro b/src/doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro index fec070cb..fec070cb 100644 --- a/doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro +++ b/src/doc/src/snippets/declarative/visualdatamodel_rootindex/visualdatamodel_rootindex.pro diff --git a/doc/src/snippets/declarative/webview/webview.qml b/src/doc/src/snippets/declarative/webview/webview.qml index 833cf8de..833cf8de 100644 --- a/doc/src/snippets/declarative/webview/webview.qml +++ b/src/doc/src/snippets/declarative/webview/webview.qml diff --git a/doc/src/snippets/declarative/workerscript.qml b/src/doc/src/snippets/declarative/workerscript.qml index 2a8502a5..2a8502a5 100644 --- a/doc/src/snippets/declarative/workerscript.qml +++ b/src/doc/src/snippets/declarative/workerscript.qml diff --git a/doc/src/snippets/declarative/xmlrole.qml b/src/doc/src/snippets/declarative/xmlrole.qml index 1c43d9c3..1c43d9c3 100644 --- a/doc/src/snippets/declarative/xmlrole.qml +++ b/src/doc/src/snippets/declarative/xmlrole.qml diff --git a/doc/src/snippets/declarative/xmlrole.xml b/src/doc/src/snippets/declarative/xmlrole.xml index c9f999e5..c9f999e5 100644 --- a/doc/src/snippets/declarative/xmlrole.xml +++ b/src/doc/src/snippets/declarative/xmlrole.xml diff --git a/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/plugins/qdeclarativeview/qdeclarativeview.pro index 3381dbec..8c3559c3 100644 --- a/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -2,6 +2,7 @@ TARGET = qdeclarativeview QT += declarative widgets designer PLUGIN_TYPE = designer +PLUGIN_CLASS_NAME = QDeclarativeViewPlugin CONFIG += tool_plugin load(qt_plugin) diff --git a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro index 19e6897a..9aca1d87 100644 --- a/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro +++ b/src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro @@ -2,6 +2,7 @@ TARGET = qmldbg_inspector QT += declarative declarative-private gui widgets core-private PLUGIN_TYPE = qmltooling +PLUGIN_CLASS_NAME = QtQuick1Plugin load(qt_plugin) INCLUDEPATH *= $$PWD diff --git a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro index cfd2e8ec..ca21b389 100644 --- a/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro +++ b/src/plugins/qmltooling/qmldbg_tcp_qtquick1/qmldbg_tcp_qtquick1.pro @@ -2,6 +2,7 @@ TARGET = qmldbg_tcp_qtdeclarative QT += declarative declarative-private network PLUGIN_TYPE = qmltooling +PLUGIN_CLASS_NAME = QTcpServerConnection load(qt_plugin) SOURCES += \ diff --git a/src/src.pro b/src/src.pro index e3a6d023..7c5180c5 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,3 +3,6 @@ CONFIG += ordered SUBDIRS += declarative imports plugins +# We do not want QtQuick 1 documentation and examples show up automatically. +# SUBDIRS += doc + diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index 1c57b04f..1d7aa0f9 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -68,7 +68,8 @@ tst_examples::tst_examples() { // Add directories you want excluded here excludedDirs << "doc/src/snippets/declarative/visualdatamodel_rootindex" - << "doc/src/snippets/declarative/qtbinding"; + << "doc/src/snippets/declarative/qtbinding" + << "examples/declarative/tutorials"; //Excluded when tutorials were moved into examples (not checked before) // Known to violate naming conventions, QTQAINFRA-428 excludedDirs << "demos/mobile/qtbubblelevel/qml" << "demos/mobile/quickhit"; diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp index 72f1afcb..9231c17b 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp @@ -127,7 +127,7 @@ void registerTypes() qmlRegisterType<QPlainTextEdit>("Qt.test",1,0,"QPlainTextEdit"); qRegisterMetaType<MyQmlObject::MyType>("MyQmlObject::MyType"); - qRegisterMetaType<MyQmlObject::MyType>("MyEnum2"); + qRegisterMetaType<MyQmlObject::MyEnum2>("MyEnum2"); qRegisterMetaType<Qt::MouseButtons>("Qt::MouseButtons"); } diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/a.js b/tests/auto/declarative/qdeclarativeimportorder/data/a.js new file mode 100644 index 00000000..49c40f77 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/a.js @@ -0,0 +1 @@ +console.log("a.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/b.js b/tests/auto/declarative/qdeclarativeimportorder/data/b.js new file mode 100644 index 00000000..786ef862 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/b.js @@ -0,0 +1 @@ +console.log("b.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/c.js b/tests/auto/declarative/qdeclarativeimportorder/data/c.js new file mode 100644 index 00000000..3e1d32f0 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/c.js @@ -0,0 +1 @@ +console.log("c.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/d.js b/tests/auto/declarative/qdeclarativeimportorder/data/d.js new file mode 100644 index 00000000..4c339077 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/d.js @@ -0,0 +1 @@ +console.log("d.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/e.js b/tests/auto/declarative/qdeclarativeimportorder/data/e.js new file mode 100644 index 00000000..ac758f93 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/e.js @@ -0,0 +1 @@ +console.log("e.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/f.js b/tests/auto/declarative/qdeclarativeimportorder/data/f.js new file mode 100644 index 00000000..04b0cf3a --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/f.js @@ -0,0 +1 @@ +console.log("f.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/g.js b/tests/auto/declarative/qdeclarativeimportorder/data/g.js new file mode 100644 index 00000000..e6747104 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/g.js @@ -0,0 +1 @@ +console.log("g.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/h.js b/tests/auto/declarative/qdeclarativeimportorder/data/h.js new file mode 100644 index 00000000..8f81e240 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/h.js @@ -0,0 +1 @@ +console.log("h.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/i.js b/tests/auto/declarative/qdeclarativeimportorder/data/i.js new file mode 100644 index 00000000..a074b78c --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/i.js @@ -0,0 +1 @@ +console.log("i.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/importOrderJs.qml b/tests/auto/declarative/qdeclarativeimportorder/data/importOrderJs.qml new file mode 100644 index 00000000..6cad175e --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/importOrderJs.qml @@ -0,0 +1,30 @@ +import QtQuick 1.1 +import "a.js" as A +import "b.js" as B +import "c.js" as C +import "d.js" as D +import "e.js" as E +import "f.js" as F +import "g.js" as G +import "h.js" as H +import "i.js" as I +import "j.js" as J +import "k.js" as K +import "l.js" as L +import "m.js" as M +import "n.js" as N +import "o.js" as O +import "p.js" as P +import "q.js" as Q +import "r.js" as R +import "s.js" as S +import "t.js" as T +import "u.js" as U +import "v.js" as V +import "w.js" as W +import "x.js" as X +import "y.js" as Y +import "z.js" as Z + +Item { +} diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/j.js b/tests/auto/declarative/qdeclarativeimportorder/data/j.js new file mode 100644 index 00000000..1b336d06 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/j.js @@ -0,0 +1 @@ +console.log("j.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/k.js b/tests/auto/declarative/qdeclarativeimportorder/data/k.js new file mode 100644 index 00000000..b205c1c4 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/k.js @@ -0,0 +1 @@ +console.log("k.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/l.js b/tests/auto/declarative/qdeclarativeimportorder/data/l.js new file mode 100644 index 00000000..36331a88 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/l.js @@ -0,0 +1 @@ +console.log("l.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/m.js b/tests/auto/declarative/qdeclarativeimportorder/data/m.js new file mode 100644 index 00000000..f8ec9a06 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/m.js @@ -0,0 +1 @@ +console.log("m.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/n.js b/tests/auto/declarative/qdeclarativeimportorder/data/n.js new file mode 100644 index 00000000..59ea354c --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/n.js @@ -0,0 +1 @@ +console.log("n.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/o.js b/tests/auto/declarative/qdeclarativeimportorder/data/o.js new file mode 100644 index 00000000..1bdad649 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/o.js @@ -0,0 +1 @@ +console.log("o.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/p.js b/tests/auto/declarative/qdeclarativeimportorder/data/p.js new file mode 100644 index 00000000..ba37e9cc --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/p.js @@ -0,0 +1 @@ +console.log("p.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/q.js b/tests/auto/declarative/qdeclarativeimportorder/data/q.js new file mode 100644 index 00000000..6f226207 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/q.js @@ -0,0 +1 @@ +console.log("q.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/r.js b/tests/auto/declarative/qdeclarativeimportorder/data/r.js new file mode 100644 index 00000000..9f9b25a0 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/r.js @@ -0,0 +1 @@ +console.log("r.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/s.js b/tests/auto/declarative/qdeclarativeimportorder/data/s.js new file mode 100644 index 00000000..f81ca099 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/s.js @@ -0,0 +1 @@ +console.log("s.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/t.js b/tests/auto/declarative/qdeclarativeimportorder/data/t.js new file mode 100644 index 00000000..3f150a77 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/t.js @@ -0,0 +1 @@ +console.log("t.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/u.js b/tests/auto/declarative/qdeclarativeimportorder/data/u.js new file mode 100644 index 00000000..426bdd09 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/u.js @@ -0,0 +1 @@ +console.log("u.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/v.js b/tests/auto/declarative/qdeclarativeimportorder/data/v.js new file mode 100644 index 00000000..66d23f52 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/v.js @@ -0,0 +1 @@ +console.log("v.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/w.js b/tests/auto/declarative/qdeclarativeimportorder/data/w.js new file mode 100644 index 00000000..ecefb1d0 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/w.js @@ -0,0 +1 @@ +console.log("w.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/x.js b/tests/auto/declarative/qdeclarativeimportorder/data/x.js new file mode 100644 index 00000000..64112bb4 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/x.js @@ -0,0 +1 @@ +console.log("x.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/y.js b/tests/auto/declarative/qdeclarativeimportorder/data/y.js new file mode 100644 index 00000000..9ed70f26 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/y.js @@ -0,0 +1 @@ +console.log("y.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/data/z.js b/tests/auto/declarative/qdeclarativeimportorder/data/z.js new file mode 100644 index 00000000..0e6fc83e --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/data/z.js @@ -0,0 +1 @@ +console.log("z.js") diff --git a/tests/auto/declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro b/tests/auto/declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro new file mode 100644 index 00000000..725b6d6a --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/qdeclarativeimportorder.pro @@ -0,0 +1,14 @@ +CONFIG += testcase +TARGET = tst_qdeclarativeimportorder + +QT += testlib +contains(QT_CONFIG,declarative): QT += declarative widgets +macx:CONFIG -= app_bundle + +SOURCES += tst_qdeclarativeimportorder.cpp + +include(../shared/qdeclarativedatatest.pri) + +CONFIG += parallel_test + +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/declarative/qdeclarativeimportorder/tst_qdeclarativeimportorder.cpp b/tests/auto/declarative/qdeclarativeimportorder/tst_qdeclarativeimportorder.cpp new file mode 100644 index 00000000..ecf35100 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeimportorder/tst_qdeclarativeimportorder.cpp @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Jolla Mobile <robin.burchell@jollamobile.com> +** Contact: http://www.qt-project.org/legal +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qtest.h> +#include <qdeclarativedatatest.h> +#include <QDeclarativeEngine> +#include <QDeclarativeComponent> +#include <QDeclarativeContext> + +#include <QDebug> + + +class tst_qdeclarativeimportorder : public QDeclarativeDataTest +{ + Q_OBJECT +public: + tst_qdeclarativeimportorder() + { + } + +private slots: + void qmlObject(); + +private: + QDeclarativeEngine engine; +}; + +Q_GLOBAL_STATIC(QStringList, importMessages); + +static void orderedImportMsgHandler(QtMsgType type, const QMessageLogContext &, const QString &message) +{ + if (type == QtDebugMsg) + importMessages()->append(message); + else + fprintf(stderr, "possibly unexpected message of type %d: %s", type, qPrintable(message)); +} + +void tst_qdeclarativeimportorder::qmlObject() +{ + QDeclarativeComponent component(&engine, testFileUrl("importOrderJs.qml")); + + QtMessageHandler old = qInstallMessageHandler(orderedImportMsgHandler); + QObject *object = component.create(); + qInstallMessageHandler(old); // do this before the QVERIFY so output goes out ok if it errors + QVERIFY(object != 0); + QCOMPARE(*importMessages(), QStringList() << "a.js" << "b.js" << "c.js" + << "d.js" << "e.js" << "f.js" + << "g.js" << "h.js" << "i.js" + << "j.js" << "k.js" << "l.js" + << "m.js" << "n.js" << "o.js" + << "p.js" << "q.js" << "r.js" + << "s.js" << "t.js" << "u.js" + << "v.js" << "w.js" << "x.js" + << "y.js" << "z.js"); + // now I know my ABCs, + // next time won't you sing with me? +} + +QTEST_MAIN(tst_qdeclarativeimportorder) + +#include "tst_qdeclarativeimportorder.moc" diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt index 89e58ee7..59b0b874 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt +++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.errors.txt @@ -1 +1 @@ -1:35:Library import requires a version +1:39:Library import requires a version diff --git a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml index 97ec2228..6ad2a812 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/importVersionMissingInstalled.qml @@ -1,3 +1,3 @@ -import com.nokia.installedtest as T +import org.qtproject.installedtest as T T.InstalledTest {} diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml index 9985d332..9985d332 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml index f63283e7..f63283e7 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/InstalledTest2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/InstalledTest2.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/LocalLast.qml index 7f491eb8..7f491eb8 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/LocalLast.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/LocalLast.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/PrivateType.qml index 03bf25bc..03bf25bc 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/PrivateType.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/PrivateType.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/qmldir index d15720a1..d15720a1 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest/qmldir +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest/qmldir diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml index 9985d332..9985d332 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml index f63283e7..f63283e7 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/InstalledTest2.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/InstalledTest2.qml diff --git a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/qmldir index b3012260..b3012260 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/lib/com/nokia/installedtest0/qmldir +++ b/tests/auto/declarative/qdeclarativelanguage/data/lib/org/qtproject/installedtest0/qmldir diff --git a/tests/auto/declarative/qdeclarativelanguage/data/localOrderTest.qml b/tests/auto/declarative/qdeclarativelanguage/data/localOrderTest.qml index bdb13756..d3b31a3d 100644 --- a/tests/auto/declarative/qdeclarativelanguage/data/localOrderTest.qml +++ b/tests/auto/declarative/qdeclarativelanguage/data/localOrderTest.qml @@ -1,5 +1,5 @@ import QtQuick 1.0 -import com.nokia.installedtest 1.0 +import org.qtproject.installedtest 1.0 LocalLast2 { property Item item: LocalLast {} diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 5dbcf456..f1467ef6 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -1446,101 +1446,101 @@ void tst_qdeclarativelanguage::importsBuiltin_data() << "" << "Test is not a type"; QTest::newRow("not in version 0.0") - << "import com.nokia.Test 0.0\n" + << "import org.qtproject.Test 0.0\n" "Test {}" << "" << "Test is not a type"; QTest::newRow("version not installed") - << "import com.nokia.Test 99.0\n" + << "import org.qtproject.Test 99.0\n" "Test {}" << "" - << "module \"com.nokia.Test\" version 99.0 is not installed"; + << "module \"org.qtproject.Test\" version 99.0 is not installed"; QTest::newRow("in version 0.0") - << "import com.nokia.Test 0.0\n" + << "import org.qtproject.Test 0.0\n" "TestTP {}" << "TestType" << ""; QTest::newRow("qualified in version 0.0") - << "import com.nokia.Test 0.0 as T\n" + << "import org.qtproject.Test 0.0 as T\n" "T.TestTP {}" << "TestType" << ""; QTest::newRow("in version 1.0") - << "import com.nokia.Test 1.0\n" + << "import org.qtproject.Test 1.0\n" "Test {}" << "TestType" << ""; QTest::newRow("qualified wrong") - << "import com.nokia.Test 1.0 as T\n" // QT-610 + << "import org.qtproject.Test 1.0 as T\n" // QT-610 "Test {}" << "" << "Test is not a type"; QTest::newRow("qualified right") - << "import com.nokia.Test 1.0 as T\n" + << "import org.qtproject.Test 1.0 as T\n" "T.Test {}" << "TestType" << ""; QTest::newRow("qualified right but not in version 0.0") - << "import com.nokia.Test 0.0 as T\n" + << "import org.qtproject.Test 0.0 as T\n" "T.Test {}" << "" << "T.Test is not a type"; QTest::newRow("in version 1.1") - << "import com.nokia.Test 1.1\n" + << "import org.qtproject.Test 1.1\n" "Test {}" << "TestType" << ""; QTest::newRow("in version 1.3") - << "import com.nokia.Test 1.3\n" + << "import org.qtproject.Test 1.3\n" "Test {}" << "TestType" << ""; QTest::newRow("in version 1.5") - << "import com.nokia.Test 1.5\n" + << "import org.qtproject.Test 1.5\n" "Test {}" << "TestType" << ""; QTest::newRow("changed in version 1.8") - << "import com.nokia.Test 1.8\n" + << "import org.qtproject.Test 1.8\n" "Test {}" << "TestType2" << ""; QTest::newRow("in version 1.12") - << "import com.nokia.Test 1.12\n" + << "import org.qtproject.Test 1.12\n" "Test {}" << "TestType2" << ""; QTest::newRow("old in version 1.9") - << "import com.nokia.Test 1.9\n" + << "import org.qtproject.Test 1.9\n" "OldTest {}" << "TestType" << ""; QTest::newRow("old in version 1.11") - << "import com.nokia.Test 1.11\n" + << "import org.qtproject.Test 1.11\n" "OldTest {}" << "TestType" << ""; QTest::newRow("multiversion 1") - << "import com.nokia.Test 1.11\n" - "import com.nokia.Test 1.12\n" + << "import org.qtproject.Test 1.11\n" + "import org.qtproject.Test 1.12\n" "Test {}" << (!qmlCheckTypes()?"TestType2":"") - << (!qmlCheckTypes()?"":"Test is ambiguous. Found in com/nokia/Test in version 1.12 and 1.11"); + << (!qmlCheckTypes()?"":"Test is ambiguous. Found in org/qtproject/Test in version 1.12 and 1.11"); QTest::newRow("multiversion 2") - << "import com.nokia.Test 1.11\n" - "import com.nokia.Test 1.12\n" + << "import org.qtproject.Test 1.11\n" + "import org.qtproject.Test 1.12\n" "OldTest {}" << (!qmlCheckTypes()?"TestType":"") - << (!qmlCheckTypes()?"":"OldTest is ambiguous. Found in com/nokia/Test in version 1.12 and 1.11"); + << (!qmlCheckTypes()?"":"OldTest is ambiguous. Found in org/qtproject/Test in version 1.12 and 1.11"); QTest::newRow("qualified multiversion 3") - << "import com.nokia.Test 1.0 as T0\n" - "import com.nokia.Test 1.8 as T8\n" + << "import org.qtproject.Test 1.0 as T0\n" + "import org.qtproject.Test 1.8 as T8\n" "T0.Test {}" << "TestType" << ""; QTest::newRow("qualified multiversion 4") - << "import com.nokia.Test 1.0 as T0\n" - "import com.nokia.Test 1.8 as T8\n" + << "import org.qtproject.Test 1.0 as T0\n" + "import org.qtproject.Test 1.8 as T8\n" "T8.Test {}" << "TestType2" << ""; @@ -1597,10 +1597,10 @@ void tst_qdeclarativelanguage::importsLocal_data() << "Test is not a type"; QTest::newRow("library precedence over local import") << "import \"subdir\"\n" - "import com.nokia.Test 1.0\n" + "import org.qtproject.Test 1.0\n" "Test {}" << (!qmlCheckTypes()?"TestType":"") - << (!qmlCheckTypes()?"":"Test is ambiguous. Found in com/nokia/Test and in subdir"); + << (!qmlCheckTypes()?"":"Test is ambiguous. Found in org/qtproject/Test and in subdir"); } void tst_qdeclarativelanguage::importsLocal() @@ -1690,47 +1690,47 @@ void tst_qdeclarativelanguage::importsInstalled_data() // import installed QTest::newRow("installed import 0") - << "import com.nokia.installedtest0 0.0\n" + << "import org.qtproject.installedtest0 0.0\n" "InstalledTestTP {}" << "QDeclarativeRectangle" << ""; QTest::newRow("installed import 0 as TP") - << "import com.nokia.installedtest0 0.0 as TP\n" + << "import org.qtproject.installedtest0 0.0 as TP\n" "TP.InstalledTestTP {}" << "QDeclarativeRectangle" << ""; QTest::newRow("installed import 1") - << "import com.nokia.installedtest 1.0\n" + << "import org.qtproject.installedtest 1.0\n" "InstalledTest {}" << "QDeclarativeRectangle" << ""; QTest::newRow("installed import 2") - << "import com.nokia.installedtest 1.3\n" + << "import org.qtproject.installedtest 1.3\n" "InstalledTest {}" << "QDeclarativeRectangle" << ""; QTest::newRow("installed import 3") - << "import com.nokia.installedtest 1.4\n" + << "import org.qtproject.installedtest 1.4\n" "InstalledTest {}" << "QDeclarativeText" << ""; QTest::newRow("installed import minor version not available") // QTBUG-11936 - << "import com.nokia.installedtest 0.1\n" + << "import org.qtproject.installedtest 0.1\n" "InstalledTest {}" << "" - << "module \"com.nokia.installedtest\" version 0.1 is not installed"; + << "module \"org.qtproject.installedtest\" version 0.1 is not installed"; QTest::newRow("installed import minor version not available") // QTBUG-9627 - << "import com.nokia.installedtest 1.10\n" + << "import org.qtproject.installedtest 1.10\n" "InstalledTest {}" << "" - << "module \"com.nokia.installedtest\" version 1.10 is not installed"; + << "module \"org.qtproject.installedtest\" version 1.10 is not installed"; QTest::newRow("installed import major version not available") // QTBUG-9627 - << "import com.nokia.installedtest 9.0\n" + << "import org.qtproject.installedtest 9.0\n" "InstalledTest {}" << "" - << "module \"com.nokia.installedtest\" version 9.0 is not installed"; + << "module \"org.qtproject.installedtest\" version 9.0 is not installed"; QTest::newRow("installed import visibility") // QT-614 - << "import com.nokia.installedtest 1.4\n" + << "import org.qtproject.installedtest 1.4\n" "PrivateType {}" << "" << "PrivateType is not a type"; @@ -1752,60 +1752,60 @@ void tst_qdeclarativelanguage::importsOrder_data() QTest::addColumn<QString>("error"); QTest::newRow("double import") << - "import com.nokia.installedtest 1.4\n" - "import com.nokia.installedtest 1.4\n" + "import org.qtproject.installedtest 1.4\n" + "import org.qtproject.installedtest 1.4\n" "InstalledTest {}" << (!qmlCheckTypes()?"QDeclarativeText":"") - << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.4 and 1.4"); + << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.4 and 1.4"); QTest::newRow("installed import overrides 1") << - "import com.nokia.installedtest 1.0\n" - "import com.nokia.installedtest 1.4\n" + "import org.qtproject.installedtest 1.0\n" + "import org.qtproject.installedtest 1.4\n" "InstalledTest {}" << (!qmlCheckTypes()?"QDeclarativeText":"") - << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.4 and 1.0"); + << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.4 and 1.0"); QTest::newRow("installed import overrides 2") << - "import com.nokia.installedtest 1.4\n" - "import com.nokia.installedtest 1.0\n" + "import org.qtproject.installedtest 1.4\n" + "import org.qtproject.installedtest 1.0\n" "InstalledTest {}" << (!qmlCheckTypes()?"QDeclarativeRectangle":"") - << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.0 and 1.4"); + << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.0 and 1.4"); QTest::newRow("installed import re-overrides 1") << - "import com.nokia.installedtest 1.4\n" - "import com.nokia.installedtest 1.0\n" - "import com.nokia.installedtest 1.4\n" + "import org.qtproject.installedtest 1.4\n" + "import org.qtproject.installedtest 1.0\n" + "import org.qtproject.installedtest 1.4\n" "InstalledTest {}" << (!qmlCheckTypes()?"QDeclarativeText":"") - << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.4 and 1.0"); + << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.4 and 1.0"); QTest::newRow("installed import re-overrides 2") << - "import com.nokia.installedtest 1.4\n" - "import com.nokia.installedtest 1.0\n" - "import com.nokia.installedtest 1.4\n" - "import com.nokia.installedtest 1.0\n" + "import org.qtproject.installedtest 1.4\n" + "import org.qtproject.installedtest 1.0\n" + "import org.qtproject.installedtest 1.4\n" + "import org.qtproject.installedtest 1.0\n" "InstalledTest {}" << (!qmlCheckTypes()?"QDeclarativeRectangle":"") - << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/com/nokia/installedtest in version 1.0 and 1.4"); + << (!qmlCheckTypes()?"":"InstalledTest is ambiguous. Found in lib/org/qtproject/installedtest in version 1.0 and 1.4"); QTest::newRow("installed import versus builtin 1") << - "import com.nokia.installedtest 1.5\n" + "import org.qtproject.installedtest 1.5\n" "import QtQuick 1.0\n" "Rectangle {}" << (!qmlCheckTypes()?"QDeclarativeRectangle":"") - << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in Qt and in lib/com/nokia/installedtest"); + << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in Qt and in lib/org/qtproject/installedtest"); QTest::newRow("installed import versus builtin 2") << "import QtQuick 1.0\n" - "import com.nokia.installedtest 1.5\n" + "import org.qtproject.installedtest 1.5\n" "Rectangle {}" << (!qmlCheckTypes()?"QDeclarativeText":"") - << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/com/nokia/installedtest and in Qt"); + << (!qmlCheckTypes()?"":"Rectangle is ambiguous. Found in lib/org/qtproject/installedtest and in Qt"); QTest::newRow("namespaces cannot be overridden by types 1") << "import QtQuick 1.0 as Rectangle\n" - "import com.nokia.installedtest 1.5\n" + "import org.qtproject.installedtest 1.5\n" "Rectangle {}" << "" << "Namespace Rectangle cannot be used as a type"; QTest::newRow("namespaces cannot be overridden by types 2") << "import QtQuick 1.0 as Rectangle\n" - "import com.nokia.installedtest 1.5\n" + "import org.qtproject.installedtest 1.5\n" "Rectangle.Image {}" << "QDeclarativeImage" << ""; @@ -1814,15 +1814,15 @@ void tst_qdeclarativelanguage::importsOrder_data() << "QDeclarativeText" << ""; QTest::newRow("local last 2") << - "import com.nokia.installedtest 1.0\n" + "import org.qtproject.installedtest 1.0\n" "LocalLast {}" - << (!qmlCheckTypes()?"QDeclarativeRectangle":"")// i.e. from com.nokia.installedtest, not data/LocalLast.qml - << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/com/nokia/installedtest and in local directory"); + << (!qmlCheckTypes()?"QDeclarativeRectangle":"")// i.e. from org.qtproject.installedtest, not data/LocalLast.qml + << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/org/qtproject/installedtest and in local directory"); QTest::newRow("local last 3") << - "import com.nokia.installedtest 1.0\n" + "import org.qtproject.installedtest 1.0\n" "LocalLast {LocalLast2{}}" - << (!qmlCheckTypes()?"QDeclarativeRectangle":"")// i.e. from com.nokia.installedtest, not data/LocalLast.qml - << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/com/nokia/installedtest and in local directory"); + << (!qmlCheckTypes()?"QDeclarativeRectangle":"")// i.e. from org.qtproject.installedtest, not data/LocalLast.qml + << (!qmlCheckTypes()?"":"LocalLast is ambiguous. Found in lib/org/qtproject/installedtest and in local directory"); } void tst_qdeclarativelanguage::importsOrder() @@ -1980,17 +1980,17 @@ void tst_qdeclarativelanguage::initTestCase() qmlRegisterType(testFileUrl("MyComponentType.qml"), "Test", 1, 0, "MyComponentType"); // Registering the TestType class in other modules should have no adverse effects - qmlRegisterType<TestType>("com.nokia.TestPre", 1, 0, "Test"); + qmlRegisterType<TestType>("org.qtproject.TestPre", 1, 0, "Test"); - qmlRegisterType<TestType>("com.nokia.Test", 0, 0, "TestTP"); - qmlRegisterType<TestType>("com.nokia.Test", 1, 0, "Test"); - qmlRegisterType<TestType>("com.nokia.Test", 1, 5, "Test"); - qmlRegisterType<TestType2>("com.nokia.Test", 1, 8, "Test"); - qmlRegisterType<TestType>("com.nokia.Test", 1, 9, "OldTest"); - qmlRegisterType<TestType2>("com.nokia.Test", 1, 12, "Test"); + qmlRegisterType<TestType>("org.qtproject.Test", 0, 0, "TestTP"); + qmlRegisterType<TestType>("org.qtproject.Test", 1, 0, "Test"); + qmlRegisterType<TestType>("org.qtproject.Test", 1, 5, "Test"); + qmlRegisterType<TestType2>("org.qtproject.Test", 1, 8, "Test"); + qmlRegisterType<TestType>("org.qtproject.Test", 1, 9, "OldTest"); + qmlRegisterType<TestType2>("org.qtproject.Test", 1, 12, "Test"); // Registering the TestType class in other modules should have no adverse effects - qmlRegisterType<TestType>("com.nokia.TestPost", 1, 0, "Test"); + qmlRegisterType<TestType>("org.qtproject.TestPost", 1, 0, "Test"); // Create locale-specific file // For POSIX, this will just be data/I18nType.qml, since POSIX is 7-bit diff --git a/tests/auto/declarative/qdeclarativepathview/data/initialCurrentIndex.qml b/tests/auto/declarative/qdeclarativepathview/data/initialCurrentIndex.qml new file mode 100644 index 00000000..e6361522 --- /dev/null +++ b/tests/auto/declarative/qdeclarativepathview/data/initialCurrentIndex.qml @@ -0,0 +1,60 @@ +import QtQuick 1.1 + +PathView { + id: photoPathView + y: 100; width: 800; height: 330; pathItemCount: 4 + currentIndex: 3 + dragMargin: 24 + preferredHighlightBegin: 0.50 + preferredHighlightEnd: 0.50 + + path: Path { + startX: -50; startY: 40; + + PathAttribute { name: "scale"; value: 0.5 } + PathAttribute { name: "angle"; value: -45 } + + PathCubic { + x: 400; y: 220 + control1X: 140; control1Y: 40 + control2X: 210; control2Y: 220 + } + + PathAttribute { name: "scale"; value: 1.2 } + PathAttribute { name: "angle"; value: 0 } + + PathCubic { + x: 850; y: 40 + control2X: 660; control2Y: 40 + control1X: 590; control1Y: 220 + } + + PathAttribute { name: "scale"; value: 0.5 } + PathAttribute { name: "angle"; value: 45 } + } + + model: ListModel { + id: rssModel + ListElement { lColor: "red" } + ListElement { lColor: "green" } + ListElement { lColor: "yellow" } + ListElement { lColor: "blue" } + ListElement { lColor: "purple" } + ListElement { lColor: "gray" } + ListElement { lColor: "brown" } + ListElement { lColor: "thistle" } + } + + delegate: Component { + id: photoDelegate + Rectangle { + id: wrapper + width: 85; height: 85; color: lColor + + transform: Rotation { + id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2 + axis.y: 1; axis.z: 0 + } + } + } +} diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp index 247c19e3..0d7dbe6f 100644 --- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp +++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp @@ -56,6 +56,33 @@ #include <QStandardItemModel> #include <QFile> +template<typename T> +static void qdeclarativepathview_move(int from, int to, int n, T *items) +{ + if (from > to) { + // Only move forwards - flip if backwards moving + int tfrom = from; + int tto = to; + from = tto; + to = tto+n; + n = tfrom-tto; + } + + T replaced; + int i=0; + typename T::ConstIterator it=items->begin(); it += from+n; + for (; i<to-from; ++i,++it) + replaced.append(*it); + i=0; + it=items->begin(); it += from; + for (; i<n; ++i,++it) + replaced.append(*it); + typename T::ConstIterator f=replaced.begin(); + typename T::Iterator t=items->begin(); t += from; + for (; f != replaced.end(); ++f, ++t) + *t = *f; +} + static void initStandardTreeModel(QStandardItemModel *model) { QStandardItem *item; @@ -87,6 +114,13 @@ private slots: void dataModel(); void pathview2(); void pathview3(); + void initialCurrentIndex(); + void insertModel_data(); + void insertModel(); + void removeModel_data(); + void removeModel(); + void moveModel_data(); + void moveModel(); void path(); void pathMoved(); void setCurrentIndex(); @@ -183,18 +217,41 @@ public: endInsertRows(); } + void insertItems(int index, const QList<QPair<QString, QString> > &items) + { + emit beginInsertRows(QModelIndex(), index, index+items.count()-1); + for (int i=0; i<items.count(); i++) + list.insert(index + i, QPair<QString,QString>(items[i].first, items[i].second)); + emit endInsertRows(); + } + void removeItem(int index) { beginRemoveRows(QModelIndex(), index, index); list.removeAt(index); endRemoveRows(); } + void removeItems(int index, int count) + { + emit beginRemoveRows(QModelIndex(), index, index+count-1); + while (count--) + list.removeAt(index); + emit endRemoveRows(); + } + void moveItem(int from, int to) { beginMoveRows(QModelIndex(), from, from, QModelIndex(), to); list.move(from, to); endMoveRows(); } + void moveItems(int from, int to, int count) + { + emit beginMoveRows(QModelIndex(), from, from+count-1, QModelIndex(), to > from ? to+count : to); + qdeclarativepathview_move(from, to, count, &list); + emit endMoveRows(); + } + void modifyItem(int idx, const QString &name, const QString &number) { list[idx] = QPair<QString,QString>(name, number); emit dataChanged(index(idx,0), index(idx,0)); @@ -308,6 +365,116 @@ void tst_QDeclarativePathView::pathview3() QCOMPARE(obj->pathItemCount(), 4); } +void tst_QDeclarativePathView::initialCurrentIndex() +{ + QDeclarativeEngine engine; + QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/initialCurrentIndex.qml")); + QDeclarativePathView *obj = qobject_cast<QDeclarativePathView*>(c.create()); + + QVERIFY(obj != 0); + QVERIFY(obj->path() != 0); + QVERIFY(obj->delegate() != 0); + QVERIFY(obj->model() != QVariant()); + QCOMPARE(obj->currentIndex(), 3); + QCOMPARE(obj->offset(), 5.0); + QCOMPARE(obj->preferredHighlightBegin(), 0.5); + QCOMPARE(obj->dragMargin(), 24.); + QCOMPARE(obj->count(), 8); + QCOMPARE(obj->pathItemCount(), 4); + + delete obj; +} + +void tst_QDeclarativePathView::insertModel_data() +{ + QTest::addColumn<int>("mode"); + QTest::addColumn<int>("idx"); + QTest::addColumn<int>("count"); + QTest::addColumn<qreal>("offset"); + QTest::addColumn<int>("currentIndex"); + + // We have 8 items, with currentIndex == 4 + QTest::newRow("insert after current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 6 << 1 << 5. << 4; + QTest::newRow("insert before current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 2 << 1 << 4. << 5; + QTest::newRow("insert multiple after current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 5 << 2 << 6. << 4; + QTest::newRow("insert multiple before current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 1 << 2 << 4. << 6; + QTest::newRow("insert at end") + << int(QDeclarativePathView::StrictlyEnforceRange) << 8 << 1 << 5. << 4; + QTest::newRow("insert at beginning") + << int(QDeclarativePathView::StrictlyEnforceRange) << 0 << 1 << 4. << 5; + QTest::newRow("insert at current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 4 << 1 << 4. << 5; + + QTest::newRow("no range - insert after current") + << int(QDeclarativePathView::NoHighlightRange) << 6 << 1 << 5. << 4; + QTest::newRow("no range - insert before current") + << int(QDeclarativePathView::NoHighlightRange) << 2 << 1 << 4. << 5; + QTest::newRow("no range - insert multiple after current") + << int(QDeclarativePathView::NoHighlightRange) << 5 << 2 << 6. << 4; + QTest::newRow("no range - insert multiple before current") + << int(QDeclarativePathView::NoHighlightRange) << 1 << 2 << 4. << 6; + QTest::newRow("no range - insert at end") + << int(QDeclarativePathView::NoHighlightRange) << 8 << 1 << 5. << 4; + QTest::newRow("no range - insert at beginning") + << int(QDeclarativePathView::NoHighlightRange) << 0 << 1 << 4. << 5; + QTest::newRow("no range - insert at current") + << int(QDeclarativePathView::NoHighlightRange) << 4 << 1 << 4. << 5; +} + +void tst_QDeclarativePathView::insertModel() +{ + QFETCH(int, mode); + QFETCH(int, idx); + QFETCH(int, count); + QFETCH(qreal, offset); + QFETCH(int, currentIndex); + + QDeclarativeView *window = createView(); + window->show(); + + TestModel model; + model.addItem("Ben", "12345"); + model.addItem("Bohn", "2345"); + model.addItem("Bob", "54321"); + model.addItem("Bill", "4321"); + model.addItem("Jinny", "679"); + model.addItem("Milly", "73378"); + model.addItem("Jimmy", "3535"); + model.addItem("Barb", "9039"); + + QDeclarativeContext *ctxt = window->rootContext(); + ctxt->setContextProperty("testModel", &model); + + window->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview0.qml")); + qApp->processEvents(); + + QDeclarativePathView *pathview = findItem<QDeclarativePathView>(window->rootObject(), "view"); + QVERIFY(pathview != 0); + + pathview->setHighlightRangeMode((QDeclarativePathView::HighlightRangeMode)mode); + + pathview->setCurrentIndex(4); + if (mode == QDeclarativePathView::StrictlyEnforceRange) + QTRY_COMPARE(pathview->offset(), 4.0); + else + pathview->setOffset(4); + + QList<QPair<QString, QString> > items; + for (int i = 0; i < count; ++i) + items.append(qMakePair(QString("New"), QString::number(i))); + + model.insertItems(idx, items); + QTRY_COMPARE(pathview->offset(), offset); + + QCOMPARE(pathview->currentIndex(), currentIndex); + + delete window; +} + void tst_QDeclarativePathView::path() { QDeclarativeEngine engine; @@ -353,6 +520,192 @@ void tst_QDeclarativePathView::path() QCOMPARE(cubic->control2Y(), 90.); } +void tst_QDeclarativePathView::removeModel_data() +{ + QTest::addColumn<int>("mode"); + QTest::addColumn<int>("idx"); + QTest::addColumn<int>("count"); + QTest::addColumn<qreal>("offset"); + QTest::addColumn<int>("currentIndex"); + + // We have 8 items, with currentIndex == 4 + QTest::newRow("remove after current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 6 << 1 << 3. << 4; + QTest::newRow("remove before current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 2 << 1 << 4. << 3; + QTest::newRow("remove multiple after current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 5 << 2 << 2. << 4; + QTest::newRow("remove multiple before current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 1 << 2 << 4. << 2; + QTest::newRow("remove last") + << int(QDeclarativePathView::StrictlyEnforceRange) << 7 << 1 << 3. << 4; + QTest::newRow("remove first") + << int(QDeclarativePathView::StrictlyEnforceRange) << 0 << 1 << 4. << 3; + QTest::newRow("remove current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 4 << 1 << 3. << 4; + QTest::newRow("remove all") + << int(QDeclarativePathView::StrictlyEnforceRange) << 0 << 8 << 0. << 0; + + QTest::newRow("no range - remove after current") + << int(QDeclarativePathView::NoHighlightRange) << 6 << 1 << 3. << 4; + QTest::newRow("no range - remove before current") + << int(QDeclarativePathView::NoHighlightRange) << 2 << 1 << 4. << 3; + QTest::newRow("no range - remove multiple after current") + << int(QDeclarativePathView::NoHighlightRange) << 5 << 2 << 2. << 4; + QTest::newRow("no range - remove multiple before current") + << int(QDeclarativePathView::NoHighlightRange) << 1 << 2 << 4. << 2; + QTest::newRow("no range - remove last") + << int(QDeclarativePathView::NoHighlightRange) << 7 << 1 << 3. << 4; + QTest::newRow("no range - remove first") + << int(QDeclarativePathView::NoHighlightRange) << 0 << 1 << 4. << 3; + QTest::newRow("no range - remove current offset") + << int(QDeclarativePathView::NoHighlightRange) << 4 << 1 << 4. << 4; + QTest::newRow("no range - remove all") + << int(QDeclarativePathView::NoHighlightRange) << 0 << 8 << 0. << 0; +} + +void tst_QDeclarativePathView::removeModel() +{ + QFETCH(int, mode); + QFETCH(int, idx); + QFETCH(int, count); + QFETCH(qreal, offset); + QFETCH(int, currentIndex); + + QDeclarativeView *window = createView(); + window->show(); + + TestModel model; + model.addItem("Ben", "12345"); + model.addItem("Bohn", "2345"); + model.addItem("Bob", "54321"); + model.addItem("Bill", "4321"); + model.addItem("Jinny", "679"); + model.addItem("Milly", "73378"); + model.addItem("Jimmy", "3535"); + model.addItem("Barb", "9039"); + + QDeclarativeContext *ctxt = window->rootContext(); + ctxt->setContextProperty("testModel", &model); + + window->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview0.qml")); + qApp->processEvents(); + + QDeclarativePathView *pathview = findItem<QDeclarativePathView>(window->rootObject(), "view"); + QVERIFY(pathview != 0); + + pathview->setHighlightRangeMode((QDeclarativePathView::HighlightRangeMode)mode); + + pathview->setCurrentIndex(4); + if (mode == QDeclarativePathView::StrictlyEnforceRange) + QTRY_COMPARE(pathview->offset(), 4.0); + else + pathview->setOffset(4); + + model.removeItems(idx, count); + QTRY_COMPARE(pathview->offset(), offset); + + QCOMPARE(pathview->currentIndex(), currentIndex); + + delete window; +} +void tst_QDeclarativePathView::moveModel_data() +{ + QTest::addColumn<int>("mode"); + QTest::addColumn<int>("from"); + QTest::addColumn<int>("to"); + QTest::addColumn<int>("count"); + QTest::addColumn<qreal>("offset"); + QTest::addColumn<int>("currentIndex"); + + // We have 8 items, with currentIndex == 4 + QTest::newRow("move after current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 5 << 6 << 1 << 4. << 4; + QTest::newRow("move before current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 2 << 3 << 1 << 4. << 4; + QTest::newRow("move before current to after") + << int(QDeclarativePathView::StrictlyEnforceRange) << 2 << 6 << 1 << 5. << 3; + QTest::newRow("move multiple after current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 5 << 6 << 2 << 4. << 4; + QTest::newRow("move multiple before current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 0 << 1 << 2 << 4. << 4; + QTest::newRow("move before current to end") + << int(QDeclarativePathView::StrictlyEnforceRange) << 2 << 7 << 1 << 5. << 3; + QTest::newRow("move last to beginning") + << int(QDeclarativePathView::StrictlyEnforceRange) << 7 << 0 << 1 << 3. << 5; + QTest::newRow("move current") + << int(QDeclarativePathView::StrictlyEnforceRange) << 4 << 6 << 1 << 2. << 6; + + QTest::newRow("no range - move after current") + << int(QDeclarativePathView::NoHighlightRange) << 5 << 6 << 1 << 4. << 4; + QTest::newRow("no range - move before current") + << int(QDeclarativePathView::NoHighlightRange) << 2 << 3 << 1 << 4. << 4; + QTest::newRow("no range - move before current to after") + << int(QDeclarativePathView::NoHighlightRange) << 2 << 6 << 1 << 5. << 3; + QTest::newRow("no range - move multiple after current") + << int(QDeclarativePathView::NoHighlightRange) << 5 << 6 << 2 << 4. << 4; + QTest::newRow("no range - move multiple before current") + << int(QDeclarativePathView::NoHighlightRange) << 0 << 1 << 2 << 4. << 4; + QTest::newRow("no range - move before current to end") + << int(QDeclarativePathView::NoHighlightRange) << 2 << 7 << 1 << 5. << 3; + QTest::newRow("no range - move last to beginning") + << int(QDeclarativePathView::NoHighlightRange) << 7 << 0 << 1 << 3. << 5; + QTest::newRow("no range - move current") + << int(QDeclarativePathView::NoHighlightRange) << 4 << 6 << 1 << 4. << 6; + QTest::newRow("no range - move multiple incl. current") + << int(QDeclarativePathView::NoHighlightRange) << 0 << 1 << 5 << 4. << 5; +} + +void tst_QDeclarativePathView::moveModel() +{ + QFETCH(int, mode); + QFETCH(int, from); + QFETCH(int, to); + QFETCH(int, count); + QFETCH(qreal, offset); + QFETCH(int, currentIndex); + + QDeclarativeView *window = createView(); + window->show(); + + TestModel model; + model.addItem("Ben", "12345"); + model.addItem("Bohn", "2345"); + model.addItem("Bob", "54321"); + model.addItem("Bill", "4321"); + model.addItem("Jinny", "679"); + model.addItem("Milly", "73378"); + model.addItem("Jimmy", "3535"); + model.addItem("Barb", "9039"); + + QDeclarativeContext *ctxt = window->rootContext(); + ctxt->setContextProperty("testModel", &model); + + window->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview0.qml")); + qApp->processEvents(); + + QDeclarativePathView *pathview = findItem<QDeclarativePathView>(window->rootObject(), "view"); + QVERIFY(pathview != 0); + + pathview->setHighlightRangeMode((QDeclarativePathView::HighlightRangeMode)mode); + + pathview->setCurrentIndex(4); + if (mode == QDeclarativePathView::StrictlyEnforceRange) + QTRY_COMPARE(pathview->offset(), 4.0); + else + pathview->setOffset(4); + + model.moveItems(from, to, count); + + // don't enable this test as 371b2f6947779272494b34ec44445aaad0613756 has + // not been backported to QtQuick1 so offset is still buggy +// QTRY_COMPARE(pathview->offset(), offset); + + QCOMPARE(pathview->currentIndex(), currentIndex); + + delete window; +} + void tst_QDeclarativePathView::dataModel() { QDeclarativeView *canvas = createView(); @@ -586,6 +939,20 @@ void tst_QDeclarativePathView::setCurrentIndex() QVERIFY(firstItem); QTRY_COMPARE(firstItem->pos() + offset, start); + // Test positive indexes are wrapped. + pathview->setCurrentIndex(6); + QTRY_COMPARE(pathview->currentIndex(), 2); + firstItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 2); + QVERIFY(firstItem); + QTRY_COMPARE(firstItem->pos() + offset, start); + + // Test negative indexes are wrapped. + pathview->setCurrentIndex(-3); + QTRY_COMPARE(pathview->currentIndex(), 1); + firstItem = findItem<QDeclarativeRectangle>(pathview, "wrapper", 1); + QVERIFY(firstItem); + QTRY_COMPARE(firstItem->pos() + offset, start); + delete canvas; } diff --git a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro index bd0ba7c4..64481a08 100644 --- a/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro +++ b/tests/auto/declarative/qdeclarativetext/qdeclarativetext.pro @@ -16,3 +16,5 @@ DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +CONFIG += insignificant_test # QTBUG-21015 diff --git a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro index 566ca6c6..d4a5e771 100644 --- a/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro +++ b/tests/auto/declarative/qdeclarativetextedit/qdeclarativetextedit.pro @@ -5,8 +5,9 @@ QT += testlib contains(QT_CONFIG,declarative): QT += declarative declarative-private gui gui-private widgets widgets-private network core-private macx:CONFIG -= app_bundle +include(../shared/qdeclarativedatatest.pri) + SOURCES += tst_qdeclarativetextedit.cpp ../shared/testhttpserver.cpp HEADERS += ../shared/testhttpserver.h -DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 9c899445..2d71ca4b 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -41,6 +41,7 @@ #include <qtest.h> #include <QtTest/QSignalSpy> #include "../shared/testhttpserver.h" +#include <qdeclarativedatatest.h> #include <math.h> #include <QFile> #include <QTextDocument> @@ -63,20 +64,20 @@ Q_DECLARE_METATYPE(QDeclarativeTextEdit::SelectionMode) -QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual) +// Make a widget frameless to prevent size constraints of title bars +// from interfering (Windows). +static inline void setFrameless(QWidget *w) { - // XXX This will be replaced by some clever persistent platform image store. - QString persistent_dir = SRCDIR "/data"; - QString arch = "unknown-architecture"; // QTest needs to help with this. - - QString expectfile = persistent_dir + QDir::separator() + filebasename + "-" + arch + ".png"; - - if (!QFile::exists(expectfile)) { - actual.save(expectfile); - qWarning() << "created" << expectfile; - } + Qt::WindowFlags flags = w->windowFlags(); + flags |= Qt::FramelessWindowHint; + flags &= ~(Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); + w->setWindowFlags(flags); +} - return expectfile; +// Helper message for comparisons +static inline QByteArray msgComparison(int v1, int v2) +{ + return QByteArray::number(v1) + ' ' + QByteArray::number(v2); } void sendPreeditText(const QString &text, int cursor) @@ -90,7 +91,7 @@ void sendPreeditText(const QString &text, int cursor) } -class tst_qdeclarativetextedit : public QObject +class tst_qdeclarativetextedit : public QDeclarativeDataTest { Q_OBJECT @@ -168,6 +169,7 @@ private slots: private: void simulateKey(QDeclarativeView *, int key, Qt::KeyboardModifiers modifiers = 0); QDeclarativeView *createView(const QString &filename); + QString alignmentReferenceImage(const QString& filebasename) const; QStringList standard; QStringList richText; @@ -395,6 +397,12 @@ void tst_qdeclarativetextedit::alignments_data() QTest::newRow("CC") << int(Qt::AlignHCenter) << int(Qt::AlignVCenter) << "alignments_cc"; } +QString tst_qdeclarativetextedit::alignmentReferenceImage(const QString& filebasename) const +{ + // XXX This will be replaced by some clever persistent platform image store. + static const QString arch = QGuiApplication::platformName() + QLatin1Char('-') + qApp->style()->objectName(); + return testFile(filebasename + QLatin1Char('-') + arch + QStringLiteral(".png")); +} void tst_qdeclarativetextedit::alignments() { @@ -402,7 +410,14 @@ void tst_qdeclarativetextedit::alignments() QFETCH(int, vAlign); QFETCH(QString, expectfile); - QDeclarativeView *canvas = createView(SRCDIR "/data/alignments.qml"); + const QString referenceImage = alignmentReferenceImage(expectfile); + if (!QFile(referenceImage).exists()) + QSKIP(qPrintable(QStringLiteral("Reference image '") + + QDir::toNativeSeparators(referenceImage) + + QStringLiteral("' does not exist."))); + + QDeclarativeView *canvas = createView(testFile("alignments.qml")); + setFrameless(canvas); canvas->show(); QApplication::setActiveWindow(canvas); @@ -419,9 +434,8 @@ void tst_qdeclarativetextedit::alignments() QPainter p(&actual); canvas->render(&p); - expectfile = createExpectedFileIfNotFound(expectfile, actual); - - QImage expect(expectfile); + QImage expect(referenceImage); + QVERIFY(!expect.isNull()); QCOMPARE(actual,expect); @@ -466,7 +480,7 @@ void tst_qdeclarativetextedit::hAlign() void tst_qdeclarativetextedit::hAlign_RightToLeft() { - QDeclarativeView *canvas = createView(SRCDIR "/data/horizontalAlignment_RightToLeft.qml"); + QDeclarativeView *canvas = createView(testFile("horizontalAlignment_RightToLeft.qml")); QDeclarativeTextEdit *textEdit = canvas->rootObject()->findChild<QDeclarativeTextEdit*>("text"); QVERIFY(textEdit != 0); canvas->show(); @@ -957,7 +971,7 @@ void tst_qdeclarativetextedit::isRightToLeft() void tst_qdeclarativetextedit::keySelection() { - QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml"); + QDeclarativeView *canvas = createView(testFile("navigation.qml")); canvas->show(); QApplication::setActiveWindow(canvas); QVERIFY(QTest::qWaitForWindowActive(canvas)); @@ -1349,19 +1363,19 @@ void tst_qdeclarativetextedit::mouseSelection_data() QTest::addColumn<QString>("selectedText"); // import installed - QTest::newRow("on") << SRCDIR "/data/mouseselection_true.qml" << 4 << 9 << "45678"; - QTest::newRow("off") << SRCDIR "/data/mouseselection_false.qml" << 4 << 9 << QString(); - QTest::newRow("default") << SRCDIR "/data/mouseselection_default.qml" << 4 << 9 << QString(); - QTest::newRow("off word selection") << SRCDIR "/data/mouseselection_false_words.qml" << 4 << 9 << QString(); - QTest::newRow("on word selection (4,9)") << SRCDIR "/data/mouseselection_true_words.qml" << 4 << 9 << "0123456789"; - QTest::newRow("on word selection (2,13)") << SRCDIR "/data/mouseselection_true_words.qml" << 2 << 13 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (2,30)") << SRCDIR "/data/mouseselection_true_words.qml" << 2 << 30 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (9,13)") << SRCDIR "/data/mouseselection_true_words.qml" << 9 << 13 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (9,30)") << SRCDIR "/data/mouseselection_true_words.qml" << 9 << 30 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (13,2)") << SRCDIR "/data/mouseselection_true_words.qml" << 13 << 2 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (20,2)") << SRCDIR "/data/mouseselection_true_words.qml" << 20 << 2 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (12,9)") << SRCDIR "/data/mouseselection_true_words.qml" << 12 << 9 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - QTest::newRow("on word selection (30,9)") << SRCDIR "/data/mouseselection_true_words.qml" << 30 << 9 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on") << testFile("mouseselection_true.qml") << 4 << 9 << "45678"; + QTest::newRow("off") << testFile("mouseselection_false.qml") << 4 << 9 << QString(); + QTest::newRow("default") << testFile("mouseselection_default.qml") << 4 << 9 << QString(); + QTest::newRow("off word selection") << testFile("mouseselection_false_words.qml") << 4 << 9 << QString(); + QTest::newRow("on word selection (4,9)") << testFile("mouseselection_true_words.qml") << 4 << 9 << "0123456789"; + QTest::newRow("on word selection (2,13)") << testFile("mouseselection_true_words.qml") << 2 << 13 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (2,30)") << testFile("mouseselection_true_words.qml") << 2 << 30 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (9,13)") << testFile("mouseselection_true_words.qml") << 9 << 13 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (9,30)") << testFile("mouseselection_true_words.qml") << 9 << 30 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (13,2)") << testFile("mouseselection_true_words.qml") << 13 << 2 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (20,2)") << testFile("mouseselection_true_words.qml") << 20 << 2 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (12,9)") << testFile("mouseselection_true_words.qml") << 12 << 9 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + QTest::newRow("on word selection (30,9)") << testFile("mouseselection_true_words.qml") << 30 << 9 << "0123456789 ABCDEFGHIJKLMNOPQRSTUVWXYZ"; } void tst_qdeclarativetextedit::mouseSelection() @@ -1403,8 +1417,7 @@ void tst_qdeclarativetextedit::mouseSelection() void tst_qdeclarativetextedit::multilineMouseSelection() { - QDeclarativeView *canvas = createView(SRCDIR "/data/mouseselection_multiline.qml"); - + QDeclarativeView *canvas = createView(testFile("mouseselection_multiline.qml")); canvas->show(); QApplication::setActiveWindow(canvas); QVERIFY(QTest::qWaitForWindowActive(canvas)); @@ -1440,8 +1453,8 @@ void tst_qdeclarativetextedit::deferEnableSelectByMouse_data() { QTest::addColumn<QString>("qmlfile"); - QTest::newRow("writable") << SRCDIR "/data/mouseselection_false.qml"; - QTest::newRow("read only") << SRCDIR "/data/mouseselection_false_readonly.qml"; + QTest::newRow("writable") << testFile("mouseselection_false.qml"); + QTest::newRow("read only") << testFile("mouseselection_false_readonly.qml"); } void tst_qdeclarativetextedit::deferEnableSelectByMouse() @@ -1480,8 +1493,8 @@ void tst_qdeclarativetextedit::deferDisableSelectByMouse_data() { QTest::addColumn<QString>("qmlfile"); - QTest::newRow("writable") << SRCDIR "/data/mouseselection_true.qml"; - QTest::newRow("read only") << SRCDIR "/data/mouseselection_true_readonly.qml"; + QTest::newRow("writable") << testFile("mouseselection_true.qml"); + QTest::newRow("read only") << testFile("mouseselection_true_readonly.qml"); } void tst_qdeclarativetextedit::deferDisableSelectByMouse() @@ -1518,7 +1531,7 @@ void tst_qdeclarativetextedit::deferDisableSelectByMouse() void tst_qdeclarativetextedit::dragMouseSelection() { - QString qmlfile = SRCDIR "/data/mouseselection_true.qml"; + QString qmlfile = testFile("mouseselection_true.qml"); QDeclarativeView *canvas = createView(qmlfile); @@ -1569,9 +1582,9 @@ void tst_qdeclarativetextedit::mouseSelectionMode_data() QTest::addColumn<bool>("selectWords"); // import installed - QTest::newRow("SelectWords") << SRCDIR "/data/mouseselectionmode_words.qml" << true; - QTest::newRow("SelectCharacters") << SRCDIR "/data/mouseselectionmode_characters.qml" << false; - QTest::newRow("default") << SRCDIR "/data/mouseselectionmode_default.qml" << false; + QTest::newRow("SelectWords") << testFile("mouseselectionmode_words.qml") << true; + QTest::newRow("SelectCharacters") << testFile("mouseselectionmode_characters.qml") << false; + QTest::newRow("default") << testFile("mouseselectionmode_default.qml") << false; } void tst_qdeclarativetextedit::mouseSelectionMode() @@ -1620,7 +1633,8 @@ void tst_qdeclarativetextedit::mouseSelectionMode() void tst_qdeclarativetextedit::inputMethodHints() { - QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml"); + QDeclarativeView *canvas = createView(testFile("inputmethodhints.qml")); + setFrameless(canvas); canvas->show(); canvas->setFocus(); @@ -1636,8 +1650,9 @@ void tst_qdeclarativetextedit::inputMethodHints() void tst_qdeclarativetextedit::positionAt() { - QDeclarativeView *canvas = createView(SRCDIR "/data/positionAt.qml"); + QDeclarativeView *canvas = createView(testFile("positionAt.qml")); QVERIFY(canvas->rootObject() != 0); + setFrameless(canvas); canvas->show(); canvas->setFocus(); QApplication::setActiveWindow(canvas); @@ -1676,8 +1691,9 @@ void tst_qdeclarativetextedit::positionAt() int widthBegin = floor(line.cursorToX(pos - 1)); int widthEnd = ceil(line.cursorToX(pos + 1)); - QVERIFY(widthBegin <= texteditObject->width() / 2); - QVERIFY(widthEnd >= texteditObject->width() / 2); + const int halfObjectWidth = texteditObject->width() / 2; + QVERIFY2(widthBegin <= halfObjectWidth, msgComparison(widthBegin, halfObjectWidth).constData()); + QVERIFY2(widthEnd >= halfObjectWidth, msgComparison(widthEnd, halfObjectWidth).constData()); const qreal x0 = texteditObject->positionToRectangle(pos).x(); const qreal x1 = texteditObject->positionToRectangle(pos + 1).x(); @@ -1705,7 +1721,7 @@ void tst_qdeclarativetextedit::positionAt() void tst_qdeclarativetextedit::cursorDelegate() { - QDeclarativeView* view = createView(SRCDIR "/data/cursorTest.qml"); + QDeclarativeView* view = createView(testFile("cursorTest.qml")); view->show(); view->setFocus(); QDeclarativeTextEdit *textEditObject = view->rootObject()->findChild<QDeclarativeTextEdit*>("textEditObject"); @@ -1877,9 +1893,9 @@ void tst_qdeclarativetextedit::delegateLoading() QFETCH(QString, error); TestHTTPServer server(42332); - server.serveDirectory(SRCDIR "/data/httpfail", TestHTTPServer::Disconnect); - server.serveDirectory(SRCDIR "/data/httpslow", TestHTTPServer::Delay); - server.serveDirectory(SRCDIR "/data/http"); + server.serveDirectory(testFile("httpfail"), TestHTTPServer::Disconnect); + server.serveDirectory(testFile("httpslow"), TestHTTPServer::Delay); + server.serveDirectory(testFile("http")); QDeclarativeView* view = new QDeclarativeView(0); @@ -1922,7 +1938,7 @@ the extent of the text, then they should ignore the keys. */ void tst_qdeclarativetextedit::navigation() { - QDeclarativeView *canvas = createView(SRCDIR "/data/navigation.qml"); + QDeclarativeView *canvas = createView(testFile("navigation.qml")); canvas->show(); canvas->setFocus(); @@ -2054,7 +2070,7 @@ void tst_qdeclarativetextedit::canPasteEmpty() { void tst_qdeclarativetextedit::readOnly() { - QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml"); + QDeclarativeView *canvas = createView(testFile("readOnly.qml")); canvas->show(); canvas->setFocus(); @@ -2297,7 +2313,7 @@ void tst_qdeclarativetextedit::openInputPanelOnFocus() void tst_qdeclarativetextedit::geometrySignals() { - QDeclarativeComponent component(&engine, SRCDIR "/data/geometrySignals.qml"); + QDeclarativeComponent component(&engine, testFile("geometrySignals.qml")); QObject *o = component.create(); QVERIFY(o); QCOMPARE(o->property("bindingWidth").toInt(), 400); @@ -2385,8 +2401,10 @@ void tst_qdeclarativetextedit::implicitSizePreedit() QInputMethodEvent event(text, QList<QInputMethodEvent::Attribute>()); QCoreApplication::sendEvent(&view, &event); - QVERIFY(textObject->width() < textObject->implicitWidth()); - QVERIFY(textObject->height() == textObject->implicitHeight()); + QVERIFY2(textObject->width() < textObject->implicitWidth(), + msgComparison(textObject->width(), textObject->implicitWidth()).constData()); + QVERIFY2(textObject->height() == textObject->implicitHeight(), + msgComparison(textObject->height(), textObject->implicitHeight()).constData()); qreal wrappedHeight = textObject->height(); textObject->resetWidth(); @@ -2484,7 +2502,8 @@ void tst_qdeclarativetextedit::preeditMicroFocus() ic.clear(); sendPreeditText(preeditText, i); currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect(); - QVERIFY(previousRect.left() < currentRect.left()); + QVERIFY2(previousRect.left() < currentRect.left(), + msgComparison(previousRect.left(), currentRect.left()).constData()); #if defined(Q_WS_X11) QVERIFY(ic.updateCallCount > 0); #endif @@ -2592,7 +2611,8 @@ void tst_qdeclarativetextedit::inputMethodComposing() void tst_qdeclarativetextedit::cursorRectangleSize() { - QDeclarativeView *canvas = createView(SRCDIR "/data/CursorRect.qml"); + QDeclarativeView *canvas = createView(testFile("CursorRect.qml")); + setFrameless(canvas); QVERIFY(canvas->rootObject() != 0); canvas->show(); canvas->setFocus(); @@ -2601,7 +2621,7 @@ void tst_qdeclarativetextedit::cursorRectangleSize() QDeclarativeTextEdit *textEdit = qobject_cast<QDeclarativeTextEdit *>(canvas->rootObject()); QVERIFY(textEdit != 0); - textEdit->setFocus(Qt::OtherFocusReason); + textEdit->setFocus(true); QRectF cursorRect = textEdit->positionToRectangle(textEdit->cursorPosition()); QRectF microFocusFromScene = canvas->scene()->inputMethodQuery(Qt::ImMicroFocus).toRectF(); QRectF microFocusFromApp= QApplication::focusWidget()->inputMethodQuery(Qt::ImMicroFocus).toRectF(); @@ -2612,7 +2632,8 @@ void tst_qdeclarativetextedit::cursorRectangleSize() void tst_qdeclarativetextedit::deselect() { - QDeclarativeView *canvas = createView(SRCDIR "/data/CursorRect.qml"); + QDeclarativeView *canvas = createView(testFile("CursorRect.qml")); + setFrameless(canvas); QVERIFY(canvas->rootObject() != 0); canvas->show(); canvas->setFocus(); diff --git a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro index 4f15073a..35260dca 100644 --- a/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro +++ b/tests/auto/declarative/qdeclarativetimer/qdeclarativetimer.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativetimer QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui +contains(QT_CONFIG,declarative): QT += declarative declarative-private gui core-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativetimer.cpp diff --git a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp index decd2c34..58c27f3f 100644 --- a/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp +++ b/tests/auto/declarative/qdeclarativetimer/tst_qdeclarativetimer.cpp @@ -45,6 +45,18 @@ #include <private/qdeclarativetimer_p.h> #include <QtDeclarative/qdeclarativeitem.h> #include <QDebug> +#include <QtCore/QPauseAnimation> +#include <private/qabstractanimation_p.h> + +void consistentWait(int ms) +{ + //Use animations for timing, because we enabled consistentTiming + //This function will qWait for >= ms worth of consistent timing to elapse + QPauseAnimation waitTimer(ms); + waitTimer.start(); + while (waitTimer.state() == QAbstractAnimation::Running) + QTest::qWait(20); +} class tst_qdeclarativetimer : public QObject { @@ -53,6 +65,7 @@ public: tst_qdeclarativetimer(); private slots: + void initTestCase(); void notRepeating(); void notRepeatingStart(); void repeat(); @@ -80,12 +93,15 @@ public slots: } }; -#define TIMEOUT_TIMEOUT 200 - tst_qdeclarativetimer::tst_qdeclarativetimer() { } +void tst_qdeclarativetimer::initTestCase() +{ + QUnifiedTimer::instance()->setConsistentTiming(true); +} + void tst_qdeclarativetimer::notRepeating() { QDeclarativeEngine engine; @@ -100,9 +116,10 @@ void tst_qdeclarativetimer::notRepeating() TimerHelper helper; connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout())); - QTest::qWait(TIMEOUT_TIMEOUT); + + consistentWait(200); QCOMPARE(helper.count, 1); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QCOMPARE(helper.count, 1); QVERIFY(timer->isRunning() == false); } @@ -119,13 +136,13 @@ void tst_qdeclarativetimer::notRepeatingStart() TimerHelper helper; connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout())); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QCOMPARE(helper.count, 0); timer->start(); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QCOMPARE(helper.count, 1); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QCOMPARE(helper.count, 1); QVERIFY(timer->isRunning() == false); @@ -144,18 +161,18 @@ void tst_qdeclarativetimer::repeat() connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout())); QCOMPARE(helper.count, 0); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QVERIFY(helper.count > 0); int oldCount = helper.count; - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QVERIFY(helper.count > oldCount); QVERIFY(timer->isRunning()); oldCount = helper.count; timer->stop(); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QVERIFY(helper.count == oldCount); QVERIFY(timer->isRunning() == false); @@ -185,12 +202,11 @@ void tst_qdeclarativetimer::triggeredOnStart() TimerHelper helper; connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout())); - QTest::qWait(1); + consistentWait(1); QCOMPARE(helper.count, 1); - - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QCOMPARE(helper.count, 2); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QCOMPARE(helper.count, 2); QVERIFY(timer->isRunning() == false); @@ -219,13 +235,13 @@ void tst_qdeclarativetimer::triggeredOnStartRepeat() TimerHelper helper; connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout())); - QTest::qWait(1); + consistentWait(1); QCOMPARE(helper.count, 1); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QVERIFY(helper.count > 1); int oldCount = helper.count; - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QVERIFY(helper.count > oldCount); QVERIFY(timer->isRunning()); @@ -245,7 +261,7 @@ void tst_qdeclarativetimer::noTriggerIfNotRunning() ), QUrl::fromLocalFile("")); QObject *item = component.create(); QVERIFY(item != 0); - QTest::qWait(TIMEOUT_TIMEOUT); + consistentWait(200); QCOMPARE(item->property("ok").toBool(), true); delete item; @@ -263,12 +279,12 @@ void tst_qdeclarativetimer::changeDuration() connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout())); QCOMPARE(helper.count, 0); - QTest::qWait(500); + consistentWait(500); QCOMPARE(helper.count, 2); timer->setInterval(500); - QTest::qWait(600); + consistentWait(600); QCOMPARE(helper.count, 3); QVERIFY(timer->isRunning()); @@ -299,14 +315,14 @@ void tst_qdeclarativetimer::restart() connect(timer, SIGNAL(triggered()), &helper, SLOT(timeout())); QCOMPARE(helper.count, 0); - QTest::qWait(600); + consistentWait(600); QCOMPARE(helper.count, 1); - QTest::qWait(300); + consistentWait(300); timer->restart(); - QTest::qWait(700); + consistentWait(700); QCOMPARE(helper.count, 2); QVERIFY(timer->isRunning()); diff --git a/tests/auto/declarative/symbianlibs.pri b/tests/auto/declarative/symbianlibs.pri deleted file mode 100644 index 4452f67f..00000000 --- a/tests/auto/declarative/symbianlibs.pri +++ /dev/null @@ -1,9 +0,0 @@ -#additional libs required for orientation sensor -symbian { - !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) { - LIBS += -lsensrvclient -lsensrvutil - } - contains(QT_CONFIG, s60): { - LIBS += -lavkon -lcone - } -} diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 201fc143..d9bf7d84 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,6 +1,2 @@ -QT = core testlib gui declarative -HEADERSCLEAN_PRI = $${QT.core.sources}/../../tests/auto/other/headersclean/headersclean.pri -isEmpty(QT.core.sources)|!include($$HEADERSCLEAN_PRI) { - warning("headersclean.pri from QtCore sources not available. test disabled") - TEMPLATE=subdirs -} +QT = declarative +load(qt_headersclean) diff --git a/tests/auto/headersclean/qt_headersclean_headers.h b/tests/auto/headersclean/qt_headersclean_headers.h deleted file mode 100644 index 2133ce46..00000000 --- a/tests/auto/headersclean/qt_headersclean_headers.h +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT_HEADERSCLEAN_HEADERS -#define QT_HEADERSCLEAN_HEADERS - -#include <QtDeclarative> - -#endif diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro index b08a568c..c179e47c 100644 --- a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,5 +1,6 @@ TARGET = qdeclarativeview +PLUGIN_CLASS_NAME = QDeclarativeViewPlugin include(../plugins.pri) SOURCES += qdeclarativeview_plugin.cpp diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 7e593f67..23ad31a2 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -71,7 +71,9 @@ void exitApp(int i) // Debugging output is not visible by default on Windows - // therefore show modal dialog with errors instead. if (!warnings.isEmpty()) { - QMessageBox::warning(0, QApplication::translate("QDeclarativeViewer", "Qt QML Viewer"), warnings); + const QString message = QStringLiteral("<pre>") + warnings + QStringLiteral("</pre>"); + QMessageBox::warning(0, QApplication::translate("QDeclarativeViewer", "Qt QML Viewer"), + message); } #endif exit(i); diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp index 1d46f560..70d50f3a 100644 --- a/tools/qml/qdeclarativetester.cpp +++ b/tools/qml/qdeclarativetester.cpp @@ -53,6 +53,15 @@ QT_BEGIN_NAMESPACE +enum { + TestSuccessExitCode = 0, +#ifdef Q_OS_WIN + TestFailureExitCode = 1 // QProcess on Windows reports crash for exit codes < 0, QTBUG-28735 +#else + TestFailureExitCode = -1 +#endif +}; + extern Q_GUI_EXPORT bool qt_applefontsmoothing_enabled; QDeclarativeTester::QDeclarativeTester(const QString &script, QDeclarativeViewer::ScriptOptions opts, @@ -137,7 +146,7 @@ void QDeclarativeTester::executefailure() hasFailed = true; if (options & QDeclarativeViewer::ExitOnFailure) - exit(-1); + QCoreApplication::exit(TestFailureExitCode); } void QDeclarativeTester::imagefailure() @@ -146,7 +155,7 @@ void QDeclarativeTester::imagefailure() if (options & QDeclarativeViewer::ExitOnFailure){ testSkip(); - exit(hasFailed?-1:0); + QCoreApplication::exit(hasFailed ? TestFailureExitCode : TestSuccessExitCode); } } @@ -178,7 +187,7 @@ void QDeclarativeTester::complete() testSkip(); if (options & QDeclarativeViewer::ExitOnComplete) - QApplication::exit(hasFailed?-1:0); + QCoreApplication::exit(hasFailed? TestFailureExitCode : TestSuccessExitCode); if (hasCompleted) return; @@ -193,8 +202,13 @@ void QDeclarativeTester::run() QDeclarativeComponent c(m_view->engine(), m_script + QLatin1String(".qml")); testscript = qobject_cast<QDeclarativeVisualTest *>(c.create()); - if (testscript) testscript->setParent(this); - else { executefailure(); exit(-1); } + if (testscript) { + testscript->setParent(this); + } else { + executefailure(); + if (!(options & QDeclarativeViewer::ExitOnFailure)) + QCoreApplication::exit(TestFailureExitCode); + } testscriptidx = 0; } diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 877fbee2..669b4cea 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qt uic declarative_debug declarative +CONFIG += uic declarative_debug declarative DESTDIR = $$QT.declarative.bins include(qml.pri) diff --git a/tools/qmlplugindump/main.cpp b/tools/qmlplugindump/main.cpp index 35ee37ae..e9e59142 100644 --- a/tools/qmlplugindump/main.cpp +++ b/tools/qmlplugindump/main.cpp @@ -177,7 +177,7 @@ QByteArray convertToId(const QMetaObject *mo) return className; } -QSet<const QMetaObject *> collectReachableMetaObjects(QDeclarativeEngine *engine, const QList<QDeclarativeType *> &skip = QList<QDeclarativeType *>()) +QSet<const QMetaObject *> collectReachableMetaObjects(QDeclarativeEngine *, const QList<QDeclarativeType *> &skip = QList<QDeclarativeType *>()) { QSet<const QMetaObject *> metas; metas.insert(FriendlyQObject::qtMeta()); diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro index 55158e13..ba71223b 100644 --- a/tools/qmlplugindump/qmlplugindump.pro +++ b/tools/qmlplugindump/qmlplugindump.pro @@ -2,6 +2,8 @@ TARGET = qml1plugindump QT += core-private declarative-private widgets +CONFIG += qpa_minimal_plugin + SOURCES += \ main.cpp \ qmlstreamwriter.cpp |