diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-29 16:02:34 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 18:16:48 +0100 |
commit | a6065d60f158ffad7a94877883af69731da94295 (patch) | |
tree | 5657fd490fd8a3f9794a8c9bcc9f85cf24a095c1 /examples | |
parent | c18e04b2e61f174a4883f6884cf9a0712c5725e3 (diff) |
centralize and fixup example sources install targets
follow respective change in qtbase
Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/demos/calqlatr/calqlatr.pro | 11 | ||||
-rw-r--r-- | examples/demos/demos.pro | 11 | ||||
-rw-r--r-- | examples/demos/maroon/maroon.pro | 11 | ||||
-rw-r--r-- | examples/demos/samegame/samegame.pro | 11 | ||||
-rw-r--r-- | examples/demos/stocqt/stocqt.pro | 11 | ||||
-rw-r--r-- | examples/demos/tweetsearch/tweetsearch.pro | 11 | ||||
-rw-r--r-- | examples/examples.pro | 15 | ||||
-rw-r--r-- | examples/localstorage/localstorage.pro | 7 | ||||
-rw-r--r-- | examples/localstorage/localstorage/localstorage.pro | 11 | ||||
-rw-r--r-- | examples/particles/affectors/affectors.pro | 11 | ||||
-rw-r--r-- | examples/particles/customparticle/customparticle.pro | 11 | ||||
-rw-r--r-- | examples/particles/emitters/emitters.pro | 11 | ||||
-rw-r--r-- | examples/particles/imageparticle/imageparticle.pro | 11 | ||||
-rw-r--r-- | examples/particles/system/system.pro | 11 | ||||
-rw-r--r-- | examples/qml/imageprovider/imageprovider.pro | 16 | ||||
-rw-r--r-- | examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro | 7 | ||||
-rw-r--r-- | examples/qml/plugins/plugins.pro | 13 | ||||
-rw-r--r-- | examples/qml/qml.pro | 13 | ||||
-rw-r--r-- | examples/qml/referenceexamples/adding/adding.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/attached/attached.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/binding/binding.pro | 8 | ||||
-rw-r--r-- | examples/qml/referenceexamples/coercion/coercion.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/default/default.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/extended/extended.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/grouped/grouped.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/methods/methods.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/properties/properties.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/referenceexamples.pro | 4 | ||||
-rw-r--r-- | examples/qml/referenceexamples/signal/signal.pro | 6 | ||||
-rw-r--r-- | examples/qml/referenceexamples/valuesource/valuesource.pro | 6 | ||||
-rw-r--r-- | examples/qml/shell/shell.pro | 6 | ||||
-rw-r--r-- | examples/qml/xmlhttprequest/main.cpp | 4 | ||||
-rw-r--r-- | examples/qml/xmlhttprequest/xmlhttprequest.pro | 7 | ||||
-rw-r--r-- | examples/qml/xmlhttprequest/xmlhttprequest.qml | 2 | ||||
-rw-r--r-- | examples/qmltest/qmltest/qmltest.pro | 8 | ||||
-rw-r--r-- | examples/quick/accessibility/accessibility.pro | 8 | ||||
-rw-r--r-- | examples/quick/accessibility/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/animation/animation.pro | 8 | ||||
-rw-r--r-- | examples/quick/animation/animation.qml | 2 | ||||
-rw-r--r-- | examples/quick/animation/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/canvas/canvas.pro | 8 | ||||
-rw-r--r-- | examples/quick/canvas/canvas.qml | 2 | ||||
-rw-r--r-- | examples/quick/canvas/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/customitems/customitems.pro | 21 | ||||
-rw-r--r-- | examples/quick/customitems/maskedmousearea/maskedmousearea.pro | 6 | ||||
-rw-r--r-- | examples/quick/customitems/painteditem/painteditem.pro | 16 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/calqlatr.pro | 9 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/calqlatr.qml (renamed from examples/demos/calqlatr/calqlatr.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/calqlatr.qmlproject (renamed from examples/demos/calqlatr/calqlatr.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/content/Button.qml (renamed from examples/demos/calqlatr/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/content/Display.qml (renamed from examples/demos/calqlatr/content/Display.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/content/NumberPad.qml (renamed from examples/demos/calqlatr/content/NumberPad.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/content/StyleLabel.qml (renamed from examples/demos/calqlatr/content/StyleLabel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/content/audio/touch.wav (renamed from examples/demos/calqlatr/content/audio/touch.wav) | bin | 950 -> 950 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/calculator.js (renamed from examples/demos/calqlatr/content/calculator.js) | 0 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/icon-back.png (renamed from examples/demos/calqlatr/content/images/icon-back.png) | bin | 328 -> 328 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/icon-close.png (renamed from examples/demos/calqlatr/content/images/icon-close.png) | bin | 488 -> 488 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/icon-settings.png (renamed from examples/demos/calqlatr/content/images/icon-settings.png) | bin | 503 -> 503 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/logo.png (renamed from examples/demos/calqlatr/content/images/logo.png) | bin | 5950 -> 5950 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/paper-edge-left.png (renamed from examples/demos/calqlatr/content/images/paper-edge-left.png) | bin | 12401 -> 12401 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/paper-edge-right.png (renamed from examples/demos/calqlatr/content/images/paper-edge-right.png) | bin | 12967 -> 12967 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/paper-grip.png (renamed from examples/demos/calqlatr/content/images/paper-grip.png) | bin | 298 -> 298 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/settings-selected-a.png (renamed from examples/demos/calqlatr/content/images/settings-selected-a.png) | bin | 2326 -> 2326 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/settings-selected-b.png (renamed from examples/demos/calqlatr/content/images/settings-selected-b.png) | bin | 2334 -> 2334 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/touch-green.png (renamed from examples/demos/calqlatr/content/images/touch-green.png) | bin | 4808 -> 4808 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/content/images/touch-white.png (renamed from examples/demos/calqlatr/content/images/touch-white.png) | bin | 4601 -> 4601 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png (renamed from examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png) | bin | 37120 -> 37120 bytes | |||
-rw-r--r-- | examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc (renamed from examples/demos/calqlatr/doc/src/calqlatr.qdoc) | 0 | ||||
-rw-r--r-- | examples/quick/demos/calqlatr/main.cpp (renamed from examples/demos/calqlatr/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/demos/clocks/clocks.qml (renamed from examples/demos/clocks/clocks.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/clocks/content/Clock.qml (renamed from examples/demos/clocks/content/Clock.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/clocks/content/arrow.png (renamed from examples/demos/clocks/content/arrow.png) | bin | 692 -> 692 bytes | |||
-rw-r--r-- | examples/quick/demos/clocks/content/background.png (renamed from examples/demos/clocks/content/background.png) | bin | 46895 -> 46895 bytes | |||
-rw-r--r-- | examples/quick/demos/clocks/content/center.png (renamed from examples/demos/clocks/content/center.png) | bin | 765 -> 765 bytes | |||
-rw-r--r-- | examples/quick/demos/clocks/content/clock-night.png (renamed from examples/demos/clocks/content/clock-night.png) | bin | 23359 -> 23359 bytes | |||
-rw-r--r-- | examples/quick/demos/clocks/content/clock.png (renamed from examples/demos/clocks/content/clock.png) | bin | 20653 -> 20653 bytes | |||
-rw-r--r-- | examples/quick/demos/clocks/content/hour.png (renamed from examples/demos/clocks/content/hour.png) | bin | 625 -> 625 bytes | |||
-rw-r--r-- | examples/quick/demos/clocks/content/minute.png (renamed from examples/demos/clocks/content/minute.png) | bin | 625 -> 625 bytes | |||
-rw-r--r-- | examples/quick/demos/clocks/content/quit.png (renamed from examples/demos/clocks/content/quit.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/quick/demos/clocks/content/second.png (renamed from examples/demos/clocks/content/second.png) | bin | 303 -> 303 bytes | |||
-rw-r--r-- | examples/quick/demos/demos.pro | 11 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/BuildButton.qml (renamed from examples/demos/maroon/content/BuildButton.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/GameCanvas.qml (renamed from examples/demos/maroon/content/GameCanvas.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/GameOverScreen.qml (renamed from examples/demos/maroon/content/GameOverScreen.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/InfoBar.qml (renamed from examples/demos/maroon/content/InfoBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/NewGameScreen.qml (renamed from examples/demos/maroon/content/NewGameScreen.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/SoundEffect.qml (renamed from examples/demos/maroon/content/SoundEffect.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/audio/bomb-action.wav (renamed from examples/demos/maroon/content/audio/bomb-action.wav) | bin | 20972 -> 20972 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/audio/catch-action.wav (renamed from examples/demos/maroon/content/audio/catch-action.wav) | bin | 13274 -> 13274 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/audio/catch.wav (renamed from examples/demos/maroon/content/audio/catch.wav) | bin | 8638 -> 8638 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/audio/currency.wav (renamed from examples/demos/maroon/content/audio/currency.wav) | bin | 15790 -> 15790 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/audio/factory-action.wav (renamed from examples/demos/maroon/content/audio/factory-action.wav) | bin | 4936 -> 4936 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/audio/melee-action.wav (renamed from examples/demos/maroon/content/audio/melee-action.wav) | bin | 17798 -> 17798 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/audio/projectile-action.wav (renamed from examples/demos/maroon/content/audio/projectile-action.wav) | bin | 2562 -> 2562 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/audio/shooter-action.wav (renamed from examples/demos/maroon/content/audio/shooter-action.wav) | bin | 27554 -> 27554 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/background.png (renamed from examples/demos/maroon/content/gfx/background.png) | bin | 5802 -> 5802 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/bomb-action.png (renamed from examples/demos/maroon/content/gfx/bomb-action.png) | bin | 23974 -> 23974 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/bomb-idle.png (renamed from examples/demos/maroon/content/gfx/bomb-idle.png) | bin | 12238 -> 12238 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/bomb.png (renamed from examples/demos/maroon/content/gfx/bomb.png) | bin | 4067 -> 4067 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/button-help.png (renamed from examples/demos/maroon/content/gfx/button-help.png) | bin | 8916 -> 8916 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/button-play.png (renamed from examples/demos/maroon/content/gfx/button-play.png) | bin | 13945 -> 13945 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/catch-action.png (renamed from examples/demos/maroon/content/gfx/catch-action.png) | bin | 6760 -> 6760 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/catch.png (renamed from examples/demos/maroon/content/gfx/catch.png) | bin | 4771 -> 4771 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/cloud.png (renamed from examples/demos/maroon/content/gfx/cloud.png) | bin | 3398 -> 3398 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/currency.png (renamed from examples/demos/maroon/content/gfx/currency.png) | bin | 1889 -> 1889 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/dialog-bomb.png (renamed from examples/demos/maroon/content/gfx/dialog-bomb.png) | bin | 3751 -> 3751 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/dialog-factory.png (renamed from examples/demos/maroon/content/gfx/dialog-factory.png) | bin | 3946 -> 3946 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/dialog-melee.png (renamed from examples/demos/maroon/content/gfx/dialog-melee.png) | bin | 4392 -> 4392 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/dialog-pointer.png (renamed from examples/demos/maroon/content/gfx/dialog-pointer.png) | bin | 911 -> 911 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/dialog-shooter.png (renamed from examples/demos/maroon/content/gfx/dialog-shooter.png) | bin | 3737 -> 3737 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/dialog.png (renamed from examples/demos/maroon/content/gfx/dialog.png) | bin | 3362 -> 3362 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/factory-action.png (renamed from examples/demos/maroon/content/gfx/factory-action.png) | bin | 22440 -> 22440 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/factory-idle.png (renamed from examples/demos/maroon/content/gfx/factory-idle.png) | bin | 12729 -> 12729 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/factory.png (renamed from examples/demos/maroon/content/gfx/factory.png) | bin | 4138 -> 4138 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/grid.png (renamed from examples/demos/maroon/content/gfx/grid.png) | bin | 2830 -> 2830 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/help.png (renamed from examples/demos/maroon/content/gfx/help.png) | bin | 38255 -> 38255 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/lifes.png (renamed from examples/demos/maroon/content/gfx/lifes.png) | bin | 1675 -> 1675 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/logo-bubble.png (renamed from examples/demos/maroon/content/gfx/logo-bubble.png) | bin | 7706 -> 7706 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/logo-fish.png (renamed from examples/demos/maroon/content/gfx/logo-fish.png) | bin | 3477 -> 3477 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/logo.png (renamed from examples/demos/maroon/content/gfx/logo.png) | bin | 18332 -> 18332 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/melee-action.png (renamed from examples/demos/maroon/content/gfx/melee-action.png) | bin | 7797 -> 7797 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/melee-idle.png (renamed from examples/demos/maroon/content/gfx/melee-idle.png) | bin | 22832 -> 22832 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/melee.png (renamed from examples/demos/maroon/content/gfx/melee.png) | bin | 4046 -> 4046 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/mob-idle.png (renamed from examples/demos/maroon/content/gfx/mob-idle.png) | bin | 6181 -> 6181 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/mob.png (renamed from examples/demos/maroon/content/gfx/mob.png) | bin | 2391 -> 2391 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/points.png (renamed from examples/demos/maroon/content/gfx/points.png) | bin | 1561 -> 1561 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/projectile-action.png (renamed from examples/demos/maroon/content/gfx/projectile-action.png) | bin | 6257 -> 6257 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/projectile.png (renamed from examples/demos/maroon/content/gfx/projectile.png) | bin | 801 -> 801 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/scores.png (renamed from examples/demos/maroon/content/gfx/scores.png) | bin | 1535 -> 1535 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/shooter-action.png (renamed from examples/demos/maroon/content/gfx/shooter-action.png) | bin | 18121 -> 18121 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/shooter-idle.png (renamed from examples/demos/maroon/content/gfx/shooter-idle.png) | bin | 11929 -> 11929 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/shooter.png (renamed from examples/demos/maroon/content/gfx/shooter.png) | bin | 4137 -> 4137 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/sunlight.png (renamed from examples/demos/maroon/content/gfx/sunlight.png) | bin | 248412 -> 248412 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/text-1.png (renamed from examples/demos/maroon/content/gfx/text-1.png) | bin | 2777 -> 2777 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/text-2.png (renamed from examples/demos/maroon/content/gfx/text-2.png) | bin | 4959 -> 4959 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/text-3.png (renamed from examples/demos/maroon/content/gfx/text-3.png) | bin | 5063 -> 5063 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/text-blank.png (renamed from examples/demos/maroon/content/gfx/text-blank.png) | bin | 1326 -> 1326 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/text-gameover.png (renamed from examples/demos/maroon/content/gfx/text-gameover.png) | bin | 1515 -> 1515 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/text-go.png (renamed from examples/demos/maroon/content/gfx/text-go.png) | bin | 4230 -> 4230 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/gfx/wave.png (renamed from examples/demos/maroon/content/gfx/wave.png) | bin | 2763 -> 2763 bytes | |||
-rw-r--r-- | examples/quick/demos/maroon/content/logic.js (renamed from examples/demos/maroon/content/logic.js) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/mobs/MobBase.qml (renamed from examples/demos/maroon/content/mobs/MobBase.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/towers/Bomb.qml (renamed from examples/demos/maroon/content/towers/Bomb.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/towers/Factory.qml (renamed from examples/demos/maroon/content/towers/Factory.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/towers/Melee.qml (renamed from examples/demos/maroon/content/towers/Melee.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/towers/Ranged.qml (renamed from examples/demos/maroon/content/towers/Ranged.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/content/towers/TowerBase.qml (renamed from examples/demos/maroon/content/towers/TowerBase.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/main.cpp (renamed from examples/demos/maroon/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/maroon.pro | 9 | ||||
-rw-r--r-- | examples/quick/demos/maroon/maroon.qml (renamed from examples/demos/maroon/maroon.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/maroon/maroon.qmlproject (renamed from examples/demos/maroon/maroon.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml (renamed from examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml (renamed from examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/Button.qml (renamed from examples/demos/photoviewer/PhotoViewerCore/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/EditableButton.qml (renamed from examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml (renamed from examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/ProgressBar.qml (renamed from examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/RssModel.qml (renamed from examples/demos/photoviewer/PhotoViewerCore/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/Tag.qml (renamed from examples/demos/photoviewer/PhotoViewerCore/Tag.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png (renamed from examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png) | bin | 588 -> 588 bytes | |||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png (renamed from examples/demos/photoviewer/PhotoViewerCore/images/busy.png) | bin | 2629 -> 2629 bytes | |||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png (renamed from examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png) | bin | 8844 -> 8844 bytes | |||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/qmldir (renamed from examples/demos/photoviewer/PhotoViewerCore/qmldir) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/PhotoViewerCore/script/script.js (renamed from examples/demos/photoviewer/PhotoViewerCore/script/script.js) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/i18n/base.ts (renamed from examples/demos/photoviewer/i18n/base.ts) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/i18n/qml_fr.qm (renamed from examples/demos/photoviewer/i18n/qml_fr.qm) | bin | 268 -> 268 bytes | |||
-rw-r--r-- | examples/quick/demos/photoviewer/i18n/qml_fr.ts (renamed from examples/demos/photoviewer/i18n/qml_fr.ts) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/photoviewer.qml (renamed from examples/demos/photoviewer/photoviewer.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/photoviewer/photoviewer.qmlproject (renamed from examples/demos/photoviewer/photoviewer.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/demos/rssnews/content/BusyIndicator.qml (renamed from examples/demos/rssnews/content/BusyIndicator.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/rssnews/content/CategoryDelegate.qml (renamed from examples/demos/rssnews/content/CategoryDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/rssnews/content/NewsDelegate.qml (renamed from examples/demos/rssnews/content/NewsDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/rssnews/content/RssFeeds.qml (renamed from examples/demos/rssnews/content/RssFeeds.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/rssnews/content/ScrollBar.qml (renamed from examples/demos/rssnews/content/ScrollBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/rssnews/content/images/busy.png (renamed from examples/demos/rssnews/content/images/busy.png) | bin | 2629 -> 2629 bytes | |||
-rw-r--r-- | examples/quick/demos/rssnews/content/images/scrollbar.png (renamed from examples/demos/rssnews/content/images/scrollbar.png) | bin | 161 -> 161 bytes | |||
-rw-r--r-- | examples/quick/demos/rssnews/rssnews.qml (renamed from examples/demos/rssnews/rssnews.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/rssnews/rssnews.qmlproject (renamed from examples/demos/rssnews/rssnews.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/Block.qml (renamed from examples/demos/samegame/content/Block.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/BlockEmitter.qml (renamed from examples/demos/samegame/content/BlockEmitter.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/Button.qml (renamed from examples/demos/samegame/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/GameArea.qml (renamed from examples/demos/samegame/content/GameArea.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/LogoAnimation.qml (renamed from examples/demos/samegame/content/LogoAnimation.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/MenuEmitter.qml (renamed from examples/demos/samegame/content/MenuEmitter.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/PaintEmitter.qml (renamed from examples/demos/samegame/content/PaintEmitter.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/PrimaryPack.qml (renamed from examples/demos/samegame/content/PrimaryPack.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/PuzzleBlock.qml (renamed from examples/demos/samegame/content/PuzzleBlock.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/SamegameText.qml (renamed from examples/demos/samegame/content/SamegameText.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/SimpleBlock.qml (renamed from examples/demos/samegame/content/SimpleBlock.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/SmokeText.qml (renamed from examples/demos/samegame/content/SmokeText.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/background-puzzle.png (renamed from examples/demos/samegame/content/gfx/background-puzzle.png) | bin | 86666 -> 86666 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/background.png (renamed from examples/demos/samegame/content/gfx/background.png) | bin | 101018 -> 101018 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/bar.png (renamed from examples/demos/samegame/content/gfx/bar.png) | bin | 10970 -> 10970 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/blue-puzzle.png (renamed from examples/demos/samegame/content/gfx/blue-puzzle.png) | bin | 2219 -> 2219 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/blue.png (renamed from examples/demos/samegame/content/gfx/blue.png) | bin | 1018 -> 1018 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/bubble-highscore.png (renamed from examples/demos/samegame/content/gfx/bubble-highscore.png) | bin | 2276 -> 2276 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/bubble-puzzle.png (renamed from examples/demos/samegame/content/gfx/bubble-puzzle.png) | bin | 2811 -> 2811 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/but-game-1.png (renamed from examples/demos/samegame/content/gfx/but-game-1.png) | bin | 2728 -> 2728 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/but-game-2.png (renamed from examples/demos/samegame/content/gfx/but-game-2.png) | bin | 3378 -> 3378 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/but-game-3.png (renamed from examples/demos/samegame/content/gfx/but-game-3.png) | bin | 1423 -> 1423 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/but-game-4.png (renamed from examples/demos/samegame/content/gfx/but-game-4.png) | bin | 2096 -> 2096 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/but-game-new.png (renamed from examples/demos/samegame/content/gfx/but-game-new.png) | bin | 3662 -> 3662 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/but-menu.png (renamed from examples/demos/samegame/content/gfx/but-menu.png) | bin | 2391 -> 2391 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/but-puzzle-next.png (renamed from examples/demos/samegame/content/gfx/but-puzzle-next.png) | bin | 3658 -> 3658 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/but-quit.png (renamed from examples/demos/samegame/content/gfx/but-quit.png) | bin | 2100 -> 2100 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/green-puzzle.png (renamed from examples/demos/samegame/content/gfx/green-puzzle.png) | bin | 2271 -> 2271 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/green.png (renamed from examples/demos/samegame/content/gfx/green.png) | bin | 1024 -> 1024 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/icon-fail.png (renamed from examples/demos/samegame/content/gfx/icon-fail.png) | bin | 6549 -> 6549 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/icon-ok.png (renamed from examples/demos/samegame/content/gfx/icon-ok.png) | bin | 7190 -> 7190 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/icon-time.png (renamed from examples/demos/samegame/content/gfx/icon-time.png) | bin | 1159 -> 1159 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/logo-a.png (renamed from examples/demos/samegame/content/gfx/logo-a.png) | bin | 1814 -> 1814 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/logo-e.png (renamed from examples/demos/samegame/content/gfx/logo-e.png) | bin | 1725 -> 1725 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/logo-g.png (renamed from examples/demos/samegame/content/gfx/logo-g.png) | bin | 1765 -> 1765 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/logo-m.png (renamed from examples/demos/samegame/content/gfx/logo-m.png) | bin | 1743 -> 1743 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/logo-s.png (renamed from examples/demos/samegame/content/gfx/logo-s.png) | bin | 1791 -> 1791 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/logo.png (renamed from examples/demos/samegame/content/gfx/logo.png) | bin | 3608 -> 3608 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/particle-brick.png (renamed from examples/demos/samegame/content/gfx/particle-brick.png) | bin | 861 -> 861 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/particle-paint.png (renamed from examples/demos/samegame/content/gfx/particle-paint.png) | bin | 714 -> 714 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/particle-smoke.png (renamed from examples/demos/samegame/content/gfx/particle-smoke.png) | bin | 5409 -> 5409 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/red-puzzle.png (renamed from examples/demos/samegame/content/gfx/red-puzzle.png) | bin | 2218 -> 2218 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/red.png (renamed from examples/demos/samegame/content/gfx/red.png) | bin | 1018 -> 1018 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-highscore-new.png (renamed from examples/demos/samegame/content/gfx/text-highscore-new.png) | bin | 6767 -> 6767 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-highscore.png (renamed from examples/demos/samegame/content/gfx/text-highscore.png) | bin | 3179 -> 3179 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-no-winner.png (renamed from examples/demos/samegame/content/gfx/text-no-winner.png) | bin | 6321 -> 6321 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-p1-go.png (renamed from examples/demos/samegame/content/gfx/text-p1-go.png) | bin | 5395 -> 5395 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-p1-won.png (renamed from examples/demos/samegame/content/gfx/text-p1-won.png) | bin | 5618 -> 5618 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-p1.png (renamed from examples/demos/samegame/content/gfx/text-p1.png) | bin | 1751 -> 1751 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-p2-go.png (renamed from examples/demos/samegame/content/gfx/text-p2-go.png) | bin | 5874 -> 5874 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-p2-won.png (renamed from examples/demos/samegame/content/gfx/text-p2-won.png) | bin | 6177 -> 6177 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/text-p2.png (renamed from examples/demos/samegame/content/gfx/text-p2.png) | bin | 2381 -> 2381 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/yellow-puzzle.png (renamed from examples/demos/samegame/content/gfx/yellow-puzzle.png) | bin | 2239 -> 2239 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/gfx/yellow.png (renamed from examples/demos/samegame/content/gfx/yellow.png) | bin | 1008 -> 1008 bytes | |||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/TemplateBase.qml (renamed from examples/demos/samegame/content/levels/TemplateBase.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level0.qml (renamed from examples/demos/samegame/content/levels/level0.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level1.qml (renamed from examples/demos/samegame/content/levels/level1.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level2.qml (renamed from examples/demos/samegame/content/levels/level2.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level3.qml (renamed from examples/demos/samegame/content/levels/level3.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level4.qml (renamed from examples/demos/samegame/content/levels/level4.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level5.qml (renamed from examples/demos/samegame/content/levels/level5.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level6.qml (renamed from examples/demos/samegame/content/levels/level6.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level7.qml (renamed from examples/demos/samegame/content/levels/level7.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level8.qml (renamed from examples/demos/samegame/content/levels/level8.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/content/levels/level9.qml (renamed from examples/demos/samegame/content/levels/level9.qml) | 0 | ||||
-rwxr-xr-x | examples/quick/demos/samegame/content/samegame.js (renamed from examples/demos/samegame/content/samegame.js) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/main.cpp (renamed from examples/demos/samegame/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/samegame.pro | 9 | ||||
-rw-r--r-- | examples/quick/demos/samegame/samegame.qml (renamed from examples/demos/samegame/samegame.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/samegame.qmlproject (renamed from examples/demos/samegame/samegame.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/demos/samegame/settings.js (renamed from examples/demos/samegame/settings.js) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/Button.qml (renamed from examples/demos/stocqt/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/DatePicker.qml (renamed from examples/demos/stocqt/content/DatePicker.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/StockChart.qml (renamed from examples/demos/stocqt/content/StockChart.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/StockListModel.qml (renamed from examples/demos/stocqt/content/StockListModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/StockListView.qml (renamed from examples/demos/stocqt/content/StockListView.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/StockModel.qml (renamed from examples/demos/stocqt/content/StockModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/StockSettings.qml (renamed from examples/demos/stocqt/content/StockSettings.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/StockView.qml (renamed from examples/demos/stocqt/content/StockView.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/content/images/icon-calendar-anim.png (renamed from examples/demos/stocqt/content/images/icon-calendar-anim.png) | bin | 1088 -> 1088 bytes | |||
-rw-r--r-- | examples/quick/demos/stocqt/content/images/icon-calendar.png (renamed from examples/demos/stocqt/content/images/icon-calendar.png) | bin | 884 -> 884 bytes | |||
-rw-r--r-- | examples/quick/demos/stocqt/content/images/icon-items.png (renamed from examples/demos/stocqt/content/images/icon-items.png) | bin | 887 -> 887 bytes | |||
-rw-r--r-- | examples/quick/demos/stocqt/content/images/icon-settings.png (renamed from examples/demos/stocqt/content/images/icon-settings.png) | bin | 1066 -> 1066 bytes | |||
-rw-r--r-- | examples/quick/demos/stocqt/content/images/logo.png (renamed from examples/demos/stocqt/content/images/logo.png) | bin | 4266 -> 4266 bytes | |||
-rw-r--r-- | examples/quick/demos/stocqt/content/images/stock-selected.png (renamed from examples/demos/stocqt/content/images/stock-selected.png) | bin | 6480 -> 6480 bytes | |||
-rw-r--r-- | examples/quick/demos/stocqt/content/images/wheel-touch.png (renamed from examples/demos/stocqt/content/images/wheel-touch.png) | bin | 4767 -> 4767 bytes | |||
-rw-r--r-- | examples/quick/demos/stocqt/content/images/wheel.png (renamed from examples/demos/stocqt/content/images/wheel.png) | bin | 36223 -> 36223 bytes | |||
-rw-r--r-- | examples/quick/demos/stocqt/main.cpp (renamed from examples/demos/stocqt/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/stocqt.pro | 9 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/stocqt.qml (renamed from examples/demos/stocqt/stocqt.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/stocqt/stocqt.qmlproject (renamed from examples/demos/stocqt/stocqt.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/FlipBar.qml (renamed from examples/demos/tweetsearch/content/FlipBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/LineInput.qml (renamed from examples/demos/tweetsearch/content/LineInput.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/ListFooter.qml (renamed from examples/demos/tweetsearch/content/ListFooter.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/ListHeader.qml (renamed from examples/demos/tweetsearch/content/ListHeader.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/SearchDelegate.qml (renamed from examples/demos/tweetsearch/content/SearchDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/TweetDelegate.qml (renamed from examples/demos/tweetsearch/content/TweetDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/TweetsModel.qml (renamed from examples/demos/tweetsearch/content/TweetsModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/resources/anonymous.png (renamed from examples/demos/tweetsearch/content/resources/anonymous.png) | bin | 1788 -> 1788 bytes | |||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/resources/bird-anim-sprites.png (renamed from examples/demos/tweetsearch/content/resources/bird-anim-sprites.png) | bin | 11079 -> 11079 bytes | |||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/resources/icon-clear.png (renamed from examples/demos/tweetsearch/content/resources/icon-clear.png) | bin | 1166 -> 1166 bytes | |||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/resources/icon-loading.png (renamed from examples/demos/tweetsearch/content/resources/icon-loading.png) | bin | 1542 -> 1542 bytes | |||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/resources/icon-refresh.png (renamed from examples/demos/tweetsearch/content/resources/icon-refresh.png) | bin | 1202 -> 1202 bytes | |||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/resources/icon-search.png (renamed from examples/demos/tweetsearch/content/resources/icon-search.png) | bin | 1284 -> 1284 bytes | |||
-rw-r--r-- | examples/quick/demos/tweetsearch/content/tweetsearch.js (renamed from examples/demos/tweetsearch/content/tweetsearch.js) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/main.cpp (renamed from examples/demos/tweetsearch/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/tweetsearch.pro | 9 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/tweetsearch.qml (renamed from examples/demos/tweetsearch/tweetsearch.qml) | 0 | ||||
-rw-r--r-- | examples/quick/demos/tweetsearch/tweetsearch.qmlproject (renamed from examples/demos/tweetsearch/tweetsearch.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/draganddrop/draganddrop.pro | 8 | ||||
-rw-r--r-- | examples/quick/draganddrop/draganddrop.qml | 2 | ||||
-rw-r--r-- | examples/quick/draganddrop/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/imageelements/imageelements.pro | 8 | ||||
-rw-r--r-- | examples/quick/imageelements/imageelements.qml | 2 | ||||
-rw-r--r-- | examples/quick/imageelements/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/keyinteraction/keyinteraction.pro | 8 | ||||
-rw-r--r-- | examples/quick/keyinteraction/keyinteraction.qml | 2 | ||||
-rw-r--r-- | examples/quick/keyinteraction/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/localstorage/doc/src/localstorage.qdoc (renamed from examples/localstorage/doc/src/localstorage.qdoc) | 0 | ||||
-rw-r--r-- | examples/quick/localstorage/localstorage.pro | 2 | ||||
-rw-r--r-- | examples/quick/localstorage/localstorage/hello.qml (renamed from examples/localstorage/localstorage/hello.qml) | 0 | ||||
-rw-r--r-- | examples/quick/localstorage/localstorage/localstorage.pro | 9 | ||||
-rw-r--r-- | examples/quick/localstorage/localstorage/localstorage.qml (renamed from examples/localstorage/localstorage/localstorage.qml) | 0 | ||||
-rw-r--r-- | examples/quick/localstorage/localstorage/localstorage.qmlproject (renamed from examples/localstorage/localstorage/localstorage.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/localstorage/localstorage/main.cpp (renamed from examples/localstorage/localstorage/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/modelviews/browser.prx | 18 | ||||
-rw-r--r-- | examples/quick/modelviews/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/modelviews/modelviews.pro | 25 | ||||
-rw-r--r-- | examples/quick/modelviews/modelviews.qml | 2 | ||||
-rw-r--r-- | examples/quick/mousearea/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/mousearea/mousearea.pro | 11 | ||||
-rw-r--r-- | examples/quick/particles/affectors/affectors.pro | 9 | ||||
-rw-r--r-- | examples/quick/particles/affectors/affectors.qml (renamed from examples/particles/affectors/affectors.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/affectors.qmlproject (renamed from examples/particles/affectors/affectors.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/GreyButton.qml (renamed from examples/particles/affectors/content/GreyButton.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/age.qml (renamed from examples/particles/affectors/content/age.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/attractor.qml (renamed from examples/particles/affectors/content/attractor.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/customaffector.qml (renamed from examples/particles/affectors/content/customaffector.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/friction.qml (renamed from examples/particles/affectors/content/friction.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/gravity.qml (renamed from examples/particles/affectors/content/gravity.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/groupgoal.qml (renamed from examples/particles/affectors/content/groupgoal.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/move.qml (renamed from examples/particles/affectors/content/move.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/spritegoal.qml (renamed from examples/particles/affectors/content/spritegoal.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/turbulence.qml (renamed from examples/particles/affectors/content/turbulence.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/content/wander.qml (renamed from examples/particles/affectors/content/wander.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/doc/images/qml-affectors-example.png (renamed from examples/particles/affectors/doc/images/qml-affectors-example.png) | bin | 22074 -> 22074 bytes | |||
-rw-r--r-- | examples/quick/particles/affectors/doc/src/affectors.qdoc (renamed from examples/particles/affectors/doc/src/affectors.qdoc) | 0 | ||||
-rw-r--r-- | examples/quick/particles/affectors/main.cpp (renamed from examples/particles/affectors/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/particles/customparticle/content/blurparticles.qml (renamed from examples/particles/customparticle/content/blurparticles.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/customparticle/content/fragmentshader.qml (renamed from examples/particles/customparticle/content/fragmentshader.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/customparticle/content/imagecolors.qml (renamed from examples/particles/customparticle/content/imagecolors.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/customparticle/customparticle.pro | 9 | ||||
-rw-r--r-- | examples/quick/particles/customparticle/customparticle.qml (renamed from examples/particles/customparticle/customparticle.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/customparticle/customparticle.qmlproject (renamed from examples/particles/customparticle/customparticle.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/particles/customparticle/doc/images/qml-customparticle-example.png (renamed from examples/particles/customparticle/doc/images/qml-customparticle-example.png) | bin | 123781 -> 123781 bytes | |||
-rw-r--r-- | examples/quick/particles/customparticle/doc/src/customparticle.qdoc (renamed from examples/particles/customparticle/doc/src/customparticle.qdoc) | 0 | ||||
-rw-r--r-- | examples/quick/particles/customparticle/main.cpp (renamed from examples/particles/customparticle/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/content/burstandpulse.qml (renamed from examples/particles/emitters/content/burstandpulse.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/content/customemitter.qml (renamed from examples/particles/emitters/content/customemitter.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/content/emitmask.qml (renamed from examples/particles/emitters/content/emitmask.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/content/maximumemitted.qml (renamed from examples/particles/emitters/content/maximumemitted.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/content/shapeanddirection.qml (renamed from examples/particles/emitters/content/shapeanddirection.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/content/trailemitter.qml (renamed from examples/particles/emitters/content/trailemitter.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/content/velocityfrommotion.qml (renamed from examples/particles/emitters/content/velocityfrommotion.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/doc/images/qml-emitters-example.png (renamed from examples/particles/emitters/doc/images/qml-emitters-example.png) | bin | 54749 -> 54749 bytes | |||
-rw-r--r-- | examples/quick/particles/emitters/doc/src/emitters.qdoc (renamed from examples/particles/emitters/doc/src/emitters.qdoc) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/emitters.pro | 9 | ||||
-rw-r--r-- | examples/quick/particles/emitters/emitters.qml (renamed from examples/particles/emitters/emitters.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/emitters.qmlproject (renamed from examples/particles/emitters/emitters.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/particles/emitters/main.cpp (renamed from examples/particles/emitters/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/content/allatonce.qml (renamed from examples/particles/imageparticle/content/allatonce.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/content/colored.qml (renamed from examples/particles/imageparticle/content/colored.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/content/colortable.qml (renamed from examples/particles/imageparticle/content/colortable.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/content/deformation.qml (renamed from examples/particles/imageparticle/content/deformation.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/content/rotation.qml (renamed from examples/particles/imageparticle/content/rotation.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/content/sharing.qml (renamed from examples/particles/imageparticle/content/sharing.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/content/sprites.qml (renamed from examples/particles/imageparticle/content/sprites.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/doc/images/qml-imageparticle-example.png (renamed from examples/particles/imageparticle/doc/images/qml-imageparticle-example.png) | bin | 274020 -> 274020 bytes | |||
-rw-r--r-- | examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc (renamed from examples/particles/imageparticle/doc/src/imageparticle.qdoc) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/imageparticle.pro | 9 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/imageparticle.qml (renamed from examples/particles/imageparticle/imageparticle.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/imageparticle.qmlproject (renamed from examples/particles/imageparticle/imageparticle.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/particles/imageparticle/main.cpp (renamed from examples/particles/imageparticle/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/particles/images/_explo.png (renamed from examples/particles/images/_explo.png) | bin | 81528 -> 81528 bytes | |||
-rwxr-xr-x | examples/quick/particles/images/backgroundLeaves.jpg (renamed from examples/particles/images/backgroundLeaves.jpg) | bin | 78665 -> 78665 bytes | |||
-rw-r--r-- | examples/quick/particles/images/bear_tiles.png (renamed from examples/particles/images/bear_tiles.png) | bin | 40349 -> 40349 bytes | |||
-rw-r--r-- | examples/quick/particles/images/candle.png (renamed from examples/particles/images/candle.png) | bin | 1348 -> 1348 bytes | |||
-rw-r--r-- | examples/quick/particles/images/colortable.png (renamed from examples/particles/images/colortable.png) | bin | 704 -> 704 bytes | |||
-rw-r--r-- | examples/quick/particles/images/finalfrontier.png (renamed from examples/particles/images/finalfrontier.png) | bin | 695061 -> 695061 bytes | |||
-rw-r--r-- | examples/quick/particles/images/flower.png (renamed from examples/particles/images/flower.png) | bin | 4683 -> 4683 bytes | |||
-rw-r--r-- | examples/quick/particles/images/matchmask.png (renamed from examples/particles/images/matchmask.png) | bin | 2369 -> 2369 bytes | |||
-rw-r--r-- | examples/quick/particles/images/meteor.png (renamed from examples/particles/images/meteor.png) | bin | 83169 -> 83169 bytes | |||
-rw-r--r-- | examples/quick/particles/images/meteor_explo.png (renamed from examples/particles/images/meteor_explo.png) | bin | 219946 -> 219946 bytes | |||
-rw-r--r-- | examples/quick/particles/images/meteors.png (renamed from examples/particles/images/meteors.png) | bin | 132137 -> 132137 bytes | |||
-rw-r--r-- | examples/quick/particles/images/nullRock.png (renamed from examples/particles/images/nullRock.png) | bin | 140 -> 140 bytes | |||
-rw-r--r-- | examples/quick/particles/images/particle.png (renamed from examples/particles/images/particle.png) | bin | 861 -> 861 bytes | |||
-rw-r--r-- | examples/quick/particles/images/particle2.png (renamed from examples/particles/images/particle2.png) | bin | 3909 -> 3909 bytes | |||
-rw-r--r-- | examples/quick/particles/images/particle3.png (renamed from examples/particles/images/particle3.png) | bin | 3186 -> 3186 bytes | |||
-rw-r--r-- | examples/quick/particles/images/particle4.png (renamed from examples/particles/images/particle4.png) | bin | 1799 -> 1799 bytes | |||
-rw-r--r-- | examples/quick/particles/images/particleA.png (renamed from examples/particles/images/particleA.png) | bin | 3541 -> 3541 bytes | |||
-rw-r--r-- | examples/quick/particles/images/portal_bg.png (renamed from examples/particles/images/portal_bg.png) | bin | 96858 -> 96858 bytes | |||
-rw-r--r-- | examples/quick/particles/images/realLeaf1.png (renamed from examples/particles/images/realLeaf1.png) | bin | 15625 -> 15625 bytes | |||
-rw-r--r-- | examples/quick/particles/images/realLeaf2.png (renamed from examples/particles/images/realLeaf2.png) | bin | 13660 -> 13660 bytes | |||
-rw-r--r-- | examples/quick/particles/images/realLeaf3.png (renamed from examples/particles/images/realLeaf3.png) | bin | 23809 -> 23809 bytes | |||
-rw-r--r-- | examples/quick/particles/images/realLeaf4.png (renamed from examples/particles/images/realLeaf4.png) | bin | 23655 -> 23655 bytes | |||
-rw-r--r-- | examples/quick/particles/images/rocket.png (renamed from examples/particles/images/rocket.png) | bin | 7315 -> 7315 bytes | |||
-rw-r--r-- | examples/quick/particles/images/rocket2.png (renamed from examples/particles/images/rocket2.png) | bin | 1918 -> 1918 bytes | |||
-rw-r--r-- | examples/quick/particles/images/sizeInOut.png (renamed from examples/particles/images/sizeInOut.png) | bin | 251 -> 251 bytes | |||
-rw-r--r-- | examples/quick/particles/images/snowflake.png (renamed from examples/particles/images/snowflake.png) | bin | 189327 -> 189327 bytes | |||
-rw-r--r-- | examples/quick/particles/images/sparkleSize.png (renamed from examples/particles/images/sparkleSize.png) | bin | 378 -> 378 bytes | |||
-rw-r--r-- | examples/quick/particles/images/star.png (renamed from examples/particles/images/star.png) | bin | 1550 -> 1550 bytes | |||
-rw-r--r-- | examples/quick/particles/images/starfish_0.png (renamed from examples/particles/images/starfish_0.png) | bin | 15972 -> 15972 bytes | |||
-rw-r--r-- | examples/quick/particles/images/starfish_1.png (renamed from examples/particles/images/starfish_1.png) | bin | 15746 -> 15746 bytes | |||
-rw-r--r-- | examples/quick/particles/images/starfish_2.png (renamed from examples/particles/images/starfish_2.png) | bin | 16067 -> 16067 bytes | |||
-rw-r--r-- | examples/quick/particles/images/starfish_3.png (renamed from examples/particles/images/starfish_3.png) | bin | 16201 -> 16201 bytes | |||
-rw-r--r-- | examples/quick/particles/images/starfish_4.png (renamed from examples/particles/images/starfish_4.png) | bin | 14698 -> 14698 bytes | |||
-rw-r--r-- | examples/quick/particles/images/starfish_mask.png (renamed from examples/particles/images/starfish_mask.png) | bin | 11301 -> 11301 bytes | |||
-rw-r--r-- | examples/quick/particles/itemparticle/content/Delegate.qml (renamed from examples/particles/itemparticle/content/Delegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/itemparticle/content/Delegate2.qml (renamed from examples/particles/itemparticle/content/Delegate2.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/itemparticle/content/ExpandingDelegate.qml (renamed from examples/particles/itemparticle/content/ExpandingDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/itemparticle/content/RssModel.qml (renamed from examples/particles/itemparticle/content/RssModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/itemparticle/content/bubble.png (renamed from examples/particles/itemparticle/content/bubble.png) | bin | 3413 -> 3413 bytes | |||
-rw-r--r-- | examples/quick/particles/itemparticle/content/script.js (renamed from examples/particles/itemparticle/content/script.js) | 0 | ||||
-rw-r--r-- | examples/quick/particles/itemparticle/delegates.qml (renamed from examples/particles/itemparticle/delegates.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/itemparticle/particleview.qml (renamed from examples/particles/itemparticle/particleview.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/particles.pro (renamed from examples/particles/particles.pro) | 9 | ||||
-rw-r--r-- | examples/quick/particles/system/content/dynamiccomparison.qml (renamed from examples/particles/system/content/dynamiccomparison.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/system/content/dynamicemitters.qml (renamed from examples/particles/system/content/dynamicemitters.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/system/content/multiplepainters.qml (renamed from examples/particles/system/content/multiplepainters.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/system/content/startstop.qml (renamed from examples/particles/system/content/startstop.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/system/content/timedgroupchanges.qml (renamed from examples/particles/system/content/timedgroupchanges.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/system/doc/images/qml-system-example.png (renamed from examples/particles/system/doc/images/qml-system-example.png) | bin | 172685 -> 172685 bytes | |||
-rw-r--r-- | examples/quick/particles/system/doc/src/system.qdoc (renamed from examples/particles/system/doc/src/system.qdoc) | 0 | ||||
-rw-r--r-- | examples/quick/particles/system/main.cpp (renamed from examples/particles/system/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/particles/system/system.pro | 9 | ||||
-rw-r--r-- | examples/quick/particles/system/system.qml (renamed from examples/particles/system/system.qml) | 0 | ||||
-rw-r--r-- | examples/quick/particles/system/system.qmlproject (renamed from examples/particles/system/system.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/positioners/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/positioners/positioners.pro | 8 | ||||
-rw-r--r-- | examples/quick/positioners/positioners.qml | 2 | ||||
-rw-r--r-- | examples/quick/quick.pro | 14 | ||||
-rw-r--r-- | examples/quick/righttoleft/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/righttoleft/righttoleft.pro | 8 | ||||
-rw-r--r-- | examples/quick/righttoleft/righttoleft.qml | 2 | ||||
-rw-r--r-- | examples/quick/scenegraph/customgeometry/customgeometry.pro | 9 | ||||
-rw-r--r-- | examples/quick/scenegraph/openglunderqml/openglunderqml.pro | 10 | ||||
-rw-r--r-- | examples/quick/scenegraph/scenegraph.pro | 5 | ||||
-rw-r--r-- | examples/quick/scenegraph/simplematerial/simplematerial.pro | 10 | ||||
-rw-r--r-- | examples/quick/shadereffects/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/shadereffects/shadereffects.pro | 8 | ||||
-rw-r--r-- | examples/quick/shared/Button.qml (renamed from examples/shared/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/shared/LauncherList.qml (renamed from examples/shared/LauncherList.qml) | 0 | ||||
-rw-r--r-- | examples/quick/shared/README (renamed from examples/shared/README) | 0 | ||||
-rw-r--r-- | examples/quick/shared/SimpleLauncherDelegate.qml (renamed from examples/shared/SimpleLauncherDelegate.qml) | 0 | ||||
-rw-r--r-- | examples/quick/shared/images/back.png (renamed from examples/shared/images/back.png) | bin | 404 -> 404 bytes | |||
-rw-r--r-- | examples/quick/shared/qmldir (renamed from examples/shared/qmldir) | 0 | ||||
-rw-r--r-- | examples/quick/shared/shared.h (renamed from examples/shared/shared.h) | 0 | ||||
-rw-r--r-- | examples/quick/text/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/text/text.pro | 8 | ||||
-rw-r--r-- | examples/quick/text/text.qml | 2 | ||||
-rw-r--r-- | examples/quick/threading/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/threading/threading.pro | 8 | ||||
-rw-r--r-- | examples/quick/threading/threading.qml | 2 | ||||
-rw-r--r-- | examples/quick/touchinteraction/main.cpp | 2 | ||||
-rw-r--r-- | examples/quick/touchinteraction/touchinteraction.pro | 8 | ||||
-rw-r--r-- | examples/quick/touchinteraction/touchinteraction.qml | 2 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml (renamed from examples/tutorials/dynamicview/dynamicview1/PetsModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml (renamed from examples/tutorials/dynamicview/dynamicview1/dynamicview.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml (renamed from examples/tutorials/dynamicview/dynamicview2/PetsModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml (renamed from examples/tutorials/dynamicview/dynamicview2/dynamicview.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml (renamed from examples/tutorials/dynamicview/dynamicview3/PetsModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml (renamed from examples/tutorials/dynamicview/dynamicview3/dynamicview.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml (renamed from examples/tutorials/dynamicview/dynamicview4/ListSelector.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml (renamed from examples/tutorials/dynamicview/dynamicview4/PetsModel.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml (renamed from examples/tutorials/dynamicview/dynamicview4/dynamicview.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter1-basics/app.qml (renamed from examples/tutorials/extending/chapter1-basics/app.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro (renamed from examples/tutorials/extending/chapter1-basics/chapter1-basics.pro) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter1-basics/main.cpp (renamed from examples/tutorials/extending/chapter1-basics/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter1-basics/piechart.cpp (renamed from examples/tutorials/extending/chapter1-basics/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter1-basics/piechart.h (renamed from examples/tutorials/extending/chapter1-basics/piechart.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter2-methods/app.qml (renamed from examples/tutorials/extending/chapter2-methods/app.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter2-methods/chapter2-methods.pro (renamed from examples/tutorials/extending/chapter2-methods/chapter2-methods.pro) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter2-methods/main.cpp (renamed from examples/tutorials/extending/chapter2-methods/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter2-methods/piechart.cpp (renamed from examples/tutorials/extending/chapter2-methods/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter2-methods/piechart.h (renamed from examples/tutorials/extending/chapter2-methods/piechart.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter3-bindings/app.qml (renamed from examples/tutorials/extending/chapter3-bindings/app.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter3-bindings/chapter3-bindings.pro (renamed from examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter3-bindings/main.cpp (renamed from examples/tutorials/extending/chapter3-bindings/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp (renamed from examples/tutorials/extending/chapter3-bindings/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter3-bindings/piechart.h (renamed from examples/tutorials/extending/chapter3-bindings/piechart.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml (renamed from examples/tutorials/extending/chapter4-customPropertyTypes/app.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro (renamed from examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp (renamed from examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp (renamed from examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h (renamed from examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp (renamed from examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h (renamed from examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter5-listproperties/app.qml (renamed from examples/tutorials/extending/chapter5-listproperties/app.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro (renamed from examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter5-listproperties/main.cpp (renamed from examples/tutorials/extending/chapter5-listproperties/main.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp (renamed from examples/tutorials/extending/chapter5-listproperties/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter5-listproperties/piechart.h (renamed from examples/tutorials/extending/chapter5-listproperties/piechart.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp (renamed from examples/tutorials/extending/chapter5-listproperties/pieslice.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter5-listproperties/pieslice.h (renamed from examples/tutorials/extending/chapter5-listproperties/pieslice.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir (renamed from examples/tutorials/extending/chapter6-plugins/Charts/qmldir) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/app.qml (renamed from examples/tutorials/extending/chapter6-plugins/app.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro (renamed from examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp (renamed from examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h (renamed from examples/tutorials/extending/chapter6-plugins/chartsplugin.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp (renamed from examples/tutorials/extending/chapter6-plugins/piechart.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/piechart.h (renamed from examples/tutorials/extending/chapter6-plugins/piechart.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp (renamed from examples/tutorials/extending/chapter6-plugins/pieslice.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/chapter6-plugins/pieslice.h (renamed from examples/tutorials/extending/chapter6-plugins/pieslice.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/extending/extending.pro (renamed from examples/tutorials/extending/extending.pro) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/core/Button.qml (renamed from examples/tutorials/gettingStartedQml/core/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/core/EditMenu.qml (renamed from examples/tutorials/gettingStartedQml/core/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml (renamed from examples/tutorials/gettingStartedQml/core/FileDialog.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/core/FileMenu.qml (renamed from examples/tutorials/gettingStartedQml/core/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml (renamed from examples/tutorials/gettingStartedQml/core/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/core/TextArea.qml (renamed from examples/tutorials/gettingStartedQml/core/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/core/qmldir (renamed from examples/tutorials/gettingStartedQml/core/qmldir) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp (renamed from examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.h (renamed from examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/directory.cpp (renamed from examples/tutorials/gettingStartedQml/filedialog/directory.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/directory.h (renamed from examples/tutorials/gettingStartedQml/filedialog/directory.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/file.cpp (renamed from examples/tutorials/gettingStartedQml/filedialog/file.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/file.h (renamed from examples/tutorials/gettingStartedQml/filedialog/file.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro (renamed from examples/tutorials/gettingStartedQml/filedialog/filedialog.pro) | 8 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/filedialog/qmldir (renamed from examples/tutorials/gettingStartedQml/filedialog/qmldir) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro | 10 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/images/arrow.png (renamed from examples/tutorials/gettingStartedQml/images/arrow.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part0/Button.qml (renamed from examples/tutorials/gettingStartedQml/parts/part0/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/Button.qml (renamed from examples/tutorials/gettingStartedQml/parts/part1/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/EditMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/FileMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml (renamed from examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png (renamed from examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png) | bin | 1670 -> 1670 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png (renamed from examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png) | bin | 6177 -> 6177 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png (renamed from examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png) | bin | 6062 -> 6062 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png (renamed from examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png) | bin | 1055 -> 1055 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject (renamed from examples/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part2/Button.qml (renamed from examples/tutorials/gettingStartedQml/parts/part2/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part2/EditMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part2/FileMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part2/MenuBar.qml (renamed from examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png (renamed from examples/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png) | bin | 6079 -> 6079 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject (renamed from examples/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml (renamed from examples/tutorials/gettingStartedQml/parts/part3/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml (renamed from examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml (renamed from examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml (renamed from examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/images/arrow.png (renamed from examples/tutorials/gettingStartedQml/parts/part3/images/arrow.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png (renamed from examples/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png) | bin | 59345 -> 59345 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject (renamed from examples/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/Button.qml (renamed from examples/tutorials/gettingStartedQml/parts/part4/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/EditMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/FileMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/MenuBar.qml (renamed from examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml (renamed from examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/TextArea.qml (renamed from examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/TextEditor.qml (renamed from examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/images/arrow.png (renamed from examples/tutorials/gettingStartedQml/parts/part4/images/arrow.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png (renamed from examples/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png) | bin | 63629 -> 63629 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject (renamed from examples/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/TextEditor.qml (renamed from examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/core/Button.qml (renamed from examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml (renamed from examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml (renamed from examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml (renamed from examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml (renamed from examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/core/qmldir (renamed from examples/tutorials/gettingStartedQml/parts/part5/core/qmldir) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp (renamed from examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h (renamed from examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp (renamed from examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h (renamed from examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp (renamed from examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.h (renamed from examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro (renamed from examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir (renamed from examples/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/images/arrow.png (renamed from examples/tutorials/gettingStartedQml/parts/part5/images/arrow.png) | bin | 583 -> 583 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png (renamed from examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png) | bin | 65123 -> 65123 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png (renamed from examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png) | bin | 21367 -> 21367 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png (renamed from examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png) | bin | 76693 -> 76693 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject (renamed from examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png (renamed from examples/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png) | bin | 65123 -> 65123 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png (renamed from examples/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png) | bin | 21367 -> 21367 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png (renamed from examples/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png) | bin | 76693 -> 76693 bytes | |||
-rw-r--r-- | examples/quick/tutorials/gettingStartedQml/texteditor.qml (renamed from examples/tutorials/gettingStartedQml/texteditor.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/helloworld/Cell.qml (renamed from examples/tutorials/helloworld/Cell.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/helloworld/tutorial1.qml (renamed from examples/tutorials/helloworld/tutorial1.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/helloworld/tutorial2.qml (renamed from examples/tutorials/helloworld/tutorial2.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/helloworld/tutorial3.qml (renamed from examples/tutorials/helloworld/tutorial3.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame1/Block.qml (renamed from examples/tutorials/samegame/samegame1/Block.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame1/Button.qml (renamed from examples/tutorials/samegame/samegame1/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame1/samegame.qml (renamed from examples/tutorials/samegame/samegame1/samegame.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame1/samegame1.qmlproject (renamed from examples/tutorials/samegame/samegame1/samegame1.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame2/Block.qml (renamed from examples/tutorials/samegame/samegame2/Block.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame2/Button.qml (renamed from examples/tutorials/samegame/samegame2/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame2/samegame.js (renamed from examples/tutorials/samegame/samegame2/samegame.js) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame2/samegame.qml (renamed from examples/tutorials/samegame/samegame2/samegame.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame2/samegame2.qmlproject (renamed from examples/tutorials/samegame/samegame2/samegame2.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame3/Block.qml (renamed from examples/tutorials/samegame/samegame3/Block.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame3/Button.qml (renamed from examples/tutorials/samegame/samegame3/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame3/Dialog.qml (renamed from examples/tutorials/samegame/samegame3/Dialog.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame3/samegame.js (renamed from examples/tutorials/samegame/samegame3/samegame.js) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame3/samegame.qml (renamed from examples/tutorials/samegame/samegame3/samegame.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame3/samegame3.qmlproject (renamed from examples/tutorials/samegame/samegame3/samegame3.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml (renamed from examples/tutorials/samegame/samegame4/content/BoomBlock.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame4/content/Button.qml (renamed from examples/tutorials/samegame/samegame4/content/Button.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame4/content/Dialog.qml (renamed from examples/tutorials/samegame/samegame4/content/Dialog.qml) | 0 | ||||
-rwxr-xr-x | examples/quick/tutorials/samegame/samegame4/content/samegame.js (renamed from examples/tutorials/samegame/samegame4/content/samegame.js) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame4/highscores/README (renamed from examples/tutorials/samegame/samegame4/highscores/README) | 0 | ||||
-rwxr-xr-x | examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml (renamed from examples/tutorials/samegame/samegame4/highscores/score_data.xml) | 0 | ||||
-rwxr-xr-x | examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl (renamed from examples/tutorials/samegame/samegame4/highscores/score_style.xsl) | 0 | ||||
-rwxr-xr-x | examples/quick/tutorials/samegame/samegame4/highscores/scores.php (renamed from examples/tutorials/samegame/samegame4/highscores/scores.php) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame4/samegame.qml (renamed from examples/tutorials/samegame/samegame4/samegame.qml) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/samegame4/samegame4.qmlproject (renamed from examples/tutorials/samegame/samegame4/samegame4.qmlproject) | 0 | ||||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/background.jpg (renamed from examples/tutorials/samegame/shared/pics/background.jpg) | bin | 36473 -> 36473 bytes | |||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/blueStar.png (renamed from examples/tutorials/samegame/shared/pics/blueStar.png) | bin | 278 -> 278 bytes | |||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/blueStone.png (renamed from examples/tutorials/samegame/shared/pics/blueStone.png) | bin | 3054 -> 3054 bytes | |||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/greenStar.png (renamed from examples/tutorials/samegame/shared/pics/greenStar.png) | bin | 273 -> 273 bytes | |||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/greenStone.png (renamed from examples/tutorials/samegame/shared/pics/greenStone.png) | bin | 2932 -> 2932 bytes | |||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/redStar.png (renamed from examples/tutorials/samegame/shared/pics/redStar.png) | bin | 274 -> 274 bytes | |||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/redStone.png (renamed from examples/tutorials/samegame/shared/pics/redStone.png) | bin | 2902 -> 2902 bytes | |||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/star.png (renamed from examples/tutorials/samegame/shared/pics/star.png) | bin | 262 -> 262 bytes | |||
-rw-r--r-- | examples/quick/tutorials/samegame/shared/pics/yellowStone.png (renamed from examples/tutorials/samegame/shared/pics/yellowStone.png) | bin | 3056 -> 3056 bytes | |||
-rw-r--r-- | examples/quick/tutorials/tutorials.pro | 8 | ||||
-rw-r--r-- | examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc | 2 | ||||
-rw-r--r-- | examples/quick/window/screen/screenInfo.qml (renamed from examples/window/screen/screenInfo.qml) | 0 | ||||
-rw-r--r-- | examples/quick/window/window.pro | 6 | ||||
-rw-r--r-- | examples/quick/window/window/Window.qml (renamed from examples/window/window/Window.qml) | 0 | ||||
-rw-r--r-- | examples/quick/window/window/nogui.qml (renamed from examples/window/window/nogui.qml) | 0 | ||||
-rw-r--r-- | examples/quick/window/window/standalone.qml (renamed from examples/window/window/standalone.qml) | 0 | ||||
-rw-r--r-- | examples/quick/window/window/twowindows.qml (renamed from examples/window/window/twowindows.qml) | 0 | ||||
-rw-r--r-- | examples/quick/window/window/window.cpp (renamed from examples/window/window/window.cpp) | 0 | ||||
-rw-r--r-- | examples/quick/window/window/window.pro | 11 | ||||
-rw-r--r-- | examples/shared/shared.pro | 9 | ||||
-rw-r--r-- | examples/tutorials/gettingStartedQml/gettingStartedQml.pro | 8 | ||||
-rw-r--r-- | examples/tutorials/tutorials.pro | 7 | ||||
-rw-r--r-- | examples/window/window.pro | 9 | ||||
-rw-r--r-- | examples/window/window/window.pro | 11 |
622 files changed, 346 insertions, 457 deletions
diff --git a/examples/demos/calqlatr/calqlatr.pro b/examples/demos/calqlatr/calqlatr.pro deleted file mode 100644 index 6a147f4ce6..0000000000 --- a/examples/demos/calqlatr/calqlatr.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += qml quick -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr -qml.files = calqlatr.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/calqlatr -sources.files = $$SOURCES calqlatr.pro -sources.path = $$qml.path -INSTALLS += target sources qml diff --git a/examples/demos/demos.pro b/examples/demos/demos.pro deleted file mode 100644 index b243396986..0000000000 --- a/examples/demos/demos.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = calqlatr \ - samegame \ - tweetsearch \ - maroon \ - stocqt - -# install -sources.files = demos.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos -INSTALLS += sources diff --git a/examples/demos/maroon/maroon.pro b/examples/demos/maroon/maroon.pro deleted file mode 100644 index fa2e4b5709..0000000000 --- a/examples/demos/maroon/maroon.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += qml quick -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon -qml.files = maroon.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/maroon -sources.files = $$SOURCES maroon.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/demos/samegame/samegame.pro b/examples/demos/samegame/samegame.pro deleted file mode 100644 index 2f7afef5a5..0000000000 --- a/examples/demos/samegame/samegame.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += qml quick -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame -qml.files = samegame.qml content settings.js -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/samegame -sources.files = $$SOURCES samegame.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/demos/stocqt/stocqt.pro b/examples/demos/stocqt/stocqt.pro deleted file mode 100644 index dfa1924946..0000000000 --- a/examples/demos/stocqt/stocqt.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += qml quick -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt -qml.files = stocqt.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/stocqt -sources.files = $$SOURCES stocqt.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/demos/tweetsearch/tweetsearch.pro b/examples/demos/tweetsearch/tweetsearch.pro deleted file mode 100644 index 36f4377de1..0000000000 --- a/examples/demos/tweetsearch/tweetsearch.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch -qml.files = tweetsearch.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/demos/tweetsearch -sources.files = $$SOURCES tweetsearch.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/examples.pro b/examples/examples.pro index f2b7a2dddf..1bcc66d164 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,16 +1,5 @@ TEMPLATE = subdirs SUBDIRS += \ - demos \ - shared \ - localstorage \ - particles \ + qmltest \ qml \ - quick \ - tutorials \ - window \ - qmltest - -# install -sources.files = shared examples.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/ -INSTALLS += sources + quick diff --git a/examples/localstorage/localstorage.pro b/examples/localstorage/localstorage.pro deleted file mode 100644 index d9058700ff..0000000000 --- a/examples/localstorage/localstorage.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += localstorage - -# install -sources.files = localstorage.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage -INSTALLS += sources diff --git a/examples/localstorage/localstorage/localstorage.pro b/examples/localstorage/localstorage/localstorage.pro deleted file mode 100644 index 504f9f77c1..0000000000 --- a/examples/localstorage/localstorage/localstorage.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage -qml.files = localstorage.qml hello.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/localstorage/localstorage -sources.files = $$SOURCES localstorage.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/particles/affectors/affectors.pro b/examples/particles/affectors/affectors.pro deleted file mode 100644 index 231be91f01..0000000000 --- a/examples/particles/affectors/affectors.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors -qml.files = affectors.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/affectors -sources.files = $$SOURCES affectors.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/particles/customparticle/customparticle.pro b/examples/particles/customparticle/customparticle.pro deleted file mode 100644 index 80043799b0..0000000000 --- a/examples/particles/customparticle/customparticle.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle -qml.files = customparticle.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/customparticle -sources.files = $$SOURCES customparticle.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/particles/emitters/emitters.pro b/examples/particles/emitters/emitters.pro deleted file mode 100644 index aae8e83c71..0000000000 --- a/examples/particles/emitters/emitters.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters -qml.files = emitters.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/emitters -sources.files = $$SOURCES emitters.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/particles/imageparticle/imageparticle.pro b/examples/particles/imageparticle/imageparticle.pro deleted file mode 100644 index 17d4816138..0000000000 --- a/examples/particles/imageparticle/imageparticle.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle -qml.files = imageparticle.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/imageparticle -sources.files = $$SOURCES imageparticle.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/particles/system/system.pro b/examples/particles/system/system.pro deleted file mode 100644 index 7cc3165483..0000000000 --- a/examples/particles/system/system.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system -qml.files = system.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles/system -sources.files = $$SOURCES system.pro -sources.path = $$qml.path -INSTALLS += sources target qml diff --git a/examples/qml/imageprovider/imageprovider.pro b/examples/qml/imageprovider/imageprovider.pro index 135f4da627..d1dd321b72 100644 --- a/examples/qml/imageprovider/imageprovider.pro +++ b/examples/qml/imageprovider/imageprovider.pro @@ -7,15 +7,9 @@ TARGET = qmlimageproviderplugin SOURCES += imageprovider.cpp -OTHER_FILES += imageprovider.json +EXAMPLE_FILES = imageprovider-example.qml -sources.files = $$SOURCES imageprovider.qml imageprovider.pro $$OTHER_FILES -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore - -ImageProviderCore_sources.files = \ - ImageProviderCore/qmldir -ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/imageprovider/ImageProviderCore - -INSTALLS = sources ImageProviderCore_sources target +target.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore +qml.files = ImageProviderCore/qmldir +qml.path = $$[QT_INSTALL_EXAMPLES]/qml/imageprovider/ImageProviderCore +INSTALLS = target qml diff --git a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 3195dfd7a2..222cc71c46 100644 --- a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -3,8 +3,5 @@ QT += qml quick network SOURCES += main.cpp RESOURCES += networkaccessmanagerfactory.qrc -sources.files = $$SOURCES $$RESOURCES networkaccessmanagerfactory.pro view.qml -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/networkaccessmanagerfactory -target.path = $$sources.path - -INSTALLS = sources target +target.path = $$[QT_INSTALL_EXAMPLES]/qml/networkaccessmanagerfactory +INSTALLS = target diff --git a/examples/qml/plugins/plugins.pro b/examples/qml/plugins/plugins.pro index 66af7d3c07..6f8cb37f93 100644 --- a/examples/qml/plugins/plugins.pro +++ b/examples/qml/plugins/plugins.pro @@ -7,7 +7,7 @@ TARGET = qmlqtimeexampleplugin SOURCES += plugin.cpp -qdeclarativesources.files += \ +pluginfiles.files += \ imports/TimeExample/qmldir \ imports/TimeExample/center.png \ imports/TimeExample/clock.png \ @@ -15,11 +15,10 @@ qdeclarativesources.files += \ imports/TimeExample/hour.png \ imports/TimeExample/minute.png -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins/imports/TimeExample +qml.files = plugins.qml +qml.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins +target.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample +pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/plugins/imports/TimeExample -sources.files += plugins.pro plugin.cpp plugins.qml -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/plugins/imports/TimeExample - -INSTALLS += qdeclarativesources sources target +INSTALLS += target qml pluginfiles diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro index 6bc620fbf0..a66d08a8b7 100644 --- a/examples/qml/qml.pro +++ b/examples/qml/qml.pro @@ -1,12 +1,13 @@ TEMPLATE = subdirs SUBDIRS +=imageprovider \ - plugins \ networkaccessmanagerfactory \ + plugins \ referenceexamples \ - shell + shell \ + xmlhttprequest -#Install -sources.files = qml.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml -INSTALLS += sources +EXAMPLE_FILES = \ + dynamicscene \ + i18n \ + locale diff --git a/examples/qml/referenceexamples/adding/adding.pro b/examples/qml/referenceexamples/adding/adding.pro index a6c2fc65ed..86c830bda9 100644 --- a/examples/qml/referenceexamples/adding/adding.pro +++ b/examples/qml/referenceexamples/adding/adding.pro @@ -5,7 +5,5 @@ SOURCES += main.cpp \ HEADERS += person.h RESOURCES += adding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/adding -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/adding +INSTALLS += target diff --git a/examples/qml/referenceexamples/attached/attached.pro b/examples/qml/referenceexamples/attached/attached.pro index 247db55cee..1225a5fcfd 100644 --- a/examples/qml/referenceexamples/attached/attached.pro +++ b/examples/qml/referenceexamples/attached/attached.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += attached.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/attached -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/attached +INSTALLS += target diff --git a/examples/qml/referenceexamples/binding/binding.pro b/examples/qml/referenceexamples/binding/binding.pro index 86787c7654..3c1f9565ed 100644 --- a/examples/qml/referenceexamples/binding/binding.pro +++ b/examples/qml/referenceexamples/binding/binding.pro @@ -7,9 +7,7 @@ SOURCES += main.cpp \ HEADERS += person.h \ birthdayparty.h \ happybirthdaysong.h - RESOURCES += binding.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/binding -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro example.qml -sources.path = $$target.path -INSTALLS += target sources + +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/binding +INSTALLS += target diff --git a/examples/qml/referenceexamples/coercion/coercion.pro b/examples/qml/referenceexamples/coercion/coercion.pro index e053ac21cb..c501b9cda2 100644 --- a/examples/qml/referenceexamples/coercion/coercion.pro +++ b/examples/qml/referenceexamples/coercion/coercion.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += coercion.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/coercion -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/coercion +INSTALLS += target diff --git a/examples/qml/referenceexamples/default/default.pro b/examples/qml/referenceexamples/default/default.pro index 80bee64461..db4b88413b 100644 --- a/examples/qml/referenceexamples/default/default.pro +++ b/examples/qml/referenceexamples/default/default.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += default.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/default -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/default +INSTALLS += target diff --git a/examples/qml/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro index 5b21d90447..b38a1753b9 100644 --- a/examples/qml/referenceexamples/extended/extended.pro +++ b/examples/qml/referenceexamples/extended/extended.pro @@ -5,7 +5,5 @@ SOURCES += main.cpp \ HEADERS += lineedit.h RESOURCES += extended.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/extended -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/extended +INSTALLS += target diff --git a/examples/qml/referenceexamples/grouped/grouped.pro b/examples/qml/referenceexamples/grouped/grouped.pro index afd1c15668..7014d9680d 100644 --- a/examples/qml/referenceexamples/grouped/grouped.pro +++ b/examples/qml/referenceexamples/grouped/grouped.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += grouped.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/grouped -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/grouped +INSTALLS += target diff --git a/examples/qml/referenceexamples/methods/methods.pro b/examples/qml/referenceexamples/methods/methods.pro index a7dd996532..c1be0713e6 100644 --- a/examples/qml/referenceexamples/methods/methods.pro +++ b/examples/qml/referenceexamples/methods/methods.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += methods.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/methods -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/methods +INSTALLS += target diff --git a/examples/qml/referenceexamples/properties/properties.pro b/examples/qml/referenceexamples/properties/properties.pro index c1cf877e65..cd1ffeddcc 100644 --- a/examples/qml/referenceexamples/properties/properties.pro +++ b/examples/qml/referenceexamples/properties/properties.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += properties.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/properties -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/properties +INSTALLS += target diff --git a/examples/qml/referenceexamples/referenceexamples.pro b/examples/qml/referenceexamples/referenceexamples.pro index 5f514bc1db..4bfbd488ea 100644 --- a/examples/qml/referenceexamples/referenceexamples.pro +++ b/examples/qml/referenceexamples/referenceexamples.pro @@ -13,7 +13,3 @@ SUBDIRS += \ methods !contains(QT_CONFIG, no-widgets): SUBDIRS += extended - -sources.files = referenceexamples.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples -INSTALLS += sources diff --git a/examples/qml/referenceexamples/signal/signal.pro b/examples/qml/referenceexamples/signal/signal.pro index 5a021ebae0..81692d3676 100644 --- a/examples/qml/referenceexamples/signal/signal.pro +++ b/examples/qml/referenceexamples/signal/signal.pro @@ -7,7 +7,5 @@ HEADERS += person.h \ birthdayparty.h RESOURCES += signal.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/signal -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/signal +INSTALLS += target diff --git a/examples/qml/referenceexamples/valuesource/valuesource.pro b/examples/qml/referenceexamples/valuesource/valuesource.pro index d7aafb7d10..4ec77ff83b 100644 --- a/examples/qml/referenceexamples/valuesource/valuesource.pro +++ b/examples/qml/referenceexamples/valuesource/valuesource.pro @@ -9,7 +9,5 @@ HEADERS += person.h \ happybirthdaysong.h RESOURCES += valuesource.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/referenceexamples/valuesource -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro example.qml -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/referenceexamples/valuesource +INSTALLS += target diff --git a/examples/qml/shell/shell.pro b/examples/qml/shell/shell.pro index b57d550d31..da97590189 100644 --- a/examples/qml/shell/shell.pro +++ b/examples/qml/shell/shell.pro @@ -5,7 +5,5 @@ mac:CONFIG -= app_bundle SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/shell -sources.files = $$SOURCES shell.pro -sources.path = $$target.path -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/qml/shell +INSTALLS += target diff --git a/examples/qml/xmlhttprequest/main.cpp b/examples/qml/xmlhttprequest/main.cpp index 976a462464..25f3759de5 100644 --- a/examples/qml/xmlhttprequest/main.cpp +++ b/examples/qml/xmlhttprequest/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" -DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest)
\ No newline at end of file +#include "../../quick/shared/shared.h" +DECLARATIVE_EXAMPLE_MAIN(xmlhttprequest) diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.pro b/examples/qml/xmlhttprequest/xmlhttprequest.pro index bb7fae66bf..5af32eeab6 100644 --- a/examples/qml/xmlhttprequest/xmlhttprequest.pro +++ b/examples/qml/xmlhttprequest/xmlhttprequest.pro @@ -3,7 +3,10 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest +EXAMPLE_FILES = \ + data.xml + +target.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest qml.files = xmlhttprequest.qml get.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qml/xmlhttprequest +qml.path = $$[QT_INSTALL_EXAMPLES]/qml/xmlhttprequest INSTALLS += target qml diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qml b/examples/qml/xmlhttprequest/xmlhttprequest.qml index b9bf4548cb..b483ac1aa0 100644 --- a/examples/qml/xmlhttprequest/xmlhttprequest.qml +++ b/examples/qml/xmlhttprequest/xmlhttprequest.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../../quick/shared" as Examples Item { height: 480 diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro index dbf032e11c..3ade5f2cbd 100644 --- a/examples/qmltest/qmltest/qmltest.pro +++ b/examples/qmltest/qmltest/qmltest.pro @@ -5,7 +5,7 @@ SOURCES += tst_qmltest.cpp # Note: Normally, tests are auto-installed to a test-specific directory. Overwritten here # so this one will end up in the examples tree. -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/qmltest -sources.files = $$SOURCES qmltest.pro *.qml -sources.path = $$target.path -INSTALLS = sources target +target.path = $$[QT_INSTALL_EXAMPLES]/qmltest +qml.files = tst_basic.qml tst_item.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest +INSTALLS += target qml diff --git a/examples/quick/accessibility/accessibility.pro b/examples/quick/accessibility/accessibility.pro index 681e44b307..9658a8e70b 100644 --- a/examples/quick/accessibility/accessibility.pro +++ b/examples/quick/accessibility/accessibility.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility +target.path = $$[QT_INSTALL_EXAMPLES]/quick/accessibility qml.files = accessibility.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility -sources.files = $$SOURCES accessibility.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/accessibility +INSTALLS += target qml diff --git a/examples/quick/accessibility/main.cpp b/examples/quick/accessibility/main.cpp index 801ccdcf19..51374d0493 100644 --- a/examples/quick/accessibility/main.cpp +++ b/examples/quick/accessibility/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(accessibility) diff --git a/examples/quick/animation/animation.pro b/examples/quick/animation/animation.pro index edc767d709..58e9226ea5 100644 --- a/examples/quick/animation/animation.pro +++ b/examples/quick/animation/animation.pro @@ -3,10 +3,8 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation +target.path = $$[QT_INSTALL_EXAMPLES]/quick/animation qml.files = animation.qml basics behaviors easing pathanimation pathinterpolator states -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation -sources.files = $$SOURCES animation.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/animation +INSTALLS += target qml diff --git a/examples/quick/animation/animation.qml b/examples/quick/animation/animation.qml index a17967a496..8a1b8558ee 100644 --- a/examples/quick/animation/animation.qml +++ b/examples/quick/animation/animation.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Item { height: 480 diff --git a/examples/quick/animation/main.cpp b/examples/quick/animation/main.cpp index faccffc27a..dc5b506888 100644 --- a/examples/quick/animation/main.cpp +++ b/examples/quick/animation/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(animation) diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro index 9f024237a2..d721805abd 100644 --- a/examples/quick/canvas/canvas.pro +++ b/examples/quick/canvas/canvas.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas +target.path = $$[QT_INSTALL_EXAMPLES]/quick/canvas qml.files = canvas.qml bezierCurve clip quadraticCurveTo roundedrect smile squircle tiger contents -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas -sources.files = $$SOURCES canvas.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/canvas +INSTALLS += target qml diff --git a/examples/quick/canvas/canvas.qml b/examples/quick/canvas/canvas.qml index 65707f7381..e1e8724149 100644 --- a/examples/quick/canvas/canvas.qml +++ b/examples/quick/canvas/canvas.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Item { height: 480 diff --git a/examples/quick/canvas/main.cpp b/examples/quick/canvas/main.cpp index acbef7551b..52c62ace12 100644 --- a/examples/quick/canvas/main.cpp +++ b/examples/quick/canvas/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(canvas)
\ No newline at end of file diff --git a/examples/quick/customitems/customitems.pro b/examples/quick/customitems/customitems.pro index a401042d4e..1e0a2aed49 100644 --- a/examples/quick/customitems/customitems.pro +++ b/examples/quick/customitems/customitems.pro @@ -1,17 +1,14 @@ TEMPLATE = subdirs SUBDIRS = \ - #dialcontrol \ - #flipable \ painteditem \ - #progressbar \ - #scrollbar \ - #searchbox \ - #slideswitch \ - #spinner \ - #tabwidget \ maskedmousearea -# install -sources.files = customitems.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems -INSTALLS += sources +EXAMPLE_FILES = \ + dialcontrol \ + flipable \ + progressbar \ + scrollbar \ + searchbox \ + slideswitch \ + spinner \ + tabwidget diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro index b812508bd7..d44fa59d08 100644 --- a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro +++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro @@ -7,9 +7,7 @@ HEADERS += maskedmousearea.h SOURCES += main.cpp \ maskedmousearea.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/maskedmousearea +target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/maskedmousearea qml.files = maskedmousearea.qml images qml.path = $$target.path -sources.files = $$SOURCES $$HEADERS maskedmousearea.pro -sources.path = $$qml.path -INSTALLS += sources target qml +INSTALLS += target qml diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro index 846ad6307d..dfe6f96923 100644 --- a/examples/quick/customitems/painteditem/painteditem.pro +++ b/examples/quick/customitems/painteditem/painteditem.pro @@ -9,16 +9,12 @@ HEADERS += TextBalloonPlugin/plugin.h \ SOURCES += textballoon.cpp -OTHER_FILES += textballoon.json - DESTDIR = TextBalloonPlugin -INSTALL_PATH = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/painteditem/ -qdeclarativesources.files += \ - TextBalloonPlugin/qmldir TextBalloonPlugin/plugin.h -qdeclarativesources.path += $$INSTALL_PATH/TextBalloonPlugin -sources.files = textballoons.qml $$SOURCES textballoon.h $$OTHER_FILES painteditem.pro -sources.path = $$INSTALL_PATH -target.path = $$INSTALL_PATH/TextBalloonPlugin +target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin +qmldir.files = TextBalloonPlugin/qmldir +qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin +qml.files = textballoons.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/ -INSTALLS = qdeclarativesources sources target +INSTALLS += qml qmldir target diff --git a/examples/quick/demos/calqlatr/calqlatr.pro b/examples/quick/demos/calqlatr/calqlatr.pro new file mode 100644 index 0000000000..fec0d6416b --- /dev/null +++ b/examples/quick/demos/calqlatr/calqlatr.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += qml quick +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/calqlatr +qml.files = calqlatr.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/calqlatr +INSTALLS += target qml diff --git a/examples/demos/calqlatr/calqlatr.qml b/examples/quick/demos/calqlatr/calqlatr.qml index 7640fbd738..7640fbd738 100644 --- a/examples/demos/calqlatr/calqlatr.qml +++ b/examples/quick/demos/calqlatr/calqlatr.qml diff --git a/examples/demos/calqlatr/calqlatr.qmlproject b/examples/quick/demos/calqlatr/calqlatr.qmlproject index ce2d59d310..ce2d59d310 100644 --- a/examples/demos/calqlatr/calqlatr.qmlproject +++ b/examples/quick/demos/calqlatr/calqlatr.qmlproject diff --git a/examples/demos/calqlatr/content/Button.qml b/examples/quick/demos/calqlatr/content/Button.qml index c355c2d105..c355c2d105 100644 --- a/examples/demos/calqlatr/content/Button.qml +++ b/examples/quick/demos/calqlatr/content/Button.qml diff --git a/examples/demos/calqlatr/content/Display.qml b/examples/quick/demos/calqlatr/content/Display.qml index 3c1d9c0cd5..3c1d9c0cd5 100644 --- a/examples/demos/calqlatr/content/Display.qml +++ b/examples/quick/demos/calqlatr/content/Display.qml diff --git a/examples/demos/calqlatr/content/NumberPad.qml b/examples/quick/demos/calqlatr/content/NumberPad.qml index 853c7631c9..853c7631c9 100644 --- a/examples/demos/calqlatr/content/NumberPad.qml +++ b/examples/quick/demos/calqlatr/content/NumberPad.qml diff --git a/examples/demos/calqlatr/content/StyleLabel.qml b/examples/quick/demos/calqlatr/content/StyleLabel.qml index 3bdea86129..3bdea86129 100644 --- a/examples/demos/calqlatr/content/StyleLabel.qml +++ b/examples/quick/demos/calqlatr/content/StyleLabel.qml diff --git a/examples/demos/calqlatr/content/audio/touch.wav b/examples/quick/demos/calqlatr/content/audio/touch.wav Binary files differindex 94cccb7546..94cccb7546 100644 --- a/examples/demos/calqlatr/content/audio/touch.wav +++ b/examples/quick/demos/calqlatr/content/audio/touch.wav diff --git a/examples/demos/calqlatr/content/calculator.js b/examples/quick/demos/calqlatr/content/calculator.js index 843ef39c02..843ef39c02 100644 --- a/examples/demos/calqlatr/content/calculator.js +++ b/examples/quick/demos/calqlatr/content/calculator.js diff --git a/examples/demos/calqlatr/content/images/icon-back.png b/examples/quick/demos/calqlatr/content/images/icon-back.png Binary files differindex 2989ee2e35..2989ee2e35 100644 --- a/examples/demos/calqlatr/content/images/icon-back.png +++ b/examples/quick/demos/calqlatr/content/images/icon-back.png diff --git a/examples/demos/calqlatr/content/images/icon-close.png b/examples/quick/demos/calqlatr/content/images/icon-close.png Binary files differindex 3e21248232..3e21248232 100644 --- a/examples/demos/calqlatr/content/images/icon-close.png +++ b/examples/quick/demos/calqlatr/content/images/icon-close.png diff --git a/examples/demos/calqlatr/content/images/icon-settings.png b/examples/quick/demos/calqlatr/content/images/icon-settings.png Binary files differindex 98e662f53f..98e662f53f 100644 --- a/examples/demos/calqlatr/content/images/icon-settings.png +++ b/examples/quick/demos/calqlatr/content/images/icon-settings.png diff --git a/examples/demos/calqlatr/content/images/logo.png b/examples/quick/demos/calqlatr/content/images/logo.png Binary files differindex 6bc65610bc..6bc65610bc 100644 --- a/examples/demos/calqlatr/content/images/logo.png +++ b/examples/quick/demos/calqlatr/content/images/logo.png diff --git a/examples/demos/calqlatr/content/images/paper-edge-left.png b/examples/quick/demos/calqlatr/content/images/paper-edge-left.png Binary files differindex ca29a3ae10..ca29a3ae10 100644 --- a/examples/demos/calqlatr/content/images/paper-edge-left.png +++ b/examples/quick/demos/calqlatr/content/images/paper-edge-left.png diff --git a/examples/demos/calqlatr/content/images/paper-edge-right.png b/examples/quick/demos/calqlatr/content/images/paper-edge-right.png Binary files differindex 7c2da7b930..7c2da7b930 100644 --- a/examples/demos/calqlatr/content/images/paper-edge-right.png +++ b/examples/quick/demos/calqlatr/content/images/paper-edge-right.png diff --git a/examples/demos/calqlatr/content/images/paper-grip.png b/examples/quick/demos/calqlatr/content/images/paper-grip.png Binary files differindex 953c408bca..953c408bca 100644 --- a/examples/demos/calqlatr/content/images/paper-grip.png +++ b/examples/quick/demos/calqlatr/content/images/paper-grip.png diff --git a/examples/demos/calqlatr/content/images/settings-selected-a.png b/examples/quick/demos/calqlatr/content/images/settings-selected-a.png Binary files differindex e08ddface8..e08ddface8 100644 --- a/examples/demos/calqlatr/content/images/settings-selected-a.png +++ b/examples/quick/demos/calqlatr/content/images/settings-selected-a.png diff --git a/examples/demos/calqlatr/content/images/settings-selected-b.png b/examples/quick/demos/calqlatr/content/images/settings-selected-b.png Binary files differindex d9aa7e3431..d9aa7e3431 100644 --- a/examples/demos/calqlatr/content/images/settings-selected-b.png +++ b/examples/quick/demos/calqlatr/content/images/settings-selected-b.png diff --git a/examples/demos/calqlatr/content/images/touch-green.png b/examples/quick/demos/calqlatr/content/images/touch-green.png Binary files differindex 64dbde66b1..64dbde66b1 100644 --- a/examples/demos/calqlatr/content/images/touch-green.png +++ b/examples/quick/demos/calqlatr/content/images/touch-green.png diff --git a/examples/demos/calqlatr/content/images/touch-white.png b/examples/quick/demos/calqlatr/content/images/touch-white.png Binary files differindex bb02b000cf..bb02b000cf 100644 --- a/examples/demos/calqlatr/content/images/touch-white.png +++ b/examples/quick/demos/calqlatr/content/images/touch-white.png diff --git a/examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png b/examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png Binary files differindex af67f63dd1..af67f63dd1 100644 --- a/examples/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png +++ b/examples/quick/demos/calqlatr/doc/images/qml-calqlatr-demo-small.png diff --git a/examples/demos/calqlatr/doc/src/calqlatr.qdoc b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc index 366f01ea2c..366f01ea2c 100644 --- a/examples/demos/calqlatr/doc/src/calqlatr.qdoc +++ b/examples/quick/demos/calqlatr/doc/src/calqlatr.qdoc diff --git a/examples/demos/calqlatr/main.cpp b/examples/quick/demos/calqlatr/main.cpp index 9000bfc7d7..9000bfc7d7 100644 --- a/examples/demos/calqlatr/main.cpp +++ b/examples/quick/demos/calqlatr/main.cpp diff --git a/examples/demos/clocks/clocks.qml b/examples/quick/demos/clocks/clocks.qml index 020fe32908..020fe32908 100644 --- a/examples/demos/clocks/clocks.qml +++ b/examples/quick/demos/clocks/clocks.qml diff --git a/examples/demos/clocks/content/Clock.qml b/examples/quick/demos/clocks/content/Clock.qml index 05317b1151..05317b1151 100644 --- a/examples/demos/clocks/content/Clock.qml +++ b/examples/quick/demos/clocks/content/Clock.qml diff --git a/examples/demos/clocks/content/arrow.png b/examples/quick/demos/clocks/content/arrow.png Binary files differindex e437312217..e437312217 100644 --- a/examples/demos/clocks/content/arrow.png +++ b/examples/quick/demos/clocks/content/arrow.png diff --git a/examples/demos/clocks/content/background.png b/examples/quick/demos/clocks/content/background.png Binary files differindex a885950862..a885950862 100644 --- a/examples/demos/clocks/content/background.png +++ b/examples/quick/demos/clocks/content/background.png diff --git a/examples/demos/clocks/content/center.png b/examples/quick/demos/clocks/content/center.png Binary files differindex 7fbd802a44..7fbd802a44 100644 --- a/examples/demos/clocks/content/center.png +++ b/examples/quick/demos/clocks/content/center.png diff --git a/examples/demos/clocks/content/clock-night.png b/examples/quick/demos/clocks/content/clock-night.png Binary files differindex cc7151a397..cc7151a397 100644 --- a/examples/demos/clocks/content/clock-night.png +++ b/examples/quick/demos/clocks/content/clock-night.png diff --git a/examples/demos/clocks/content/clock.png b/examples/quick/demos/clocks/content/clock.png Binary files differindex 462edacc0e..462edacc0e 100644 --- a/examples/demos/clocks/content/clock.png +++ b/examples/quick/demos/clocks/content/clock.png diff --git a/examples/demos/clocks/content/hour.png b/examples/quick/demos/clocks/content/hour.png Binary files differindex f8061a1235..f8061a1235 100644 --- a/examples/demos/clocks/content/hour.png +++ b/examples/quick/demos/clocks/content/hour.png diff --git a/examples/demos/clocks/content/minute.png b/examples/quick/demos/clocks/content/minute.png Binary files differindex 1297ec7c2b..1297ec7c2b 100644 --- a/examples/demos/clocks/content/minute.png +++ b/examples/quick/demos/clocks/content/minute.png diff --git a/examples/demos/clocks/content/quit.png b/examples/quick/demos/clocks/content/quit.png Binary files differindex b822057d4e..b822057d4e 100644 --- a/examples/demos/clocks/content/quit.png +++ b/examples/quick/demos/clocks/content/quit.png diff --git a/examples/demos/clocks/content/second.png b/examples/quick/demos/clocks/content/second.png Binary files differindex 4aa9fb5e8e..4aa9fb5e8e 100644 --- a/examples/demos/clocks/content/second.png +++ b/examples/quick/demos/clocks/content/second.png diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro new file mode 100644 index 0000000000..474b5b1bc0 --- /dev/null +++ b/examples/quick/demos/demos.pro @@ -0,0 +1,11 @@ +TEMPLATE = subdirs +SUBDIRS = samegame \ + calqlatr \ + tweetsearch \ + maroon \ + stocqt + +EXAMPLE_FILES = \ + clocks \ + photoviewer \ + rssnews diff --git a/examples/demos/maroon/content/BuildButton.qml b/examples/quick/demos/maroon/content/BuildButton.qml index 49641fcecc..49641fcecc 100644 --- a/examples/demos/maroon/content/BuildButton.qml +++ b/examples/quick/demos/maroon/content/BuildButton.qml diff --git a/examples/demos/maroon/content/GameCanvas.qml b/examples/quick/demos/maroon/content/GameCanvas.qml index 5e6e963e84..5e6e963e84 100644 --- a/examples/demos/maroon/content/GameCanvas.qml +++ b/examples/quick/demos/maroon/content/GameCanvas.qml diff --git a/examples/demos/maroon/content/GameOverScreen.qml b/examples/quick/demos/maroon/content/GameOverScreen.qml index dfb439fbb9..dfb439fbb9 100644 --- a/examples/demos/maroon/content/GameOverScreen.qml +++ b/examples/quick/demos/maroon/content/GameOverScreen.qml diff --git a/examples/demos/maroon/content/InfoBar.qml b/examples/quick/demos/maroon/content/InfoBar.qml index 36303fc4fe..36303fc4fe 100644 --- a/examples/demos/maroon/content/InfoBar.qml +++ b/examples/quick/demos/maroon/content/InfoBar.qml diff --git a/examples/demos/maroon/content/NewGameScreen.qml b/examples/quick/demos/maroon/content/NewGameScreen.qml index 495e3aaa8e..495e3aaa8e 100644 --- a/examples/demos/maroon/content/NewGameScreen.qml +++ b/examples/quick/demos/maroon/content/NewGameScreen.qml diff --git a/examples/demos/maroon/content/SoundEffect.qml b/examples/quick/demos/maroon/content/SoundEffect.qml index d286a397c1..d286a397c1 100644 --- a/examples/demos/maroon/content/SoundEffect.qml +++ b/examples/quick/demos/maroon/content/SoundEffect.qml diff --git a/examples/demos/maroon/content/audio/bomb-action.wav b/examples/quick/demos/maroon/content/audio/bomb-action.wav Binary files differindex b334dc1e5b..b334dc1e5b 100644 --- a/examples/demos/maroon/content/audio/bomb-action.wav +++ b/examples/quick/demos/maroon/content/audio/bomb-action.wav diff --git a/examples/demos/maroon/content/audio/catch-action.wav b/examples/quick/demos/maroon/content/audio/catch-action.wav Binary files differindex 3e22124abf..3e22124abf 100644 --- a/examples/demos/maroon/content/audio/catch-action.wav +++ b/examples/quick/demos/maroon/content/audio/catch-action.wav diff --git a/examples/demos/maroon/content/audio/catch.wav b/examples/quick/demos/maroon/content/audio/catch.wav Binary files differindex d3eade87f8..d3eade87f8 100644 --- a/examples/demos/maroon/content/audio/catch.wav +++ b/examples/quick/demos/maroon/content/audio/catch.wav diff --git a/examples/demos/maroon/content/audio/currency.wav b/examples/quick/demos/maroon/content/audio/currency.wav Binary files differindex 0d9ef2c200..0d9ef2c200 100644 --- a/examples/demos/maroon/content/audio/currency.wav +++ b/examples/quick/demos/maroon/content/audio/currency.wav diff --git a/examples/demos/maroon/content/audio/factory-action.wav b/examples/quick/demos/maroon/content/audio/factory-action.wav Binary files differindex a2ace6c221..a2ace6c221 100644 --- a/examples/demos/maroon/content/audio/factory-action.wav +++ b/examples/quick/demos/maroon/content/audio/factory-action.wav diff --git a/examples/demos/maroon/content/audio/melee-action.wav b/examples/quick/demos/maroon/content/audio/melee-action.wav Binary files differindex d325af4700..d325af4700 100644 --- a/examples/demos/maroon/content/audio/melee-action.wav +++ b/examples/quick/demos/maroon/content/audio/melee-action.wav diff --git a/examples/demos/maroon/content/audio/projectile-action.wav b/examples/quick/demos/maroon/content/audio/projectile-action.wav Binary files differindex 4e2284fceb..4e2284fceb 100644 --- a/examples/demos/maroon/content/audio/projectile-action.wav +++ b/examples/quick/demos/maroon/content/audio/projectile-action.wav diff --git a/examples/demos/maroon/content/audio/shooter-action.wav b/examples/quick/demos/maroon/content/audio/shooter-action.wav Binary files differindex 3e12b9419a..3e12b9419a 100644 --- a/examples/demos/maroon/content/audio/shooter-action.wav +++ b/examples/quick/demos/maroon/content/audio/shooter-action.wav diff --git a/examples/demos/maroon/content/gfx/background.png b/examples/quick/demos/maroon/content/gfx/background.png Binary files differindex d548b9314e..d548b9314e 100644 --- a/examples/demos/maroon/content/gfx/background.png +++ b/examples/quick/demos/maroon/content/gfx/background.png diff --git a/examples/demos/maroon/content/gfx/bomb-action.png b/examples/quick/demos/maroon/content/gfx/bomb-action.png Binary files differindex 42da5d789f..42da5d789f 100644 --- a/examples/demos/maroon/content/gfx/bomb-action.png +++ b/examples/quick/demos/maroon/content/gfx/bomb-action.png diff --git a/examples/demos/maroon/content/gfx/bomb-idle.png b/examples/quick/demos/maroon/content/gfx/bomb-idle.png Binary files differindex 3bd62e261d..3bd62e261d 100644 --- a/examples/demos/maroon/content/gfx/bomb-idle.png +++ b/examples/quick/demos/maroon/content/gfx/bomb-idle.png diff --git a/examples/demos/maroon/content/gfx/bomb.png b/examples/quick/demos/maroon/content/gfx/bomb.png Binary files differindex 380da7d1a5..380da7d1a5 100644 --- a/examples/demos/maroon/content/gfx/bomb.png +++ b/examples/quick/demos/maroon/content/gfx/bomb.png diff --git a/examples/demos/maroon/content/gfx/button-help.png b/examples/quick/demos/maroon/content/gfx/button-help.png Binary files differindex aecebc1275..aecebc1275 100644 --- a/examples/demos/maroon/content/gfx/button-help.png +++ b/examples/quick/demos/maroon/content/gfx/button-help.png diff --git a/examples/demos/maroon/content/gfx/button-play.png b/examples/quick/demos/maroon/content/gfx/button-play.png Binary files differindex 6cdad6c845..6cdad6c845 100644 --- a/examples/demos/maroon/content/gfx/button-play.png +++ b/examples/quick/demos/maroon/content/gfx/button-play.png diff --git a/examples/demos/maroon/content/gfx/catch-action.png b/examples/quick/demos/maroon/content/gfx/catch-action.png Binary files differindex 78ca9fe1cc..78ca9fe1cc 100644 --- a/examples/demos/maroon/content/gfx/catch-action.png +++ b/examples/quick/demos/maroon/content/gfx/catch-action.png diff --git a/examples/demos/maroon/content/gfx/catch.png b/examples/quick/demos/maroon/content/gfx/catch.png Binary files differindex b7620fe3de..b7620fe3de 100644 --- a/examples/demos/maroon/content/gfx/catch.png +++ b/examples/quick/demos/maroon/content/gfx/catch.png diff --git a/examples/demos/maroon/content/gfx/cloud.png b/examples/quick/demos/maroon/content/gfx/cloud.png Binary files differindex d7c35f8555..d7c35f8555 100644 --- a/examples/demos/maroon/content/gfx/cloud.png +++ b/examples/quick/demos/maroon/content/gfx/cloud.png diff --git a/examples/demos/maroon/content/gfx/currency.png b/examples/quick/demos/maroon/content/gfx/currency.png Binary files differindex 1571341f6c..1571341f6c 100644 --- a/examples/demos/maroon/content/gfx/currency.png +++ b/examples/quick/demos/maroon/content/gfx/currency.png diff --git a/examples/demos/maroon/content/gfx/dialog-bomb.png b/examples/quick/demos/maroon/content/gfx/dialog-bomb.png Binary files differindex 708d916ad7..708d916ad7 100644 --- a/examples/demos/maroon/content/gfx/dialog-bomb.png +++ b/examples/quick/demos/maroon/content/gfx/dialog-bomb.png diff --git a/examples/demos/maroon/content/gfx/dialog-factory.png b/examples/quick/demos/maroon/content/gfx/dialog-factory.png Binary files differindex d2e2a48e31..d2e2a48e31 100644 --- a/examples/demos/maroon/content/gfx/dialog-factory.png +++ b/examples/quick/demos/maroon/content/gfx/dialog-factory.png diff --git a/examples/demos/maroon/content/gfx/dialog-melee.png b/examples/quick/demos/maroon/content/gfx/dialog-melee.png Binary files differindex 069d18d477..069d18d477 100644 --- a/examples/demos/maroon/content/gfx/dialog-melee.png +++ b/examples/quick/demos/maroon/content/gfx/dialog-melee.png diff --git a/examples/demos/maroon/content/gfx/dialog-pointer.png b/examples/quick/demos/maroon/content/gfx/dialog-pointer.png Binary files differindex 9b51a090f9..9b51a090f9 100644 --- a/examples/demos/maroon/content/gfx/dialog-pointer.png +++ b/examples/quick/demos/maroon/content/gfx/dialog-pointer.png diff --git a/examples/demos/maroon/content/gfx/dialog-shooter.png b/examples/quick/demos/maroon/content/gfx/dialog-shooter.png Binary files differindex af980caabd..af980caabd 100644 --- a/examples/demos/maroon/content/gfx/dialog-shooter.png +++ b/examples/quick/demos/maroon/content/gfx/dialog-shooter.png diff --git a/examples/demos/maroon/content/gfx/dialog.png b/examples/quick/demos/maroon/content/gfx/dialog.png Binary files differindex d528ba78d1..d528ba78d1 100644 --- a/examples/demos/maroon/content/gfx/dialog.png +++ b/examples/quick/demos/maroon/content/gfx/dialog.png diff --git a/examples/demos/maroon/content/gfx/factory-action.png b/examples/quick/demos/maroon/content/gfx/factory-action.png Binary files differindex 8981678267..8981678267 100644 --- a/examples/demos/maroon/content/gfx/factory-action.png +++ b/examples/quick/demos/maroon/content/gfx/factory-action.png diff --git a/examples/demos/maroon/content/gfx/factory-idle.png b/examples/quick/demos/maroon/content/gfx/factory-idle.png Binary files differindex a145582c8f..a145582c8f 100644 --- a/examples/demos/maroon/content/gfx/factory-idle.png +++ b/examples/quick/demos/maroon/content/gfx/factory-idle.png diff --git a/examples/demos/maroon/content/gfx/factory.png b/examples/quick/demos/maroon/content/gfx/factory.png Binary files differindex bfb9f3fb79..bfb9f3fb79 100644 --- a/examples/demos/maroon/content/gfx/factory.png +++ b/examples/quick/demos/maroon/content/gfx/factory.png diff --git a/examples/demos/maroon/content/gfx/grid.png b/examples/quick/demos/maroon/content/gfx/grid.png Binary files differindex b59555247a..b59555247a 100644 --- a/examples/demos/maroon/content/gfx/grid.png +++ b/examples/quick/demos/maroon/content/gfx/grid.png diff --git a/examples/demos/maroon/content/gfx/help.png b/examples/quick/demos/maroon/content/gfx/help.png Binary files differindex 4654e4c69b..4654e4c69b 100644 --- a/examples/demos/maroon/content/gfx/help.png +++ b/examples/quick/demos/maroon/content/gfx/help.png diff --git a/examples/demos/maroon/content/gfx/lifes.png b/examples/quick/demos/maroon/content/gfx/lifes.png Binary files differindex 135310b38c..135310b38c 100644 --- a/examples/demos/maroon/content/gfx/lifes.png +++ b/examples/quick/demos/maroon/content/gfx/lifes.png diff --git a/examples/demos/maroon/content/gfx/logo-bubble.png b/examples/quick/demos/maroon/content/gfx/logo-bubble.png Binary files differindex 136151caff..136151caff 100644 --- a/examples/demos/maroon/content/gfx/logo-bubble.png +++ b/examples/quick/demos/maroon/content/gfx/logo-bubble.png diff --git a/examples/demos/maroon/content/gfx/logo-fish.png b/examples/quick/demos/maroon/content/gfx/logo-fish.png Binary files differindex c41833a0c9..c41833a0c9 100644 --- a/examples/demos/maroon/content/gfx/logo-fish.png +++ b/examples/quick/demos/maroon/content/gfx/logo-fish.png diff --git a/examples/demos/maroon/content/gfx/logo.png b/examples/quick/demos/maroon/content/gfx/logo.png Binary files differindex 787ac99ce8..787ac99ce8 100644 --- a/examples/demos/maroon/content/gfx/logo.png +++ b/examples/quick/demos/maroon/content/gfx/logo.png diff --git a/examples/demos/maroon/content/gfx/melee-action.png b/examples/quick/demos/maroon/content/gfx/melee-action.png Binary files differindex c53873bfcc..c53873bfcc 100644 --- a/examples/demos/maroon/content/gfx/melee-action.png +++ b/examples/quick/demos/maroon/content/gfx/melee-action.png diff --git a/examples/demos/maroon/content/gfx/melee-idle.png b/examples/quick/demos/maroon/content/gfx/melee-idle.png Binary files differindex 621d9dff54..621d9dff54 100644 --- a/examples/demos/maroon/content/gfx/melee-idle.png +++ b/examples/quick/demos/maroon/content/gfx/melee-idle.png diff --git a/examples/demos/maroon/content/gfx/melee.png b/examples/quick/demos/maroon/content/gfx/melee.png Binary files differindex ab240151f3..ab240151f3 100644 --- a/examples/demos/maroon/content/gfx/melee.png +++ b/examples/quick/demos/maroon/content/gfx/melee.png diff --git a/examples/demos/maroon/content/gfx/mob-idle.png b/examples/quick/demos/maroon/content/gfx/mob-idle.png Binary files differindex dedacc7866..dedacc7866 100644 --- a/examples/demos/maroon/content/gfx/mob-idle.png +++ b/examples/quick/demos/maroon/content/gfx/mob-idle.png diff --git a/examples/demos/maroon/content/gfx/mob.png b/examples/quick/demos/maroon/content/gfx/mob.png Binary files differindex 7569c3525a..7569c3525a 100644 --- a/examples/demos/maroon/content/gfx/mob.png +++ b/examples/quick/demos/maroon/content/gfx/mob.png diff --git a/examples/demos/maroon/content/gfx/points.png b/examples/quick/demos/maroon/content/gfx/points.png Binary files differindex 1d2386dbe7..1d2386dbe7 100644 --- a/examples/demos/maroon/content/gfx/points.png +++ b/examples/quick/demos/maroon/content/gfx/points.png diff --git a/examples/demos/maroon/content/gfx/projectile-action.png b/examples/quick/demos/maroon/content/gfx/projectile-action.png Binary files differindex aa2e650aeb..aa2e650aeb 100644 --- a/examples/demos/maroon/content/gfx/projectile-action.png +++ b/examples/quick/demos/maroon/content/gfx/projectile-action.png diff --git a/examples/demos/maroon/content/gfx/projectile.png b/examples/quick/demos/maroon/content/gfx/projectile.png Binary files differindex c25a0c3890..c25a0c3890 100644 --- a/examples/demos/maroon/content/gfx/projectile.png +++ b/examples/quick/demos/maroon/content/gfx/projectile.png diff --git a/examples/demos/maroon/content/gfx/scores.png b/examples/quick/demos/maroon/content/gfx/scores.png Binary files differindex af757fe64a..af757fe64a 100644 --- a/examples/demos/maroon/content/gfx/scores.png +++ b/examples/quick/demos/maroon/content/gfx/scores.png diff --git a/examples/demos/maroon/content/gfx/shooter-action.png b/examples/quick/demos/maroon/content/gfx/shooter-action.png Binary files differindex 08e7e300ca..08e7e300ca 100644 --- a/examples/demos/maroon/content/gfx/shooter-action.png +++ b/examples/quick/demos/maroon/content/gfx/shooter-action.png diff --git a/examples/demos/maroon/content/gfx/shooter-idle.png b/examples/quick/demos/maroon/content/gfx/shooter-idle.png Binary files differindex 663098d3b0..663098d3b0 100644 --- a/examples/demos/maroon/content/gfx/shooter-idle.png +++ b/examples/quick/demos/maroon/content/gfx/shooter-idle.png diff --git a/examples/demos/maroon/content/gfx/shooter.png b/examples/quick/demos/maroon/content/gfx/shooter.png Binary files differindex d44401e055..d44401e055 100644 --- a/examples/demos/maroon/content/gfx/shooter.png +++ b/examples/quick/demos/maroon/content/gfx/shooter.png diff --git a/examples/demos/maroon/content/gfx/sunlight.png b/examples/quick/demos/maroon/content/gfx/sunlight.png Binary files differindex d1c7042117..d1c7042117 100644 --- a/examples/demos/maroon/content/gfx/sunlight.png +++ b/examples/quick/demos/maroon/content/gfx/sunlight.png diff --git a/examples/demos/maroon/content/gfx/text-1.png b/examples/quick/demos/maroon/content/gfx/text-1.png Binary files differindex 3ea399cc90..3ea399cc90 100644 --- a/examples/demos/maroon/content/gfx/text-1.png +++ b/examples/quick/demos/maroon/content/gfx/text-1.png diff --git a/examples/demos/maroon/content/gfx/text-2.png b/examples/quick/demos/maroon/content/gfx/text-2.png Binary files differindex 934a481f3b..934a481f3b 100644 --- a/examples/demos/maroon/content/gfx/text-2.png +++ b/examples/quick/demos/maroon/content/gfx/text-2.png diff --git a/examples/demos/maroon/content/gfx/text-3.png b/examples/quick/demos/maroon/content/gfx/text-3.png Binary files differindex 47523f55b8..47523f55b8 100644 --- a/examples/demos/maroon/content/gfx/text-3.png +++ b/examples/quick/demos/maroon/content/gfx/text-3.png diff --git a/examples/demos/maroon/content/gfx/text-blank.png b/examples/quick/demos/maroon/content/gfx/text-blank.png Binary files differindex 4a687b24dc..4a687b24dc 100644 --- a/examples/demos/maroon/content/gfx/text-blank.png +++ b/examples/quick/demos/maroon/content/gfx/text-blank.png diff --git a/examples/demos/maroon/content/gfx/text-gameover.png b/examples/quick/demos/maroon/content/gfx/text-gameover.png Binary files differindex 4f53ef0b29..4f53ef0b29 100644 --- a/examples/demos/maroon/content/gfx/text-gameover.png +++ b/examples/quick/demos/maroon/content/gfx/text-gameover.png diff --git a/examples/demos/maroon/content/gfx/text-go.png b/examples/quick/demos/maroon/content/gfx/text-go.png Binary files differindex bfc26f71fc..bfc26f71fc 100644 --- a/examples/demos/maroon/content/gfx/text-go.png +++ b/examples/quick/demos/maroon/content/gfx/text-go.png diff --git a/examples/demos/maroon/content/gfx/wave.png b/examples/quick/demos/maroon/content/gfx/wave.png Binary files differindex f97426c4e7..f97426c4e7 100644 --- a/examples/demos/maroon/content/gfx/wave.png +++ b/examples/quick/demos/maroon/content/gfx/wave.png diff --git a/examples/demos/maroon/content/logic.js b/examples/quick/demos/maroon/content/logic.js index dd76b7e073..dd76b7e073 100644 --- a/examples/demos/maroon/content/logic.js +++ b/examples/quick/demos/maroon/content/logic.js diff --git a/examples/demos/maroon/content/mobs/MobBase.qml b/examples/quick/demos/maroon/content/mobs/MobBase.qml index d4ece660ed..d4ece660ed 100644 --- a/examples/demos/maroon/content/mobs/MobBase.qml +++ b/examples/quick/demos/maroon/content/mobs/MobBase.qml diff --git a/examples/demos/maroon/content/towers/Bomb.qml b/examples/quick/demos/maroon/content/towers/Bomb.qml index 00437f468f..00437f468f 100644 --- a/examples/demos/maroon/content/towers/Bomb.qml +++ b/examples/quick/demos/maroon/content/towers/Bomb.qml diff --git a/examples/demos/maroon/content/towers/Factory.qml b/examples/quick/demos/maroon/content/towers/Factory.qml index b34a18498a..b34a18498a 100644 --- a/examples/demos/maroon/content/towers/Factory.qml +++ b/examples/quick/demos/maroon/content/towers/Factory.qml diff --git a/examples/demos/maroon/content/towers/Melee.qml b/examples/quick/demos/maroon/content/towers/Melee.qml index 1b49a455aa..1b49a455aa 100644 --- a/examples/demos/maroon/content/towers/Melee.qml +++ b/examples/quick/demos/maroon/content/towers/Melee.qml diff --git a/examples/demos/maroon/content/towers/Ranged.qml b/examples/quick/demos/maroon/content/towers/Ranged.qml index 33f3354fb6..33f3354fb6 100644 --- a/examples/demos/maroon/content/towers/Ranged.qml +++ b/examples/quick/demos/maroon/content/towers/Ranged.qml diff --git a/examples/demos/maroon/content/towers/TowerBase.qml b/examples/quick/demos/maroon/content/towers/TowerBase.qml index 5c71cb051f..5c71cb051f 100644 --- a/examples/demos/maroon/content/towers/TowerBase.qml +++ b/examples/quick/demos/maroon/content/towers/TowerBase.qml diff --git a/examples/demos/maroon/main.cpp b/examples/quick/demos/maroon/main.cpp index da2343e444..da2343e444 100644 --- a/examples/demos/maroon/main.cpp +++ b/examples/quick/demos/maroon/main.cpp diff --git a/examples/quick/demos/maroon/maroon.pro b/examples/quick/demos/maroon/maroon.pro new file mode 100644 index 0000000000..e193927e72 --- /dev/null +++ b/examples/quick/demos/maroon/maroon.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += qml quick +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/maroon +qml.files = maroon.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/maroon +INSTALLS += target qml diff --git a/examples/demos/maroon/maroon.qml b/examples/quick/demos/maroon/maroon.qml index d7bfcb6a66..d7bfcb6a66 100644 --- a/examples/demos/maroon/maroon.qml +++ b/examples/quick/demos/maroon/maroon.qml diff --git a/examples/demos/maroon/maroon.qmlproject b/examples/quick/demos/maroon/maroon.qmlproject index 752666114f..752666114f 100644 --- a/examples/demos/maroon/maroon.qmlproject +++ b/examples/quick/demos/maroon/maroon.qmlproject diff --git a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml index 12902c0413..12902c0413 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/AlbumDelegate.qml diff --git a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml index fc832eaed8..fc832eaed8 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/BusyIndicator.qml diff --git a/examples/demos/photoviewer/PhotoViewerCore/Button.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/Button.qml index 6571470e2f..6571470e2f 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/Button.qml +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/Button.qml diff --git a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/EditableButton.qml index 8543bee157..8543bee157 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/EditableButton.qml +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/EditableButton.qml diff --git a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml index e14a1da266..e14a1da266 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/PhotoDelegate.qml diff --git a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/ProgressBar.qml index d2f915887f..d2f915887f 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/ProgressBar.qml +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/ProgressBar.qml diff --git a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/RssModel.qml index 98fcd931dd..98fcd931dd 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/RssModel.qml +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/RssModel.qml diff --git a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml b/examples/quick/demos/photoviewer/PhotoViewerCore/Tag.qml index eeb8c355e3..eeb8c355e3 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/Tag.qml +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/Tag.qml diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png Binary files differindex 431af8545d..431af8545d 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/images/box-shadow.png +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/busy.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png Binary files differindex 664c2b1491..664c2b1491 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/images/busy.png +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png diff --git a/examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png Binary files differindex 1847ab528d..1847ab528d 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/images/cardboard.png +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png diff --git a/examples/demos/photoviewer/PhotoViewerCore/qmldir b/examples/quick/demos/photoviewer/PhotoViewerCore/qmldir index d3c247f21a..d3c247f21a 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/qmldir +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/qmldir diff --git a/examples/demos/photoviewer/PhotoViewerCore/script/script.js b/examples/quick/demos/photoviewer/PhotoViewerCore/script/script.js index e8ef93a847..e8ef93a847 100644 --- a/examples/demos/photoviewer/PhotoViewerCore/script/script.js +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/script/script.js diff --git a/examples/demos/photoviewer/i18n/base.ts b/examples/quick/demos/photoviewer/i18n/base.ts index 1accfd2f90..1accfd2f90 100644 --- a/examples/demos/photoviewer/i18n/base.ts +++ b/examples/quick/demos/photoviewer/i18n/base.ts diff --git a/examples/demos/photoviewer/i18n/qml_fr.qm b/examples/quick/demos/photoviewer/i18n/qml_fr.qm Binary files differindex c24fcbc46c..c24fcbc46c 100644 --- a/examples/demos/photoviewer/i18n/qml_fr.qm +++ b/examples/quick/demos/photoviewer/i18n/qml_fr.qm diff --git a/examples/demos/photoviewer/i18n/qml_fr.ts b/examples/quick/demos/photoviewer/i18n/qml_fr.ts index 9f892db616..9f892db616 100644 --- a/examples/demos/photoviewer/i18n/qml_fr.ts +++ b/examples/quick/demos/photoviewer/i18n/qml_fr.ts diff --git a/examples/demos/photoviewer/photoviewer.qml b/examples/quick/demos/photoviewer/photoviewer.qml index caeade4594..caeade4594 100644 --- a/examples/demos/photoviewer/photoviewer.qml +++ b/examples/quick/demos/photoviewer/photoviewer.qml diff --git a/examples/demos/photoviewer/photoviewer.qmlproject b/examples/quick/demos/photoviewer/photoviewer.qmlproject index 600bdb10f4..600bdb10f4 100644 --- a/examples/demos/photoviewer/photoviewer.qmlproject +++ b/examples/quick/demos/photoviewer/photoviewer.qmlproject diff --git a/examples/demos/rssnews/content/BusyIndicator.qml b/examples/quick/demos/rssnews/content/BusyIndicator.qml index 20ac08f612..20ac08f612 100644 --- a/examples/demos/rssnews/content/BusyIndicator.qml +++ b/examples/quick/demos/rssnews/content/BusyIndicator.qml diff --git a/examples/demos/rssnews/content/CategoryDelegate.qml b/examples/quick/demos/rssnews/content/CategoryDelegate.qml index a6fea432f8..a6fea432f8 100644 --- a/examples/demos/rssnews/content/CategoryDelegate.qml +++ b/examples/quick/demos/rssnews/content/CategoryDelegate.qml diff --git a/examples/demos/rssnews/content/NewsDelegate.qml b/examples/quick/demos/rssnews/content/NewsDelegate.qml index fe481a0eb0..fe481a0eb0 100644 --- a/examples/demos/rssnews/content/NewsDelegate.qml +++ b/examples/quick/demos/rssnews/content/NewsDelegate.qml diff --git a/examples/demos/rssnews/content/RssFeeds.qml b/examples/quick/demos/rssnews/content/RssFeeds.qml index 9a31d2be3e..9a31d2be3e 100644 --- a/examples/demos/rssnews/content/RssFeeds.qml +++ b/examples/quick/demos/rssnews/content/RssFeeds.qml diff --git a/examples/demos/rssnews/content/ScrollBar.qml b/examples/quick/demos/rssnews/content/ScrollBar.qml index 2752b7c56d..2752b7c56d 100644 --- a/examples/demos/rssnews/content/ScrollBar.qml +++ b/examples/quick/demos/rssnews/content/ScrollBar.qml diff --git a/examples/demos/rssnews/content/images/busy.png b/examples/quick/demos/rssnews/content/images/busy.png Binary files differindex 664c2b1491..664c2b1491 100644 --- a/examples/demos/rssnews/content/images/busy.png +++ b/examples/quick/demos/rssnews/content/images/busy.png diff --git a/examples/demos/rssnews/content/images/scrollbar.png b/examples/quick/demos/rssnews/content/images/scrollbar.png Binary files differindex 0228dcf9eb..0228dcf9eb 100644 --- a/examples/demos/rssnews/content/images/scrollbar.png +++ b/examples/quick/demos/rssnews/content/images/scrollbar.png diff --git a/examples/demos/rssnews/rssnews.qml b/examples/quick/demos/rssnews/rssnews.qml index 72c7170c93..72c7170c93 100644 --- a/examples/demos/rssnews/rssnews.qml +++ b/examples/quick/demos/rssnews/rssnews.qml diff --git a/examples/demos/rssnews/rssnews.qmlproject b/examples/quick/demos/rssnews/rssnews.qmlproject index 5becbdaed0..5becbdaed0 100644 --- a/examples/demos/rssnews/rssnews.qmlproject +++ b/examples/quick/demos/rssnews/rssnews.qmlproject diff --git a/examples/demos/samegame/content/Block.qml b/examples/quick/demos/samegame/content/Block.qml index 85f2e27d2a..85f2e27d2a 100644 --- a/examples/demos/samegame/content/Block.qml +++ b/examples/quick/demos/samegame/content/Block.qml diff --git a/examples/demos/samegame/content/BlockEmitter.qml b/examples/quick/demos/samegame/content/BlockEmitter.qml index 7dad509dfd..7dad509dfd 100644 --- a/examples/demos/samegame/content/BlockEmitter.qml +++ b/examples/quick/demos/samegame/content/BlockEmitter.qml diff --git a/examples/demos/samegame/content/Button.qml b/examples/quick/demos/samegame/content/Button.qml index aab21ec8c6..aab21ec8c6 100644 --- a/examples/demos/samegame/content/Button.qml +++ b/examples/quick/demos/samegame/content/Button.qml diff --git a/examples/demos/samegame/content/GameArea.qml b/examples/quick/demos/samegame/content/GameArea.qml index f3ca98d80e..f3ca98d80e 100644 --- a/examples/demos/samegame/content/GameArea.qml +++ b/examples/quick/demos/samegame/content/GameArea.qml diff --git a/examples/demos/samegame/content/LogoAnimation.qml b/examples/quick/demos/samegame/content/LogoAnimation.qml index c879893e92..c879893e92 100644 --- a/examples/demos/samegame/content/LogoAnimation.qml +++ b/examples/quick/demos/samegame/content/LogoAnimation.qml diff --git a/examples/demos/samegame/content/MenuEmitter.qml b/examples/quick/demos/samegame/content/MenuEmitter.qml index 16c766068c..16c766068c 100644 --- a/examples/demos/samegame/content/MenuEmitter.qml +++ b/examples/quick/demos/samegame/content/MenuEmitter.qml diff --git a/examples/demos/samegame/content/PaintEmitter.qml b/examples/quick/demos/samegame/content/PaintEmitter.qml index 4a67c4a2d2..4a67c4a2d2 100644 --- a/examples/demos/samegame/content/PaintEmitter.qml +++ b/examples/quick/demos/samegame/content/PaintEmitter.qml diff --git a/examples/demos/samegame/content/PrimaryPack.qml b/examples/quick/demos/samegame/content/PrimaryPack.qml index 278ed0eae1..278ed0eae1 100644 --- a/examples/demos/samegame/content/PrimaryPack.qml +++ b/examples/quick/demos/samegame/content/PrimaryPack.qml diff --git a/examples/demos/samegame/content/PuzzleBlock.qml b/examples/quick/demos/samegame/content/PuzzleBlock.qml index 8a0e725b16..8a0e725b16 100644 --- a/examples/demos/samegame/content/PuzzleBlock.qml +++ b/examples/quick/demos/samegame/content/PuzzleBlock.qml diff --git a/examples/demos/samegame/content/SamegameText.qml b/examples/quick/demos/samegame/content/SamegameText.qml index 28c85f9486..28c85f9486 100644 --- a/examples/demos/samegame/content/SamegameText.qml +++ b/examples/quick/demos/samegame/content/SamegameText.qml diff --git a/examples/demos/samegame/content/SimpleBlock.qml b/examples/quick/demos/samegame/content/SimpleBlock.qml index 22a1fa3225..22a1fa3225 100644 --- a/examples/demos/samegame/content/SimpleBlock.qml +++ b/examples/quick/demos/samegame/content/SimpleBlock.qml diff --git a/examples/demos/samegame/content/SmokeText.qml b/examples/quick/demos/samegame/content/SmokeText.qml index 73d9ae42da..73d9ae42da 100644 --- a/examples/demos/samegame/content/SmokeText.qml +++ b/examples/quick/demos/samegame/content/SmokeText.qml diff --git a/examples/demos/samegame/content/gfx/background-puzzle.png b/examples/quick/demos/samegame/content/gfx/background-puzzle.png Binary files differindex c2eca5f5dc..c2eca5f5dc 100644 --- a/examples/demos/samegame/content/gfx/background-puzzle.png +++ b/examples/quick/demos/samegame/content/gfx/background-puzzle.png diff --git a/examples/demos/samegame/content/gfx/background.png b/examples/quick/demos/samegame/content/gfx/background.png Binary files differindex 60f57b650f..60f57b650f 100644 --- a/examples/demos/samegame/content/gfx/background.png +++ b/examples/quick/demos/samegame/content/gfx/background.png diff --git a/examples/demos/samegame/content/gfx/bar.png b/examples/quick/demos/samegame/content/gfx/bar.png Binary files differindex 4953cd6221..4953cd6221 100644 --- a/examples/demos/samegame/content/gfx/bar.png +++ b/examples/quick/demos/samegame/content/gfx/bar.png diff --git a/examples/demos/samegame/content/gfx/blue-puzzle.png b/examples/quick/demos/samegame/content/gfx/blue-puzzle.png Binary files differindex e550d5935b..e550d5935b 100644 --- a/examples/demos/samegame/content/gfx/blue-puzzle.png +++ b/examples/quick/demos/samegame/content/gfx/blue-puzzle.png diff --git a/examples/demos/samegame/content/gfx/blue.png b/examples/quick/demos/samegame/content/gfx/blue.png Binary files differindex b8161c0f70..b8161c0f70 100644 --- a/examples/demos/samegame/content/gfx/blue.png +++ b/examples/quick/demos/samegame/content/gfx/blue.png diff --git a/examples/demos/samegame/content/gfx/bubble-highscore.png b/examples/quick/demos/samegame/content/gfx/bubble-highscore.png Binary files differindex c4e38df824..c4e38df824 100644 --- a/examples/demos/samegame/content/gfx/bubble-highscore.png +++ b/examples/quick/demos/samegame/content/gfx/bubble-highscore.png diff --git a/examples/demos/samegame/content/gfx/bubble-puzzle.png b/examples/quick/demos/samegame/content/gfx/bubble-puzzle.png Binary files differindex 278556bc8d..278556bc8d 100644 --- a/examples/demos/samegame/content/gfx/bubble-puzzle.png +++ b/examples/quick/demos/samegame/content/gfx/bubble-puzzle.png diff --git a/examples/demos/samegame/content/gfx/but-game-1.png b/examples/quick/demos/samegame/content/gfx/but-game-1.png Binary files differindex 3343b7ff13..3343b7ff13 100644 --- a/examples/demos/samegame/content/gfx/but-game-1.png +++ b/examples/quick/demos/samegame/content/gfx/but-game-1.png diff --git a/examples/demos/samegame/content/gfx/but-game-2.png b/examples/quick/demos/samegame/content/gfx/but-game-2.png Binary files differindex afba106962..afba106962 100644 --- a/examples/demos/samegame/content/gfx/but-game-2.png +++ b/examples/quick/demos/samegame/content/gfx/but-game-2.png diff --git a/examples/demos/samegame/content/gfx/but-game-3.png b/examples/quick/demos/samegame/content/gfx/but-game-3.png Binary files differindex adea77a687..adea77a687 100644 --- a/examples/demos/samegame/content/gfx/but-game-3.png +++ b/examples/quick/demos/samegame/content/gfx/but-game-3.png diff --git a/examples/demos/samegame/content/gfx/but-game-4.png b/examples/quick/demos/samegame/content/gfx/but-game-4.png Binary files differindex 18c922ba45..18c922ba45 100644 --- a/examples/demos/samegame/content/gfx/but-game-4.png +++ b/examples/quick/demos/samegame/content/gfx/but-game-4.png diff --git a/examples/demos/samegame/content/gfx/but-game-new.png b/examples/quick/demos/samegame/content/gfx/but-game-new.png Binary files differindex 257e182585..257e182585 100644 --- a/examples/demos/samegame/content/gfx/but-game-new.png +++ b/examples/quick/demos/samegame/content/gfx/but-game-new.png diff --git a/examples/demos/samegame/content/gfx/but-menu.png b/examples/quick/demos/samegame/content/gfx/but-menu.png Binary files differindex 8440e87759..8440e87759 100644 --- a/examples/demos/samegame/content/gfx/but-menu.png +++ b/examples/quick/demos/samegame/content/gfx/but-menu.png diff --git a/examples/demos/samegame/content/gfx/but-puzzle-next.png b/examples/quick/demos/samegame/content/gfx/but-puzzle-next.png Binary files differindex 7e3ed417d0..7e3ed417d0 100644 --- a/examples/demos/samegame/content/gfx/but-puzzle-next.png +++ b/examples/quick/demos/samegame/content/gfx/but-puzzle-next.png diff --git a/examples/demos/samegame/content/gfx/but-quit.png b/examples/quick/demos/samegame/content/gfx/but-quit.png Binary files differindex 95c77ced94..95c77ced94 100644 --- a/examples/demos/samegame/content/gfx/but-quit.png +++ b/examples/quick/demos/samegame/content/gfx/but-quit.png diff --git a/examples/demos/samegame/content/gfx/green-puzzle.png b/examples/quick/demos/samegame/content/gfx/green-puzzle.png Binary files differindex 581f76fd8d..581f76fd8d 100644 --- a/examples/demos/samegame/content/gfx/green-puzzle.png +++ b/examples/quick/demos/samegame/content/gfx/green-puzzle.png diff --git a/examples/demos/samegame/content/gfx/green.png b/examples/quick/demos/samegame/content/gfx/green.png Binary files differindex da4cca5e7f..da4cca5e7f 100644 --- a/examples/demos/samegame/content/gfx/green.png +++ b/examples/quick/demos/samegame/content/gfx/green.png diff --git a/examples/demos/samegame/content/gfx/icon-fail.png b/examples/quick/demos/samegame/content/gfx/icon-fail.png Binary files differindex 40726118a9..40726118a9 100644 --- a/examples/demos/samegame/content/gfx/icon-fail.png +++ b/examples/quick/demos/samegame/content/gfx/icon-fail.png diff --git a/examples/demos/samegame/content/gfx/icon-ok.png b/examples/quick/demos/samegame/content/gfx/icon-ok.png Binary files differindex 15a8442e94..15a8442e94 100644 --- a/examples/demos/samegame/content/gfx/icon-ok.png +++ b/examples/quick/demos/samegame/content/gfx/icon-ok.png diff --git a/examples/demos/samegame/content/gfx/icon-time.png b/examples/quick/demos/samegame/content/gfx/icon-time.png Binary files differindex 9490e49e90..9490e49e90 100644 --- a/examples/demos/samegame/content/gfx/icon-time.png +++ b/examples/quick/demos/samegame/content/gfx/icon-time.png diff --git a/examples/demos/samegame/content/gfx/logo-a.png b/examples/quick/demos/samegame/content/gfx/logo-a.png Binary files differindex 20c20ba480..20c20ba480 100644 --- a/examples/demos/samegame/content/gfx/logo-a.png +++ b/examples/quick/demos/samegame/content/gfx/logo-a.png diff --git a/examples/demos/samegame/content/gfx/logo-e.png b/examples/quick/demos/samegame/content/gfx/logo-e.png Binary files differindex dd663f114a..dd663f114a 100644 --- a/examples/demos/samegame/content/gfx/logo-e.png +++ b/examples/quick/demos/samegame/content/gfx/logo-e.png diff --git a/examples/demos/samegame/content/gfx/logo-g.png b/examples/quick/demos/samegame/content/gfx/logo-g.png Binary files differindex a319bf9ffa..a319bf9ffa 100644 --- a/examples/demos/samegame/content/gfx/logo-g.png +++ b/examples/quick/demos/samegame/content/gfx/logo-g.png diff --git a/examples/demos/samegame/content/gfx/logo-m.png b/examples/quick/demos/samegame/content/gfx/logo-m.png Binary files differindex 6a029b3267..6a029b3267 100644 --- a/examples/demos/samegame/content/gfx/logo-m.png +++ b/examples/quick/demos/samegame/content/gfx/logo-m.png diff --git a/examples/demos/samegame/content/gfx/logo-s.png b/examples/quick/demos/samegame/content/gfx/logo-s.png Binary files differindex 963b17546a..963b17546a 100644 --- a/examples/demos/samegame/content/gfx/logo-s.png +++ b/examples/quick/demos/samegame/content/gfx/logo-s.png diff --git a/examples/demos/samegame/content/gfx/logo.png b/examples/quick/demos/samegame/content/gfx/logo.png Binary files differindex e900eddb2f..e900eddb2f 100644 --- a/examples/demos/samegame/content/gfx/logo.png +++ b/examples/quick/demos/samegame/content/gfx/logo.png diff --git a/examples/demos/samegame/content/gfx/particle-brick.png b/examples/quick/demos/samegame/content/gfx/particle-brick.png Binary files differindex 5c83896d22..5c83896d22 100644 --- a/examples/demos/samegame/content/gfx/particle-brick.png +++ b/examples/quick/demos/samegame/content/gfx/particle-brick.png diff --git a/examples/demos/samegame/content/gfx/particle-paint.png b/examples/quick/demos/samegame/content/gfx/particle-paint.png Binary files differindex 9bd0a2a13f..9bd0a2a13f 100644 --- a/examples/demos/samegame/content/gfx/particle-paint.png +++ b/examples/quick/demos/samegame/content/gfx/particle-paint.png diff --git a/examples/demos/samegame/content/gfx/particle-smoke.png b/examples/quick/demos/samegame/content/gfx/particle-smoke.png Binary files differindex b27f954a79..b27f954a79 100644 --- a/examples/demos/samegame/content/gfx/particle-smoke.png +++ b/examples/quick/demos/samegame/content/gfx/particle-smoke.png diff --git a/examples/demos/samegame/content/gfx/red-puzzle.png b/examples/quick/demos/samegame/content/gfx/red-puzzle.png Binary files differindex 9ceb17e4d0..9ceb17e4d0 100644 --- a/examples/demos/samegame/content/gfx/red-puzzle.png +++ b/examples/quick/demos/samegame/content/gfx/red-puzzle.png diff --git a/examples/demos/samegame/content/gfx/red.png b/examples/quick/demos/samegame/content/gfx/red.png Binary files differindex 681810fe3b..681810fe3b 100644 --- a/examples/demos/samegame/content/gfx/red.png +++ b/examples/quick/demos/samegame/content/gfx/red.png diff --git a/examples/demos/samegame/content/gfx/text-highscore-new.png b/examples/quick/demos/samegame/content/gfx/text-highscore-new.png Binary files differindex 50f7fcd0f6..50f7fcd0f6 100644 --- a/examples/demos/samegame/content/gfx/text-highscore-new.png +++ b/examples/quick/demos/samegame/content/gfx/text-highscore-new.png diff --git a/examples/demos/samegame/content/gfx/text-highscore.png b/examples/quick/demos/samegame/content/gfx/text-highscore.png Binary files differindex 7198c277b8..7198c277b8 100644 --- a/examples/demos/samegame/content/gfx/text-highscore.png +++ b/examples/quick/demos/samegame/content/gfx/text-highscore.png diff --git a/examples/demos/samegame/content/gfx/text-no-winner.png b/examples/quick/demos/samegame/content/gfx/text-no-winner.png Binary files differindex b4a6685111..b4a6685111 100644 --- a/examples/demos/samegame/content/gfx/text-no-winner.png +++ b/examples/quick/demos/samegame/content/gfx/text-no-winner.png diff --git a/examples/demos/samegame/content/gfx/text-p1-go.png b/examples/quick/demos/samegame/content/gfx/text-p1-go.png Binary files differindex c7bd2a5e75..c7bd2a5e75 100644 --- a/examples/demos/samegame/content/gfx/text-p1-go.png +++ b/examples/quick/demos/samegame/content/gfx/text-p1-go.png diff --git a/examples/demos/samegame/content/gfx/text-p1-won.png b/examples/quick/demos/samegame/content/gfx/text-p1-won.png Binary files differindex 41c2eb7c98..41c2eb7c98 100644 --- a/examples/demos/samegame/content/gfx/text-p1-won.png +++ b/examples/quick/demos/samegame/content/gfx/text-p1-won.png diff --git a/examples/demos/samegame/content/gfx/text-p1.png b/examples/quick/demos/samegame/content/gfx/text-p1.png Binary files differindex b59c87b977..b59c87b977 100644 --- a/examples/demos/samegame/content/gfx/text-p1.png +++ b/examples/quick/demos/samegame/content/gfx/text-p1.png diff --git a/examples/demos/samegame/content/gfx/text-p2-go.png b/examples/quick/demos/samegame/content/gfx/text-p2-go.png Binary files differindex f03cd93afa..f03cd93afa 100644 --- a/examples/demos/samegame/content/gfx/text-p2-go.png +++ b/examples/quick/demos/samegame/content/gfx/text-p2-go.png diff --git a/examples/demos/samegame/content/gfx/text-p2-won.png b/examples/quick/demos/samegame/content/gfx/text-p2-won.png Binary files differindex 116b7f2e7a..116b7f2e7a 100644 --- a/examples/demos/samegame/content/gfx/text-p2-won.png +++ b/examples/quick/demos/samegame/content/gfx/text-p2-won.png diff --git a/examples/demos/samegame/content/gfx/text-p2.png b/examples/quick/demos/samegame/content/gfx/text-p2.png Binary files differindex d4f2bc7335..d4f2bc7335 100644 --- a/examples/demos/samegame/content/gfx/text-p2.png +++ b/examples/quick/demos/samegame/content/gfx/text-p2.png diff --git a/examples/demos/samegame/content/gfx/yellow-puzzle.png b/examples/quick/demos/samegame/content/gfx/yellow-puzzle.png Binary files differindex 66044c81b4..66044c81b4 100644 --- a/examples/demos/samegame/content/gfx/yellow-puzzle.png +++ b/examples/quick/demos/samegame/content/gfx/yellow-puzzle.png diff --git a/examples/demos/samegame/content/gfx/yellow.png b/examples/quick/demos/samegame/content/gfx/yellow.png Binary files differindex 6bc5d385e3..6bc5d385e3 100644 --- a/examples/demos/samegame/content/gfx/yellow.png +++ b/examples/quick/demos/samegame/content/gfx/yellow.png diff --git a/examples/demos/samegame/content/levels/TemplateBase.qml b/examples/quick/demos/samegame/content/levels/TemplateBase.qml index f0832d447f..f0832d447f 100644 --- a/examples/demos/samegame/content/levels/TemplateBase.qml +++ b/examples/quick/demos/samegame/content/levels/TemplateBase.qml diff --git a/examples/demos/samegame/content/levels/level0.qml b/examples/quick/demos/samegame/content/levels/level0.qml index 5d2fa4faf5..5d2fa4faf5 100644 --- a/examples/demos/samegame/content/levels/level0.qml +++ b/examples/quick/demos/samegame/content/levels/level0.qml diff --git a/examples/demos/samegame/content/levels/level1.qml b/examples/quick/demos/samegame/content/levels/level1.qml index 4bb15cbe6a..4bb15cbe6a 100644 --- a/examples/demos/samegame/content/levels/level1.qml +++ b/examples/quick/demos/samegame/content/levels/level1.qml diff --git a/examples/demos/samegame/content/levels/level2.qml b/examples/quick/demos/samegame/content/levels/level2.qml index a319479a60..a319479a60 100644 --- a/examples/demos/samegame/content/levels/level2.qml +++ b/examples/quick/demos/samegame/content/levels/level2.qml diff --git a/examples/demos/samegame/content/levels/level3.qml b/examples/quick/demos/samegame/content/levels/level3.qml index 43e82d7694..43e82d7694 100644 --- a/examples/demos/samegame/content/levels/level3.qml +++ b/examples/quick/demos/samegame/content/levels/level3.qml diff --git a/examples/demos/samegame/content/levels/level4.qml b/examples/quick/demos/samegame/content/levels/level4.qml index 46ad42f709..46ad42f709 100644 --- a/examples/demos/samegame/content/levels/level4.qml +++ b/examples/quick/demos/samegame/content/levels/level4.qml diff --git a/examples/demos/samegame/content/levels/level5.qml b/examples/quick/demos/samegame/content/levels/level5.qml index 3716264993..3716264993 100644 --- a/examples/demos/samegame/content/levels/level5.qml +++ b/examples/quick/demos/samegame/content/levels/level5.qml diff --git a/examples/demos/samegame/content/levels/level6.qml b/examples/quick/demos/samegame/content/levels/level6.qml index 4547b75a37..4547b75a37 100644 --- a/examples/demos/samegame/content/levels/level6.qml +++ b/examples/quick/demos/samegame/content/levels/level6.qml diff --git a/examples/demos/samegame/content/levels/level7.qml b/examples/quick/demos/samegame/content/levels/level7.qml index 5d71d7cb51..5d71d7cb51 100644 --- a/examples/demos/samegame/content/levels/level7.qml +++ b/examples/quick/demos/samegame/content/levels/level7.qml diff --git a/examples/demos/samegame/content/levels/level8.qml b/examples/quick/demos/samegame/content/levels/level8.qml index 9dbb8c2d5f..9dbb8c2d5f 100644 --- a/examples/demos/samegame/content/levels/level8.qml +++ b/examples/quick/demos/samegame/content/levels/level8.qml diff --git a/examples/demos/samegame/content/levels/level9.qml b/examples/quick/demos/samegame/content/levels/level9.qml index 4e8bf19e26..4e8bf19e26 100644 --- a/examples/demos/samegame/content/levels/level9.qml +++ b/examples/quick/demos/samegame/content/levels/level9.qml diff --git a/examples/demos/samegame/content/samegame.js b/examples/quick/demos/samegame/content/samegame.js index 7b226cb42f..7b226cb42f 100755 --- a/examples/demos/samegame/content/samegame.js +++ b/examples/quick/demos/samegame/content/samegame.js diff --git a/examples/demos/samegame/main.cpp b/examples/quick/demos/samegame/main.cpp index 20bf7fad18..20bf7fad18 100644 --- a/examples/demos/samegame/main.cpp +++ b/examples/quick/demos/samegame/main.cpp diff --git a/examples/quick/demos/samegame/samegame.pro b/examples/quick/demos/samegame/samegame.pro new file mode 100644 index 0000000000..fec2e53018 --- /dev/null +++ b/examples/quick/demos/samegame/samegame.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += qml quick +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame +qml.files = samegame.qml content settings.js +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame +INSTALLS += target qml diff --git a/examples/demos/samegame/samegame.qml b/examples/quick/demos/samegame/samegame.qml index 2b0b82a37c..2b0b82a37c 100644 --- a/examples/demos/samegame/samegame.qml +++ b/examples/quick/demos/samegame/samegame.qml diff --git a/examples/demos/samegame/samegame.qmlproject b/examples/quick/demos/samegame/samegame.qmlproject index 42ffacf4f8..42ffacf4f8 100644 --- a/examples/demos/samegame/samegame.qmlproject +++ b/examples/quick/demos/samegame/samegame.qmlproject diff --git a/examples/demos/samegame/settings.js b/examples/quick/demos/samegame/settings.js index e09dee9af3..e09dee9af3 100644 --- a/examples/demos/samegame/settings.js +++ b/examples/quick/demos/samegame/settings.js diff --git a/examples/demos/stocqt/content/Button.qml b/examples/quick/demos/stocqt/content/Button.qml index 0e99c52c51..0e99c52c51 100644 --- a/examples/demos/stocqt/content/Button.qml +++ b/examples/quick/demos/stocqt/content/Button.qml diff --git a/examples/demos/stocqt/content/DatePicker.qml b/examples/quick/demos/stocqt/content/DatePicker.qml index 82d8788bd9..82d8788bd9 100644 --- a/examples/demos/stocqt/content/DatePicker.qml +++ b/examples/quick/demos/stocqt/content/DatePicker.qml diff --git a/examples/demos/stocqt/content/StockChart.qml b/examples/quick/demos/stocqt/content/StockChart.qml index c7411679bb..c7411679bb 100644 --- a/examples/demos/stocqt/content/StockChart.qml +++ b/examples/quick/demos/stocqt/content/StockChart.qml diff --git a/examples/demos/stocqt/content/StockListModel.qml b/examples/quick/demos/stocqt/content/StockListModel.qml index b1e0706a3a..b1e0706a3a 100644 --- a/examples/demos/stocqt/content/StockListModel.qml +++ b/examples/quick/demos/stocqt/content/StockListModel.qml diff --git a/examples/demos/stocqt/content/StockListView.qml b/examples/quick/demos/stocqt/content/StockListView.qml index c241efb54c..c241efb54c 100644 --- a/examples/demos/stocqt/content/StockListView.qml +++ b/examples/quick/demos/stocqt/content/StockListView.qml diff --git a/examples/demos/stocqt/content/StockModel.qml b/examples/quick/demos/stocqt/content/StockModel.qml index b5a78548e4..b5a78548e4 100644 --- a/examples/demos/stocqt/content/StockModel.qml +++ b/examples/quick/demos/stocqt/content/StockModel.qml diff --git a/examples/demos/stocqt/content/StockSettings.qml b/examples/quick/demos/stocqt/content/StockSettings.qml index 600747b969..600747b969 100644 --- a/examples/demos/stocqt/content/StockSettings.qml +++ b/examples/quick/demos/stocqt/content/StockSettings.qml diff --git a/examples/demos/stocqt/content/StockView.qml b/examples/quick/demos/stocqt/content/StockView.qml index 49e6c98622..49e6c98622 100644 --- a/examples/demos/stocqt/content/StockView.qml +++ b/examples/quick/demos/stocqt/content/StockView.qml diff --git a/examples/demos/stocqt/content/images/icon-calendar-anim.png b/examples/quick/demos/stocqt/content/images/icon-calendar-anim.png Binary files differindex c5164d5183..c5164d5183 100644 --- a/examples/demos/stocqt/content/images/icon-calendar-anim.png +++ b/examples/quick/demos/stocqt/content/images/icon-calendar-anim.png diff --git a/examples/demos/stocqt/content/images/icon-calendar.png b/examples/quick/demos/stocqt/content/images/icon-calendar.png Binary files differindex bd2857470b..bd2857470b 100644 --- a/examples/demos/stocqt/content/images/icon-calendar.png +++ b/examples/quick/demos/stocqt/content/images/icon-calendar.png diff --git a/examples/demos/stocqt/content/images/icon-items.png b/examples/quick/demos/stocqt/content/images/icon-items.png Binary files differindex f951aa5009..f951aa5009 100644 --- a/examples/demos/stocqt/content/images/icon-items.png +++ b/examples/quick/demos/stocqt/content/images/icon-items.png diff --git a/examples/demos/stocqt/content/images/icon-settings.png b/examples/quick/demos/stocqt/content/images/icon-settings.png Binary files differindex 222d998289..222d998289 100644 --- a/examples/demos/stocqt/content/images/icon-settings.png +++ b/examples/quick/demos/stocqt/content/images/icon-settings.png diff --git a/examples/demos/stocqt/content/images/logo.png b/examples/quick/demos/stocqt/content/images/logo.png Binary files differindex 90c7c3ba3d..90c7c3ba3d 100644 --- a/examples/demos/stocqt/content/images/logo.png +++ b/examples/quick/demos/stocqt/content/images/logo.png diff --git a/examples/demos/stocqt/content/images/stock-selected.png b/examples/quick/demos/stocqt/content/images/stock-selected.png Binary files differindex 5629796b9c..5629796b9c 100644 --- a/examples/demos/stocqt/content/images/stock-selected.png +++ b/examples/quick/demos/stocqt/content/images/stock-selected.png diff --git a/examples/demos/stocqt/content/images/wheel-touch.png b/examples/quick/demos/stocqt/content/images/wheel-touch.png Binary files differindex 11c8120ada..11c8120ada 100644 --- a/examples/demos/stocqt/content/images/wheel-touch.png +++ b/examples/quick/demos/stocqt/content/images/wheel-touch.png diff --git a/examples/demos/stocqt/content/images/wheel.png b/examples/quick/demos/stocqt/content/images/wheel.png Binary files differindex 470a675b35..470a675b35 100644 --- a/examples/demos/stocqt/content/images/wheel.png +++ b/examples/quick/demos/stocqt/content/images/wheel.png diff --git a/examples/demos/stocqt/main.cpp b/examples/quick/demos/stocqt/main.cpp index 779d204a24..779d204a24 100644 --- a/examples/demos/stocqt/main.cpp +++ b/examples/quick/demos/stocqt/main.cpp diff --git a/examples/quick/demos/stocqt/stocqt.pro b/examples/quick/demos/stocqt/stocqt.pro new file mode 100644 index 0000000000..f33c4aee01 --- /dev/null +++ b/examples/quick/demos/stocqt/stocqt.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += qml quick +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/stocqt +qml.files = stocqt.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/stocqt +INSTALLS += target qml diff --git a/examples/demos/stocqt/stocqt.qml b/examples/quick/demos/stocqt/stocqt.qml index 3f8a84a810..3f8a84a810 100644 --- a/examples/demos/stocqt/stocqt.qml +++ b/examples/quick/demos/stocqt/stocqt.qml diff --git a/examples/demos/stocqt/stocqt.qmlproject b/examples/quick/demos/stocqt/stocqt.qmlproject index 11ab78418a..11ab78418a 100644 --- a/examples/demos/stocqt/stocqt.qmlproject +++ b/examples/quick/demos/stocqt/stocqt.qmlproject diff --git a/examples/demos/tweetsearch/content/FlipBar.qml b/examples/quick/demos/tweetsearch/content/FlipBar.qml index 06aebcacb1..06aebcacb1 100644 --- a/examples/demos/tweetsearch/content/FlipBar.qml +++ b/examples/quick/demos/tweetsearch/content/FlipBar.qml diff --git a/examples/demos/tweetsearch/content/LineInput.qml b/examples/quick/demos/tweetsearch/content/LineInput.qml index 368293e961..368293e961 100644 --- a/examples/demos/tweetsearch/content/LineInput.qml +++ b/examples/quick/demos/tweetsearch/content/LineInput.qml diff --git a/examples/demos/tweetsearch/content/ListFooter.qml b/examples/quick/demos/tweetsearch/content/ListFooter.qml index 91c1c8b331..91c1c8b331 100644 --- a/examples/demos/tweetsearch/content/ListFooter.qml +++ b/examples/quick/demos/tweetsearch/content/ListFooter.qml diff --git a/examples/demos/tweetsearch/content/ListHeader.qml b/examples/quick/demos/tweetsearch/content/ListHeader.qml index 2fb673dc7c..2fb673dc7c 100644 --- a/examples/demos/tweetsearch/content/ListHeader.qml +++ b/examples/quick/demos/tweetsearch/content/ListHeader.qml diff --git a/examples/demos/tweetsearch/content/SearchDelegate.qml b/examples/quick/demos/tweetsearch/content/SearchDelegate.qml index fc0ee0b655..fc0ee0b655 100644 --- a/examples/demos/tweetsearch/content/SearchDelegate.qml +++ b/examples/quick/demos/tweetsearch/content/SearchDelegate.qml diff --git a/examples/demos/tweetsearch/content/TweetDelegate.qml b/examples/quick/demos/tweetsearch/content/TweetDelegate.qml index c336ae6f8a..c336ae6f8a 100644 --- a/examples/demos/tweetsearch/content/TweetDelegate.qml +++ b/examples/quick/demos/tweetsearch/content/TweetDelegate.qml diff --git a/examples/demos/tweetsearch/content/TweetsModel.qml b/examples/quick/demos/tweetsearch/content/TweetsModel.qml index df6ecdcd7f..df6ecdcd7f 100644 --- a/examples/demos/tweetsearch/content/TweetsModel.qml +++ b/examples/quick/demos/tweetsearch/content/TweetsModel.qml diff --git a/examples/demos/tweetsearch/content/resources/anonymous.png b/examples/quick/demos/tweetsearch/content/resources/anonymous.png Binary files differindex 88fba26e90..88fba26e90 100644 --- a/examples/demos/tweetsearch/content/resources/anonymous.png +++ b/examples/quick/demos/tweetsearch/content/resources/anonymous.png diff --git a/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png b/examples/quick/demos/tweetsearch/content/resources/bird-anim-sprites.png Binary files differindex 4e8d7e6116..4e8d7e6116 100644 --- a/examples/demos/tweetsearch/content/resources/bird-anim-sprites.png +++ b/examples/quick/demos/tweetsearch/content/resources/bird-anim-sprites.png diff --git a/examples/demos/tweetsearch/content/resources/icon-clear.png b/examples/quick/demos/tweetsearch/content/resources/icon-clear.png Binary files differindex 75672f64c7..75672f64c7 100644 --- a/examples/demos/tweetsearch/content/resources/icon-clear.png +++ b/examples/quick/demos/tweetsearch/content/resources/icon-clear.png diff --git a/examples/demos/tweetsearch/content/resources/icon-loading.png b/examples/quick/demos/tweetsearch/content/resources/icon-loading.png Binary files differindex 8dbff8b70f..8dbff8b70f 100644 --- a/examples/demos/tweetsearch/content/resources/icon-loading.png +++ b/examples/quick/demos/tweetsearch/content/resources/icon-loading.png diff --git a/examples/demos/tweetsearch/content/resources/icon-refresh.png b/examples/quick/demos/tweetsearch/content/resources/icon-refresh.png Binary files differindex b639a638fe..b639a638fe 100644 --- a/examples/demos/tweetsearch/content/resources/icon-refresh.png +++ b/examples/quick/demos/tweetsearch/content/resources/icon-refresh.png diff --git a/examples/demos/tweetsearch/content/resources/icon-search.png b/examples/quick/demos/tweetsearch/content/resources/icon-search.png Binary files differindex e41935a6c1..e41935a6c1 100644 --- a/examples/demos/tweetsearch/content/resources/icon-search.png +++ b/examples/quick/demos/tweetsearch/content/resources/icon-search.png diff --git a/examples/demos/tweetsearch/content/tweetsearch.js b/examples/quick/demos/tweetsearch/content/tweetsearch.js index 9b8638f69e..9b8638f69e 100644 --- a/examples/demos/tweetsearch/content/tweetsearch.js +++ b/examples/quick/demos/tweetsearch/content/tweetsearch.js diff --git a/examples/demos/tweetsearch/main.cpp b/examples/quick/demos/tweetsearch/main.cpp index 8b1d59679c..8b1d59679c 100644 --- a/examples/demos/tweetsearch/main.cpp +++ b/examples/quick/demos/tweetsearch/main.cpp diff --git a/examples/quick/demos/tweetsearch/tweetsearch.pro b/examples/quick/demos/tweetsearch/tweetsearch.pro new file mode 100644 index 0000000000..887c05af88 --- /dev/null +++ b/examples/quick/demos/tweetsearch/tweetsearch.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/tweetsearch +qml.files = tweetsearch.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/tweetsearch +INSTALLS += target qml diff --git a/examples/demos/tweetsearch/tweetsearch.qml b/examples/quick/demos/tweetsearch/tweetsearch.qml index 961ffce36b..961ffce36b 100644 --- a/examples/demos/tweetsearch/tweetsearch.qml +++ b/examples/quick/demos/tweetsearch/tweetsearch.qml diff --git a/examples/demos/tweetsearch/tweetsearch.qmlproject b/examples/quick/demos/tweetsearch/tweetsearch.qmlproject index 5a0f31117b..5a0f31117b 100644 --- a/examples/demos/tweetsearch/tweetsearch.qmlproject +++ b/examples/quick/demos/tweetsearch/tweetsearch.qmlproject diff --git a/examples/quick/draganddrop/draganddrop.pro b/examples/quick/draganddrop/draganddrop.pro index 7ec3e0e58a..451d03ad32 100644 --- a/examples/quick/draganddrop/draganddrop.pro +++ b/examples/quick/draganddrop/draganddrop.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop +target.path = $$[QT_INSTALL_EXAMPLES]/quick/draganddrop qml.files = draganddrop.qml tiles views -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop -sources.files = $$SOURCES draganddrop.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/draganddrop +INSTALLS += target qml diff --git a/examples/quick/draganddrop/draganddrop.qml b/examples/quick/draganddrop/draganddrop.qml index 300a7abb20..234ea8b806 100644 --- a/examples/quick/draganddrop/draganddrop.qml +++ b/examples/quick/draganddrop/draganddrop.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Item { height: 480 diff --git a/examples/quick/draganddrop/main.cpp b/examples/quick/draganddrop/main.cpp index cc08df9ff4..7a7adf2391 100644 --- a/examples/quick/draganddrop/main.cpp +++ b/examples/quick/draganddrop/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(draganddrop) diff --git a/examples/quick/imageelements/imageelements.pro b/examples/quick/imageelements/imageelements.pro index eddfb7429a..281b44f112 100644 --- a/examples/quick/imageelements/imageelements.pro +++ b/examples/quick/imageelements/imageelements.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements +target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageelements qml.files = *.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements -sources.files = $$SOURCES imageelements.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageelements +INSTALLS += target qml diff --git a/examples/quick/imageelements/imageelements.qml b/examples/quick/imageelements/imageelements.qml index 22ab45866b..a68ed3e73a 100644 --- a/examples/quick/imageelements/imageelements.qml +++ b/examples/quick/imageelements/imageelements.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" +import "../shared" Item { height: 480 diff --git a/examples/quick/imageelements/main.cpp b/examples/quick/imageelements/main.cpp index af4674e102..aa624e2229 100644 --- a/examples/quick/imageelements/main.cpp +++ b/examples/quick/imageelements/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(imageelements) diff --git a/examples/quick/keyinteraction/keyinteraction.pro b/examples/quick/keyinteraction/keyinteraction.pro index 740001362e..a0c65be2d1 100644 --- a/examples/quick/keyinteraction/keyinteraction.pro +++ b/examples/quick/keyinteraction/keyinteraction.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction +target.path = $$[QT_INSTALL_EXAMPLES]/quick/keyinteraction qml.files = keyinteraction.qml focus -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction -sources.files = $$SOURCES keyinteraction.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/keyinteraction +INSTALLS += target qml diff --git a/examples/quick/keyinteraction/keyinteraction.qml b/examples/quick/keyinteraction/keyinteraction.qml index 66a003172e..6a227ae08b 100644 --- a/examples/quick/keyinteraction/keyinteraction.qml +++ b/examples/quick/keyinteraction/keyinteraction.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Loader {//Just loader, since there's only one. source: "focus/focus.qml" diff --git a/examples/quick/keyinteraction/main.cpp b/examples/quick/keyinteraction/main.cpp index bbef71aec7..e82e1d86cd 100644 --- a/examples/quick/keyinteraction/main.cpp +++ b/examples/quick/keyinteraction/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(keyinteraction) diff --git a/examples/localstorage/doc/src/localstorage.qdoc b/examples/quick/localstorage/doc/src/localstorage.qdoc index 45456abbab..45456abbab 100644 --- a/examples/localstorage/doc/src/localstorage.qdoc +++ b/examples/quick/localstorage/doc/src/localstorage.qdoc diff --git a/examples/quick/localstorage/localstorage.pro b/examples/quick/localstorage/localstorage.pro new file mode 100644 index 0000000000..dd2eb80250 --- /dev/null +++ b/examples/quick/localstorage/localstorage.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += localstorage diff --git a/examples/localstorage/localstorage/hello.qml b/examples/quick/localstorage/localstorage/hello.qml index 5a25052675..5a25052675 100644 --- a/examples/localstorage/localstorage/hello.qml +++ b/examples/quick/localstorage/localstorage/hello.qml diff --git a/examples/quick/localstorage/localstorage/localstorage.pro b/examples/quick/localstorage/localstorage/localstorage.pro new file mode 100644 index 0000000000..ef90b63546 --- /dev/null +++ b/examples/quick/localstorage/localstorage/localstorage.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/localstorage/localstorage +qml.files = localstorage.qml hello.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/localstorage/localstorage +INSTALLS += target qml diff --git a/examples/localstorage/localstorage/localstorage.qml b/examples/quick/localstorage/localstorage/localstorage.qml index c5b045460d..c5b045460d 100644 --- a/examples/localstorage/localstorage/localstorage.qml +++ b/examples/quick/localstorage/localstorage/localstorage.qml diff --git a/examples/localstorage/localstorage/localstorage.qmlproject b/examples/quick/localstorage/localstorage/localstorage.qmlproject index 6835d23503..6835d23503 100644 --- a/examples/localstorage/localstorage/localstorage.qmlproject +++ b/examples/quick/localstorage/localstorage/localstorage.qmlproject diff --git a/examples/localstorage/localstorage/main.cpp b/examples/quick/localstorage/localstorage/main.cpp index 0f69fb7fdb..0f69fb7fdb 100644 --- a/examples/localstorage/localstorage/main.cpp +++ b/examples/quick/localstorage/localstorage/main.cpp diff --git a/examples/quick/modelviews/browser.prx b/examples/quick/modelviews/browser.prx new file mode 100644 index 0000000000..e9beacf0fb --- /dev/null +++ b/examples/quick/modelviews/browser.prx @@ -0,0 +1,18 @@ +TEMPLATE = app +TARGET = modelviews + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/modelviews +qml.files = \ + modelviews.qml \ + gridview \ + listview \ + package \ + parallax \ + pathview \ + visualdatamodel \ + visualitemmodel +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/modelviews +INSTALLS += target qml diff --git a/examples/quick/modelviews/main.cpp b/examples/quick/modelviews/main.cpp index 082001cad2..84d52cbc12 100644 --- a/examples/quick/modelviews/main.cpp +++ b/examples/quick/modelviews/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(modelviews) diff --git a/examples/quick/modelviews/modelviews.pro b/examples/quick/modelviews/modelviews.pro index 695c010263..101408f28d 100644 --- a/examples/quick/modelviews/modelviews.pro +++ b/examples/quick/modelviews/modelviews.pro @@ -1,19 +1,8 @@ -TEMPLATE = app +TEMPLATE = subdirs -QT += quick qml -SOURCES += main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews -qml.files = \ - modelviews.qml \ - gridview \ - listview \ - package \ - parallax \ - pathview \ - visualdatamodel \ - visualitemmodel -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews -sources.files = $$SOURCES modelviews.pro -sources.path = $$qml.path -INSTALLS += sources target qml +browser.file = browser.prx +SUBDIRS = \ + browser \ +# abstractitemmodel \ # Does not build + objectlistmodel \ + stringlistmodel diff --git a/examples/quick/modelviews/modelviews.qml b/examples/quick/modelviews/modelviews.qml index d86bbf3416..2df91db7ff 100644 --- a/examples/quick/modelviews/modelviews.qml +++ b/examples/quick/modelviews/modelviews.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Item { height: 480 diff --git a/examples/quick/mousearea/main.cpp b/examples/quick/mousearea/main.cpp index d7fccf8f6c..34e0b3b396 100644 --- a/examples/quick/mousearea/main.cpp +++ b/examples/quick/mousearea/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(mousearea) diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro index cb876e41b5..eba203ba18 100644 --- a/examples/quick/mousearea/mousearea.pro +++ b/examples/quick/mousearea/mousearea.pro @@ -3,9 +3,10 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea +EXAMPLE_FILES = \ + mousearea-wheel-example.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/mousearea qml.files = mousearea.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea -sources.files = $$SOURCES mousearea.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/mousearea +INSTALLS += target qml diff --git a/examples/quick/particles/affectors/affectors.pro b/examples/quick/particles/affectors/affectors.pro new file mode 100644 index 0000000000..9d7c3de059 --- /dev/null +++ b/examples/quick/particles/affectors/affectors.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/affectors +qml.files = affectors.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/affectors +INSTALLS += target qml diff --git a/examples/particles/affectors/affectors.qml b/examples/quick/particles/affectors/affectors.qml index f8e132c2c0..f8e132c2c0 100644 --- a/examples/particles/affectors/affectors.qml +++ b/examples/quick/particles/affectors/affectors.qml diff --git a/examples/particles/affectors/affectors.qmlproject b/examples/quick/particles/affectors/affectors.qmlproject index 2bf3387155..2bf3387155 100644 --- a/examples/particles/affectors/affectors.qmlproject +++ b/examples/quick/particles/affectors/affectors.qmlproject diff --git a/examples/particles/affectors/content/GreyButton.qml b/examples/quick/particles/affectors/content/GreyButton.qml index e3d3daa470..e3d3daa470 100644 --- a/examples/particles/affectors/content/GreyButton.qml +++ b/examples/quick/particles/affectors/content/GreyButton.qml diff --git a/examples/particles/affectors/content/age.qml b/examples/quick/particles/affectors/content/age.qml index 9b8d28dc7e..9b8d28dc7e 100644 --- a/examples/particles/affectors/content/age.qml +++ b/examples/quick/particles/affectors/content/age.qml diff --git a/examples/particles/affectors/content/attractor.qml b/examples/quick/particles/affectors/content/attractor.qml index 5617f6eb86..5617f6eb86 100644 --- a/examples/particles/affectors/content/attractor.qml +++ b/examples/quick/particles/affectors/content/attractor.qml diff --git a/examples/particles/affectors/content/customaffector.qml b/examples/quick/particles/affectors/content/customaffector.qml index 157bf6afc1..157bf6afc1 100644 --- a/examples/particles/affectors/content/customaffector.qml +++ b/examples/quick/particles/affectors/content/customaffector.qml diff --git a/examples/particles/affectors/content/friction.qml b/examples/quick/particles/affectors/content/friction.qml index aaf5917ee7..aaf5917ee7 100644 --- a/examples/particles/affectors/content/friction.qml +++ b/examples/quick/particles/affectors/content/friction.qml diff --git a/examples/particles/affectors/content/gravity.qml b/examples/quick/particles/affectors/content/gravity.qml index 123657f56a..123657f56a 100644 --- a/examples/particles/affectors/content/gravity.qml +++ b/examples/quick/particles/affectors/content/gravity.qml diff --git a/examples/particles/affectors/content/groupgoal.qml b/examples/quick/particles/affectors/content/groupgoal.qml index e36a52526f..e36a52526f 100644 --- a/examples/particles/affectors/content/groupgoal.qml +++ b/examples/quick/particles/affectors/content/groupgoal.qml diff --git a/examples/particles/affectors/content/move.qml b/examples/quick/particles/affectors/content/move.qml index 7bee550e13..7bee550e13 100644 --- a/examples/particles/affectors/content/move.qml +++ b/examples/quick/particles/affectors/content/move.qml diff --git a/examples/particles/affectors/content/spritegoal.qml b/examples/quick/particles/affectors/content/spritegoal.qml index 28ba4ecbfc..28ba4ecbfc 100644 --- a/examples/particles/affectors/content/spritegoal.qml +++ b/examples/quick/particles/affectors/content/spritegoal.qml diff --git a/examples/particles/affectors/content/turbulence.qml b/examples/quick/particles/affectors/content/turbulence.qml index b80aa7ee1c..b80aa7ee1c 100644 --- a/examples/particles/affectors/content/turbulence.qml +++ b/examples/quick/particles/affectors/content/turbulence.qml diff --git a/examples/particles/affectors/content/wander.qml b/examples/quick/particles/affectors/content/wander.qml index f8ac7bae40..f8ac7bae40 100644 --- a/examples/particles/affectors/content/wander.qml +++ b/examples/quick/particles/affectors/content/wander.qml diff --git a/examples/particles/affectors/doc/images/qml-affectors-example.png b/examples/quick/particles/affectors/doc/images/qml-affectors-example.png Binary files differindex 748afa65e5..748afa65e5 100644 --- a/examples/particles/affectors/doc/images/qml-affectors-example.png +++ b/examples/quick/particles/affectors/doc/images/qml-affectors-example.png diff --git a/examples/particles/affectors/doc/src/affectors.qdoc b/examples/quick/particles/affectors/doc/src/affectors.qdoc index c0759f5fe3..c0759f5fe3 100644 --- a/examples/particles/affectors/doc/src/affectors.qdoc +++ b/examples/quick/particles/affectors/doc/src/affectors.qdoc diff --git a/examples/particles/affectors/main.cpp b/examples/quick/particles/affectors/main.cpp index 358fcb4d8d..358fcb4d8d 100644 --- a/examples/particles/affectors/main.cpp +++ b/examples/quick/particles/affectors/main.cpp diff --git a/examples/particles/customparticle/content/blurparticles.qml b/examples/quick/particles/customparticle/content/blurparticles.qml index 30197fe414..30197fe414 100644 --- a/examples/particles/customparticle/content/blurparticles.qml +++ b/examples/quick/particles/customparticle/content/blurparticles.qml diff --git a/examples/particles/customparticle/content/fragmentshader.qml b/examples/quick/particles/customparticle/content/fragmentshader.qml index 2cea780f33..2cea780f33 100644 --- a/examples/particles/customparticle/content/fragmentshader.qml +++ b/examples/quick/particles/customparticle/content/fragmentshader.qml diff --git a/examples/particles/customparticle/content/imagecolors.qml b/examples/quick/particles/customparticle/content/imagecolors.qml index 857375a05c..857375a05c 100644 --- a/examples/particles/customparticle/content/imagecolors.qml +++ b/examples/quick/particles/customparticle/content/imagecolors.qml diff --git a/examples/quick/particles/customparticle/customparticle.pro b/examples/quick/particles/customparticle/customparticle.pro new file mode 100644 index 0000000000..77db1a6aab --- /dev/null +++ b/examples/quick/particles/customparticle/customparticle.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/customparticle +qml.files = customparticle.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/customparticle +INSTALLS += target qml diff --git a/examples/particles/customparticle/customparticle.qml b/examples/quick/particles/customparticle/customparticle.qml index ee93648132..ee93648132 100644 --- a/examples/particles/customparticle/customparticle.qml +++ b/examples/quick/particles/customparticle/customparticle.qml diff --git a/examples/particles/customparticle/customparticle.qmlproject b/examples/quick/particles/customparticle/customparticle.qmlproject index 6ea1849e31..6ea1849e31 100644 --- a/examples/particles/customparticle/customparticle.qmlproject +++ b/examples/quick/particles/customparticle/customparticle.qmlproject diff --git a/examples/particles/customparticle/doc/images/qml-customparticle-example.png b/examples/quick/particles/customparticle/doc/images/qml-customparticle-example.png Binary files differindex e23c6c8efc..e23c6c8efc 100644 --- a/examples/particles/customparticle/doc/images/qml-customparticle-example.png +++ b/examples/quick/particles/customparticle/doc/images/qml-customparticle-example.png diff --git a/examples/particles/customparticle/doc/src/customparticle.qdoc b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc index 39c3d7c101..39c3d7c101 100644 --- a/examples/particles/customparticle/doc/src/customparticle.qdoc +++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc diff --git a/examples/particles/customparticle/main.cpp b/examples/quick/particles/customparticle/main.cpp index ec5619c6f0..ec5619c6f0 100644 --- a/examples/particles/customparticle/main.cpp +++ b/examples/quick/particles/customparticle/main.cpp diff --git a/examples/particles/emitters/content/burstandpulse.qml b/examples/quick/particles/emitters/content/burstandpulse.qml index ae526aa5a3..ae526aa5a3 100644 --- a/examples/particles/emitters/content/burstandpulse.qml +++ b/examples/quick/particles/emitters/content/burstandpulse.qml diff --git a/examples/particles/emitters/content/customemitter.qml b/examples/quick/particles/emitters/content/customemitter.qml index 40b04a56d5..40b04a56d5 100644 --- a/examples/particles/emitters/content/customemitter.qml +++ b/examples/quick/particles/emitters/content/customemitter.qml diff --git a/examples/particles/emitters/content/emitmask.qml b/examples/quick/particles/emitters/content/emitmask.qml index 0ecaa61670..0ecaa61670 100644 --- a/examples/particles/emitters/content/emitmask.qml +++ b/examples/quick/particles/emitters/content/emitmask.qml diff --git a/examples/particles/emitters/content/maximumemitted.qml b/examples/quick/particles/emitters/content/maximumemitted.qml index 25c608882b..25c608882b 100644 --- a/examples/particles/emitters/content/maximumemitted.qml +++ b/examples/quick/particles/emitters/content/maximumemitted.qml diff --git a/examples/particles/emitters/content/shapeanddirection.qml b/examples/quick/particles/emitters/content/shapeanddirection.qml index 14307258ae..14307258ae 100644 --- a/examples/particles/emitters/content/shapeanddirection.qml +++ b/examples/quick/particles/emitters/content/shapeanddirection.qml diff --git a/examples/particles/emitters/content/trailemitter.qml b/examples/quick/particles/emitters/content/trailemitter.qml index 0fab2e73ea..0fab2e73ea 100644 --- a/examples/particles/emitters/content/trailemitter.qml +++ b/examples/quick/particles/emitters/content/trailemitter.qml diff --git a/examples/particles/emitters/content/velocityfrommotion.qml b/examples/quick/particles/emitters/content/velocityfrommotion.qml index ce8bfe11cd..ce8bfe11cd 100644 --- a/examples/particles/emitters/content/velocityfrommotion.qml +++ b/examples/quick/particles/emitters/content/velocityfrommotion.qml diff --git a/examples/particles/emitters/doc/images/qml-emitters-example.png b/examples/quick/particles/emitters/doc/images/qml-emitters-example.png Binary files differindex 0025afd30c..0025afd30c 100644 --- a/examples/particles/emitters/doc/images/qml-emitters-example.png +++ b/examples/quick/particles/emitters/doc/images/qml-emitters-example.png diff --git a/examples/particles/emitters/doc/src/emitters.qdoc b/examples/quick/particles/emitters/doc/src/emitters.qdoc index 37da46f2df..37da46f2df 100644 --- a/examples/particles/emitters/doc/src/emitters.qdoc +++ b/examples/quick/particles/emitters/doc/src/emitters.qdoc diff --git a/examples/quick/particles/emitters/emitters.pro b/examples/quick/particles/emitters/emitters.pro new file mode 100644 index 0000000000..ea2e0d15ba --- /dev/null +++ b/examples/quick/particles/emitters/emitters.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/emitters +qml.files = emitters.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/emitters +INSTALLS += target qml diff --git a/examples/particles/emitters/emitters.qml b/examples/quick/particles/emitters/emitters.qml index 060d01fe4c..060d01fe4c 100644 --- a/examples/particles/emitters/emitters.qml +++ b/examples/quick/particles/emitters/emitters.qml diff --git a/examples/particles/emitters/emitters.qmlproject b/examples/quick/particles/emitters/emitters.qmlproject index 5379aac1dc..5379aac1dc 100644 --- a/examples/particles/emitters/emitters.qmlproject +++ b/examples/quick/particles/emitters/emitters.qmlproject diff --git a/examples/particles/emitters/main.cpp b/examples/quick/particles/emitters/main.cpp index 01aff50ea3..01aff50ea3 100644 --- a/examples/particles/emitters/main.cpp +++ b/examples/quick/particles/emitters/main.cpp diff --git a/examples/particles/imageparticle/content/allatonce.qml b/examples/quick/particles/imageparticle/content/allatonce.qml index 0e3e86c41f..0e3e86c41f 100644 --- a/examples/particles/imageparticle/content/allatonce.qml +++ b/examples/quick/particles/imageparticle/content/allatonce.qml diff --git a/examples/particles/imageparticle/content/colored.qml b/examples/quick/particles/imageparticle/content/colored.qml index 9d72ca7412..9d72ca7412 100644 --- a/examples/particles/imageparticle/content/colored.qml +++ b/examples/quick/particles/imageparticle/content/colored.qml diff --git a/examples/particles/imageparticle/content/colortable.qml b/examples/quick/particles/imageparticle/content/colortable.qml index 32fc30aa8d..32fc30aa8d 100644 --- a/examples/particles/imageparticle/content/colortable.qml +++ b/examples/quick/particles/imageparticle/content/colortable.qml diff --git a/examples/particles/imageparticle/content/deformation.qml b/examples/quick/particles/imageparticle/content/deformation.qml index a7a3415165..a7a3415165 100644 --- a/examples/particles/imageparticle/content/deformation.qml +++ b/examples/quick/particles/imageparticle/content/deformation.qml diff --git a/examples/particles/imageparticle/content/rotation.qml b/examples/quick/particles/imageparticle/content/rotation.qml index 2b1d828c7d..2b1d828c7d 100644 --- a/examples/particles/imageparticle/content/rotation.qml +++ b/examples/quick/particles/imageparticle/content/rotation.qml diff --git a/examples/particles/imageparticle/content/sharing.qml b/examples/quick/particles/imageparticle/content/sharing.qml index 433ffe9524..433ffe9524 100644 --- a/examples/particles/imageparticle/content/sharing.qml +++ b/examples/quick/particles/imageparticle/content/sharing.qml diff --git a/examples/particles/imageparticle/content/sprites.qml b/examples/quick/particles/imageparticle/content/sprites.qml index 0f74ab60f2..0f74ab60f2 100644 --- a/examples/particles/imageparticle/content/sprites.qml +++ b/examples/quick/particles/imageparticle/content/sprites.qml diff --git a/examples/particles/imageparticle/doc/images/qml-imageparticle-example.png b/examples/quick/particles/imageparticle/doc/images/qml-imageparticle-example.png Binary files differindex 9e44abe4fb..9e44abe4fb 100644 --- a/examples/particles/imageparticle/doc/images/qml-imageparticle-example.png +++ b/examples/quick/particles/imageparticle/doc/images/qml-imageparticle-example.png diff --git a/examples/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc index 62c1a06839..62c1a06839 100644 --- a/examples/particles/imageparticle/doc/src/imageparticle.qdoc +++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc diff --git a/examples/quick/particles/imageparticle/imageparticle.pro b/examples/quick/particles/imageparticle/imageparticle.pro new file mode 100644 index 0000000000..94ed5fc7c3 --- /dev/null +++ b/examples/quick/particles/imageparticle/imageparticle.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/imageparticle +qml.files = imageparticle.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/imageparticle +INSTALLS += target qml diff --git a/examples/particles/imageparticle/imageparticle.qml b/examples/quick/particles/imageparticle/imageparticle.qml index 5f7ca38b13..5f7ca38b13 100644 --- a/examples/particles/imageparticle/imageparticle.qml +++ b/examples/quick/particles/imageparticle/imageparticle.qml diff --git a/examples/particles/imageparticle/imageparticle.qmlproject b/examples/quick/particles/imageparticle/imageparticle.qmlproject index 902cf6519a..902cf6519a 100644 --- a/examples/particles/imageparticle/imageparticle.qmlproject +++ b/examples/quick/particles/imageparticle/imageparticle.qmlproject diff --git a/examples/particles/imageparticle/main.cpp b/examples/quick/particles/imageparticle/main.cpp index 081aec03d7..081aec03d7 100644 --- a/examples/particles/imageparticle/main.cpp +++ b/examples/quick/particles/imageparticle/main.cpp diff --git a/examples/particles/images/_explo.png b/examples/quick/particles/images/_explo.png Binary files differindex 4297245d49..4297245d49 100644 --- a/examples/particles/images/_explo.png +++ b/examples/quick/particles/images/_explo.png diff --git a/examples/particles/images/backgroundLeaves.jpg b/examples/quick/particles/images/backgroundLeaves.jpg Binary files differindex 08be16751d..08be16751d 100755 --- a/examples/particles/images/backgroundLeaves.jpg +++ b/examples/quick/particles/images/backgroundLeaves.jpg diff --git a/examples/particles/images/bear_tiles.png b/examples/quick/particles/images/bear_tiles.png Binary files differindex 6bbb2a9b6d..6bbb2a9b6d 100644 --- a/examples/particles/images/bear_tiles.png +++ b/examples/quick/particles/images/bear_tiles.png diff --git a/examples/particles/images/candle.png b/examples/quick/particles/images/candle.png Binary files differindex 8fa3193719..8fa3193719 100644 --- a/examples/particles/images/candle.png +++ b/examples/quick/particles/images/candle.png diff --git a/examples/particles/images/colortable.png b/examples/quick/particles/images/colortable.png Binary files differindex a62ceeb4a0..a62ceeb4a0 100644 --- a/examples/particles/images/colortable.png +++ b/examples/quick/particles/images/colortable.png diff --git a/examples/particles/images/finalfrontier.png b/examples/quick/particles/images/finalfrontier.png Binary files differindex 2ba1815230..2ba1815230 100644 --- a/examples/particles/images/finalfrontier.png +++ b/examples/quick/particles/images/finalfrontier.png diff --git a/examples/particles/images/flower.png b/examples/quick/particles/images/flower.png Binary files differindex b5c606210e..b5c606210e 100644 --- a/examples/particles/images/flower.png +++ b/examples/quick/particles/images/flower.png diff --git a/examples/particles/images/matchmask.png b/examples/quick/particles/images/matchmask.png Binary files differindex e575875c55..e575875c55 100644 --- a/examples/particles/images/matchmask.png +++ b/examples/quick/particles/images/matchmask.png diff --git a/examples/particles/images/meteor.png b/examples/quick/particles/images/meteor.png Binary files differindex e8c368aea7..e8c368aea7 100644 --- a/examples/particles/images/meteor.png +++ b/examples/quick/particles/images/meteor.png diff --git a/examples/particles/images/meteor_explo.png b/examples/quick/particles/images/meteor_explo.png Binary files differindex e659bfe2cf..e659bfe2cf 100644 --- a/examples/particles/images/meteor_explo.png +++ b/examples/quick/particles/images/meteor_explo.png diff --git a/examples/particles/images/meteors.png b/examples/quick/particles/images/meteors.png Binary files differindex bada8a1407..bada8a1407 100644 --- a/examples/particles/images/meteors.png +++ b/examples/quick/particles/images/meteors.png diff --git a/examples/particles/images/nullRock.png b/examples/quick/particles/images/nullRock.png Binary files differindex 4076327a1a..4076327a1a 100644 --- a/examples/particles/images/nullRock.png +++ b/examples/quick/particles/images/nullRock.png diff --git a/examples/particles/images/particle.png b/examples/quick/particles/images/particle.png Binary files differindex 5c83896d22..5c83896d22 100644 --- a/examples/particles/images/particle.png +++ b/examples/quick/particles/images/particle.png diff --git a/examples/particles/images/particle2.png b/examples/quick/particles/images/particle2.png Binary files differindex 36349c6c6e..36349c6c6e 100644 --- a/examples/particles/images/particle2.png +++ b/examples/quick/particles/images/particle2.png diff --git a/examples/particles/images/particle3.png b/examples/quick/particles/images/particle3.png Binary files differindex 905d8f37b8..905d8f37b8 100644 --- a/examples/particles/images/particle3.png +++ b/examples/quick/particles/images/particle3.png diff --git a/examples/particles/images/particle4.png b/examples/quick/particles/images/particle4.png Binary files differindex bc95b703c1..bc95b703c1 100644 --- a/examples/particles/images/particle4.png +++ b/examples/quick/particles/images/particle4.png diff --git a/examples/particles/images/particleA.png b/examples/quick/particles/images/particleA.png Binary files differindex c63acdee1f..c63acdee1f 100644 --- a/examples/particles/images/particleA.png +++ b/examples/quick/particles/images/particleA.png diff --git a/examples/particles/images/portal_bg.png b/examples/quick/particles/images/portal_bg.png Binary files differindex 3c59eeabb9..3c59eeabb9 100644 --- a/examples/particles/images/portal_bg.png +++ b/examples/quick/particles/images/portal_bg.png diff --git a/examples/particles/images/realLeaf1.png b/examples/quick/particles/images/realLeaf1.png Binary files differindex 6cabf29efd..6cabf29efd 100644 --- a/examples/particles/images/realLeaf1.png +++ b/examples/quick/particles/images/realLeaf1.png diff --git a/examples/particles/images/realLeaf2.png b/examples/quick/particles/images/realLeaf2.png Binary files differindex bfeca861d5..bfeca861d5 100644 --- a/examples/particles/images/realLeaf2.png +++ b/examples/quick/particles/images/realLeaf2.png diff --git a/examples/particles/images/realLeaf3.png b/examples/quick/particles/images/realLeaf3.png Binary files differindex b1071e862b..b1071e862b 100644 --- a/examples/particles/images/realLeaf3.png +++ b/examples/quick/particles/images/realLeaf3.png diff --git a/examples/particles/images/realLeaf4.png b/examples/quick/particles/images/realLeaf4.png Binary files differindex d61d53d10e..d61d53d10e 100644 --- a/examples/particles/images/realLeaf4.png +++ b/examples/quick/particles/images/realLeaf4.png diff --git a/examples/particles/images/rocket.png b/examples/quick/particles/images/rocket.png Binary files differindex a171610b03..a171610b03 100644 --- a/examples/particles/images/rocket.png +++ b/examples/quick/particles/images/rocket.png diff --git a/examples/particles/images/rocket2.png b/examples/quick/particles/images/rocket2.png Binary files differindex 7110f8fdc6..7110f8fdc6 100644 --- a/examples/particles/images/rocket2.png +++ b/examples/quick/particles/images/rocket2.png diff --git a/examples/particles/images/sizeInOut.png b/examples/quick/particles/images/sizeInOut.png Binary files differindex 0a306ea21a..0a306ea21a 100644 --- a/examples/particles/images/sizeInOut.png +++ b/examples/quick/particles/images/sizeInOut.png diff --git a/examples/particles/images/snowflake.png b/examples/quick/particles/images/snowflake.png Binary files differindex 490887a82f..490887a82f 100644 --- a/examples/particles/images/snowflake.png +++ b/examples/quick/particles/images/snowflake.png diff --git a/examples/particles/images/sparkleSize.png b/examples/quick/particles/images/sparkleSize.png Binary files differindex 752056541b..752056541b 100644 --- a/examples/particles/images/sparkleSize.png +++ b/examples/quick/particles/images/sparkleSize.png diff --git a/examples/particles/images/star.png b/examples/quick/particles/images/star.png Binary files differindex 0d592cfa87..0d592cfa87 100644 --- a/examples/particles/images/star.png +++ b/examples/quick/particles/images/star.png diff --git a/examples/particles/images/starfish_0.png b/examples/quick/particles/images/starfish_0.png Binary files differindex 8747f0236e..8747f0236e 100644 --- a/examples/particles/images/starfish_0.png +++ b/examples/quick/particles/images/starfish_0.png diff --git a/examples/particles/images/starfish_1.png b/examples/quick/particles/images/starfish_1.png Binary files differindex 1f3f159d5e..1f3f159d5e 100644 --- a/examples/particles/images/starfish_1.png +++ b/examples/quick/particles/images/starfish_1.png diff --git a/examples/particles/images/starfish_2.png b/examples/quick/particles/images/starfish_2.png Binary files differindex c6c7e5a676..c6c7e5a676 100644 --- a/examples/particles/images/starfish_2.png +++ b/examples/quick/particles/images/starfish_2.png diff --git a/examples/particles/images/starfish_3.png b/examples/quick/particles/images/starfish_3.png Binary files differindex 307a89f815..307a89f815 100644 --- a/examples/particles/images/starfish_3.png +++ b/examples/quick/particles/images/starfish_3.png diff --git a/examples/particles/images/starfish_4.png b/examples/quick/particles/images/starfish_4.png Binary files differindex d61c26545a..d61c26545a 100644 --- a/examples/particles/images/starfish_4.png +++ b/examples/quick/particles/images/starfish_4.png diff --git a/examples/particles/images/starfish_mask.png b/examples/quick/particles/images/starfish_mask.png Binary files differindex 2ef74f902b..2ef74f902b 100644 --- a/examples/particles/images/starfish_mask.png +++ b/examples/quick/particles/images/starfish_mask.png diff --git a/examples/particles/itemparticle/content/Delegate.qml b/examples/quick/particles/itemparticle/content/Delegate.qml index d0292f2467..d0292f2467 100644 --- a/examples/particles/itemparticle/content/Delegate.qml +++ b/examples/quick/particles/itemparticle/content/Delegate.qml diff --git a/examples/particles/itemparticle/content/Delegate2.qml b/examples/quick/particles/itemparticle/content/Delegate2.qml index 710c168612..710c168612 100644 --- a/examples/particles/itemparticle/content/Delegate2.qml +++ b/examples/quick/particles/itemparticle/content/Delegate2.qml diff --git a/examples/particles/itemparticle/content/ExpandingDelegate.qml b/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml index ee81873a7e..ee81873a7e 100644 --- a/examples/particles/itemparticle/content/ExpandingDelegate.qml +++ b/examples/quick/particles/itemparticle/content/ExpandingDelegate.qml diff --git a/examples/particles/itemparticle/content/RssModel.qml b/examples/quick/particles/itemparticle/content/RssModel.qml index ed209a7ce5..ed209a7ce5 100644 --- a/examples/particles/itemparticle/content/RssModel.qml +++ b/examples/quick/particles/itemparticle/content/RssModel.qml diff --git a/examples/particles/itemparticle/content/bubble.png b/examples/quick/particles/itemparticle/content/bubble.png Binary files differindex c7f479e9e3..c7f479e9e3 100644 --- a/examples/particles/itemparticle/content/bubble.png +++ b/examples/quick/particles/itemparticle/content/bubble.png diff --git a/examples/particles/itemparticle/content/script.js b/examples/quick/particles/itemparticle/content/script.js index e8ef93a847..e8ef93a847 100644 --- a/examples/particles/itemparticle/content/script.js +++ b/examples/quick/particles/itemparticle/content/script.js diff --git a/examples/particles/itemparticle/delegates.qml b/examples/quick/particles/itemparticle/delegates.qml index fa076a2657..fa076a2657 100644 --- a/examples/particles/itemparticle/delegates.qml +++ b/examples/quick/particles/itemparticle/delegates.qml diff --git a/examples/particles/itemparticle/particleview.qml b/examples/quick/particles/itemparticle/particleview.qml index 2501e6a713..2501e6a713 100644 --- a/examples/particles/itemparticle/particleview.qml +++ b/examples/quick/particles/itemparticle/particleview.qml diff --git a/examples/particles/particles.pro b/examples/quick/particles/particles.pro index 5592f70ee3..9200113be8 100644 --- a/examples/particles/particles.pro +++ b/examples/quick/particles/particles.pro @@ -5,9 +5,10 @@ SUBDIRS += affectors \ imageparticle \ system +EXAMPLE_FILES = \ + itemparticle + #Install shared images too qml.files = images -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/particles -sources.files = particles.pro -sources.path = $$qml.path -INSTALLS = sources qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles +INSTALLS += qml diff --git a/examples/particles/system/content/dynamiccomparison.qml b/examples/quick/particles/system/content/dynamiccomparison.qml index 82591a6f82..82591a6f82 100644 --- a/examples/particles/system/content/dynamiccomparison.qml +++ b/examples/quick/particles/system/content/dynamiccomparison.qml diff --git a/examples/particles/system/content/dynamicemitters.qml b/examples/quick/particles/system/content/dynamicemitters.qml index bd4bcad397..bd4bcad397 100644 --- a/examples/particles/system/content/dynamicemitters.qml +++ b/examples/quick/particles/system/content/dynamicemitters.qml diff --git a/examples/particles/system/content/multiplepainters.qml b/examples/quick/particles/system/content/multiplepainters.qml index 174f527f1f..174f527f1f 100644 --- a/examples/particles/system/content/multiplepainters.qml +++ b/examples/quick/particles/system/content/multiplepainters.qml diff --git a/examples/particles/system/content/startstop.qml b/examples/quick/particles/system/content/startstop.qml index f0433e1b39..f0433e1b39 100644 --- a/examples/particles/system/content/startstop.qml +++ b/examples/quick/particles/system/content/startstop.qml diff --git a/examples/particles/system/content/timedgroupchanges.qml b/examples/quick/particles/system/content/timedgroupchanges.qml index 86ea811614..86ea811614 100644 --- a/examples/particles/system/content/timedgroupchanges.qml +++ b/examples/quick/particles/system/content/timedgroupchanges.qml diff --git a/examples/particles/system/doc/images/qml-system-example.png b/examples/quick/particles/system/doc/images/qml-system-example.png Binary files differindex 1a317c4be8..1a317c4be8 100644 --- a/examples/particles/system/doc/images/qml-system-example.png +++ b/examples/quick/particles/system/doc/images/qml-system-example.png diff --git a/examples/particles/system/doc/src/system.qdoc b/examples/quick/particles/system/doc/src/system.qdoc index 8c381a57ec..8c381a57ec 100644 --- a/examples/particles/system/doc/src/system.qdoc +++ b/examples/quick/particles/system/doc/src/system.qdoc diff --git a/examples/particles/system/main.cpp b/examples/quick/particles/system/main.cpp index ea67283822..ea67283822 100644 --- a/examples/particles/system/main.cpp +++ b/examples/quick/particles/system/main.cpp diff --git a/examples/quick/particles/system/system.pro b/examples/quick/particles/system/system.pro new file mode 100644 index 0000000000..f2e3567543 --- /dev/null +++ b/examples/quick/particles/system/system.pro @@ -0,0 +1,9 @@ +TEMPLATE = app + +QT += quick qml +SOURCES += main.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/system +qml.files = system.qml content +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/particles/system +INSTALLS += target qml diff --git a/examples/particles/system/system.qml b/examples/quick/particles/system/system.qml index a299d0af27..a299d0af27 100644 --- a/examples/particles/system/system.qml +++ b/examples/quick/particles/system/system.qml diff --git a/examples/particles/system/system.qmlproject b/examples/quick/particles/system/system.qmlproject index 1f9df3cecf..1f9df3cecf 100644 --- a/examples/particles/system/system.qmlproject +++ b/examples/quick/particles/system/system.qmlproject diff --git a/examples/quick/positioners/main.cpp b/examples/quick/positioners/main.cpp index d8941b1165..4ee4c82c56 100644 --- a/examples/quick/positioners/main.cpp +++ b/examples/quick/positioners/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(positioners) diff --git a/examples/quick/positioners/positioners.pro b/examples/quick/positioners/positioners.pro index e219cdea7a..1a7622d0bc 100644 --- a/examples/quick/positioners/positioners.pro +++ b/examples/quick/positioners/positioners.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners +target.path = $$[QT_INSTALL_EXAMPLES]/quick/positioners qml.files = positioners.qml positioners-transitions.qml positioners-attachedproperties.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners -sources.files = $$SOURCES positioners.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/positioners +INSTALLS += target qml diff --git a/examples/quick/positioners/positioners.qml b/examples/quick/positioners/positioners.qml index e02848dc16..b020e1be3b 100644 --- a/examples/quick/positioners/positioners.qml +++ b/examples/quick/positioners/positioners.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Item { height: 480 diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index 2f0d430917..cb4f7bfc6b 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -5,6 +5,7 @@ SUBDIRS = accessibility \ canvas \ imageelements \ keyinteraction \ + localstorage \ modelviews \ mousearea \ positioners \ @@ -14,9 +15,12 @@ SUBDIRS = accessibility \ text \ threading \ touchinteraction \ - customitems + tutorials \ + customitems \ + window \ + particles \ + demos -# install -sources.files = quick.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick -INSTALLS += sources +EXAMPLE_FILES = \ + ui-components \ + shared diff --git a/examples/quick/righttoleft/main.cpp b/examples/quick/righttoleft/main.cpp index 1fa9be963a..e1d102cfe3 100644 --- a/examples/quick/righttoleft/main.cpp +++ b/examples/quick/righttoleft/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(righttoleft) diff --git a/examples/quick/righttoleft/righttoleft.pro b/examples/quick/righttoleft/righttoleft.pro index d22aa0f5ff..e71030e196 100644 --- a/examples/quick/righttoleft/righttoleft.pro +++ b/examples/quick/righttoleft/righttoleft.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft +target.path = $$[QT_INSTALL_EXAMPLES]/quick/righttoleft qml.files = righttoleft.qml layoutdirection layoutmirroring textalignment -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft -sources.files = $$SOURCES righttoleft.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/righttoleft +INSTALLS += target qml diff --git a/examples/quick/righttoleft/righttoleft.qml b/examples/quick/righttoleft/righttoleft.qml index 90f964ac75..7212d47514 100644 --- a/examples/quick/righttoleft/righttoleft.qml +++ b/examples/quick/righttoleft/righttoleft.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Item { height: 480 diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.pro b/examples/quick/scenegraph/customgeometry/customgeometry.pro index 5198a3c44a..8044c5c034 100644 --- a/examples/quick/scenegraph/customgeometry/customgeometry.pro +++ b/examples/quick/scenegraph/customgeometry/customgeometry.pro @@ -8,9 +8,8 @@ SOURCES += \ HEADERS += \ beziercurve.h -OTHER_FILES += main.qml +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry +qml.files = main.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry -sources.files = $$SOURCES $$HEADERS $$OTHER_FILES customgeometry.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/customgeometry -target.path = $$sources.path -INSTALLS += sources target +INSTALLS += target qml diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro index f2ad3d0d85..f86dd5f5f3 100644 --- a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro +++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro @@ -3,9 +3,7 @@ QT += qml quick HEADERS += squircle.h SOURCES += squircle.cpp main.cpp -OTHER_FILES += main.qml - -sources.files = $$SOURCES $$HEADERS $$OTHER_FILES openglunderqml.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/openglunderqml -target.path = $$sources.path -INSTALLS += sources target +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml +qml.files = main.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml +INSTALLS += target qml diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index 22506bcfeb..88b8d03dc3 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -1,7 +1,2 @@ TEMPLATE = subdirs SUBDIRS += customgeometry simplematerial openglunderqml - -# install -sources.files = scenegraph.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph -INSTALLS += sources diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro index f8be76132e..ae4fb0fdd0 100644 --- a/examples/quick/scenegraph/simplematerial/simplematerial.pro +++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro @@ -4,10 +4,8 @@ QT += quick SOURCES += \ simplematerial.cpp -OTHER_FILES += \ - main.qml +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial +qml.files = main.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial -sources.files = $$SOURCES $$OTHER_FILES simplematerial.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/simplematerial -target.path = $$sources.path -INSTALLS += sources target +INSTALLS += target qml diff --git a/examples/quick/shadereffects/main.cpp b/examples/quick/shadereffects/main.cpp index 2cbce15465..2bb3224bd1 100644 --- a/examples/quick/shadereffects/main.cpp +++ b/examples/quick/shadereffects/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(shadereffects) diff --git a/examples/quick/shadereffects/shadereffects.pro b/examples/quick/shadereffects/shadereffects.pro index e85ccad38d..265cb726e2 100644 --- a/examples/quick/shadereffects/shadereffects.pro +++ b/examples/quick/shadereffects/shadereffects.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects +target.path = $$[QT_INSTALL_EXAMPLES]/quick/shadereffects qml.files = shadereffects.qml content -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects -sources.files = $$SOURCES shadereffects.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/shadereffects +INSTALLS += target qml diff --git a/examples/shared/Button.qml b/examples/quick/shared/Button.qml index 9b2b5f39f4..9b2b5f39f4 100644 --- a/examples/shared/Button.qml +++ b/examples/quick/shared/Button.qml diff --git a/examples/shared/LauncherList.qml b/examples/quick/shared/LauncherList.qml index 134fed1d8d..134fed1d8d 100644 --- a/examples/shared/LauncherList.qml +++ b/examples/quick/shared/LauncherList.qml diff --git a/examples/shared/README b/examples/quick/shared/README index bf16f238c7..bf16f238c7 100644 --- a/examples/shared/README +++ b/examples/quick/shared/README diff --git a/examples/shared/SimpleLauncherDelegate.qml b/examples/quick/shared/SimpleLauncherDelegate.qml index 6d647ac94f..6d647ac94f 100644 --- a/examples/shared/SimpleLauncherDelegate.qml +++ b/examples/quick/shared/SimpleLauncherDelegate.qml diff --git a/examples/shared/images/back.png b/examples/quick/shared/images/back.png Binary files differindex 506ac42fcf..506ac42fcf 100644 --- a/examples/shared/images/back.png +++ b/examples/quick/shared/images/back.png diff --git a/examples/shared/qmldir b/examples/quick/shared/qmldir index 2f1e56aefb..2f1e56aefb 100644 --- a/examples/shared/qmldir +++ b/examples/quick/shared/qmldir diff --git a/examples/shared/shared.h b/examples/quick/shared/shared.h index 7fd2f08a40..7fd2f08a40 100644 --- a/examples/shared/shared.h +++ b/examples/quick/shared/shared.h diff --git a/examples/quick/text/main.cpp b/examples/quick/text/main.cpp index 0e84b8de2f..9b3c62657b 100644 --- a/examples/quick/text/main.cpp +++ b/examples/quick/text/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(text) diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro index b3734e29f3..2f78548d05 100644 --- a/examples/quick/text/text.pro +++ b/examples/quick/text/text.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text +target.path = $$[QT_INSTALL_EXAMPLES]/quick/text qml.files = fonts imgtag styledtext-layout.qml text.qml textselection -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text -sources.files = $$SOURCES text.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/text +INSTALLS += target qml diff --git a/examples/quick/text/text.qml b/examples/quick/text/text.qml index 383e65e51c..b506fe53f8 100644 --- a/examples/quick/text/text.qml +++ b/examples/quick/text/text.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" +import "../shared" Item { height: 480 diff --git a/examples/quick/threading/main.cpp b/examples/quick/threading/main.cpp index 32399c988a..47ea0b5709 100644 --- a/examples/quick/threading/main.cpp +++ b/examples/quick/threading/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(threading) diff --git a/examples/quick/threading/threading.pro b/examples/quick/threading/threading.pro index 303a13cbaf..fa5488a47e 100644 --- a/examples/quick/threading/threading.pro +++ b/examples/quick/threading/threading.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading +target.path = $$[QT_INSTALL_EXAMPLES]/quick/threading qml.files = threading.qml threadedlistmodel workerscript -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading -sources.files = $$SOURCES threading.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/threading +INSTALLS += target qml diff --git a/examples/quick/threading/threading.qml b/examples/quick/threading/threading.qml index 5a79cd9fa6..011fdc0106 100644 --- a/examples/quick/threading/threading.qml +++ b/examples/quick/threading/threading.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" as Examples +import "../shared" as Examples Item { height: 480 diff --git a/examples/quick/touchinteraction/main.cpp b/examples/quick/touchinteraction/main.cpp index 68215b5d89..aac3175743 100644 --- a/examples/quick/touchinteraction/main.cpp +++ b/examples/quick/touchinteraction/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(touchinteraction) diff --git a/examples/quick/touchinteraction/touchinteraction.pro b/examples/quick/touchinteraction/touchinteraction.pro index 83919c4e8f..949651c9cf 100644 --- a/examples/quick/touchinteraction/touchinteraction.pro +++ b/examples/quick/touchinteraction/touchinteraction.pro @@ -3,9 +3,7 @@ TEMPLATE = app QT += quick qml SOURCES += main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction +target.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction qml.files = flickable multipointtouch pincharea touchinteraction.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction -sources.files = $$SOURCES touchinteraction.pro -sources.path = $$qml.path -INSTALLS += sources target qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/touchinteraction +INSTALLS += target qml diff --git a/examples/quick/touchinteraction/touchinteraction.qml b/examples/quick/touchinteraction/touchinteraction.qml index ab932e895f..c561714d50 100644 --- a/examples/quick/touchinteraction/touchinteraction.qml +++ b/examples/quick/touchinteraction/touchinteraction.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import "../../shared" +import "../shared" Item { height: 480 diff --git a/examples/tutorials/dynamicview/dynamicview1/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml index d0f52e16f2..d0f52e16f2 100644 --- a/examples/tutorials/dynamicview/dynamicview1/PetsModel.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml diff --git a/examples/tutorials/dynamicview/dynamicview1/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml index a3d4af5533..a3d4af5533 100644 --- a/examples/tutorials/dynamicview/dynamicview1/dynamicview.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml diff --git a/examples/tutorials/dynamicview/dynamicview2/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml index 22c7487fe1..22c7487fe1 100644 --- a/examples/tutorials/dynamicview/dynamicview2/PetsModel.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml diff --git a/examples/tutorials/dynamicview/dynamicview2/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml index 942505265c..942505265c 100644 --- a/examples/tutorials/dynamicview/dynamicview2/dynamicview.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml diff --git a/examples/tutorials/dynamicview/dynamicview3/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml index 22c7487fe1..22c7487fe1 100644 --- a/examples/tutorials/dynamicview/dynamicview3/PetsModel.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml diff --git a/examples/tutorials/dynamicview/dynamicview3/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml index 5c3da9499c..5c3da9499c 100644 --- a/examples/tutorials/dynamicview/dynamicview3/dynamicview.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml diff --git a/examples/tutorials/dynamicview/dynamicview4/ListSelector.qml b/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml index cfc8af216c..cfc8af216c 100644 --- a/examples/tutorials/dynamicview/dynamicview4/ListSelector.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml diff --git a/examples/tutorials/dynamicview/dynamicview4/PetsModel.qml b/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml index 22c7487fe1..22c7487fe1 100644 --- a/examples/tutorials/dynamicview/dynamicview4/PetsModel.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml diff --git a/examples/tutorials/dynamicview/dynamicview4/dynamicview.qml b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml index 83f61a6e2f..83f61a6e2f 100644 --- a/examples/tutorials/dynamicview/dynamicview4/dynamicview.qml +++ b/examples/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml diff --git a/examples/tutorials/extending/chapter1-basics/app.qml b/examples/quick/tutorials/extending/chapter1-basics/app.qml index b5aabc9367..b5aabc9367 100644 --- a/examples/tutorials/extending/chapter1-basics/app.qml +++ b/examples/quick/tutorials/extending/chapter1-basics/app.qml diff --git a/examples/tutorials/extending/chapter1-basics/chapter1-basics.pro b/examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro index 8ed66f8b66..8ed66f8b66 100644 --- a/examples/tutorials/extending/chapter1-basics/chapter1-basics.pro +++ b/examples/quick/tutorials/extending/chapter1-basics/chapter1-basics.pro diff --git a/examples/tutorials/extending/chapter1-basics/main.cpp b/examples/quick/tutorials/extending/chapter1-basics/main.cpp index 89c681185b..89c681185b 100644 --- a/examples/tutorials/extending/chapter1-basics/main.cpp +++ b/examples/quick/tutorials/extending/chapter1-basics/main.cpp diff --git a/examples/tutorials/extending/chapter1-basics/piechart.cpp b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp index eabc0a3ffc..eabc0a3ffc 100644 --- a/examples/tutorials/extending/chapter1-basics/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter1-basics/piechart.cpp diff --git a/examples/tutorials/extending/chapter1-basics/piechart.h b/examples/quick/tutorials/extending/chapter1-basics/piechart.h index c86554942f..c86554942f 100644 --- a/examples/tutorials/extending/chapter1-basics/piechart.h +++ b/examples/quick/tutorials/extending/chapter1-basics/piechart.h diff --git a/examples/tutorials/extending/chapter2-methods/app.qml b/examples/quick/tutorials/extending/chapter2-methods/app.qml index dee65676ab..dee65676ab 100644 --- a/examples/tutorials/extending/chapter2-methods/app.qml +++ b/examples/quick/tutorials/extending/chapter2-methods/app.qml diff --git a/examples/tutorials/extending/chapter2-methods/chapter2-methods.pro b/examples/quick/tutorials/extending/chapter2-methods/chapter2-methods.pro index 8ed66f8b66..8ed66f8b66 100644 --- a/examples/tutorials/extending/chapter2-methods/chapter2-methods.pro +++ b/examples/quick/tutorials/extending/chapter2-methods/chapter2-methods.pro diff --git a/examples/tutorials/extending/chapter2-methods/main.cpp b/examples/quick/tutorials/extending/chapter2-methods/main.cpp index 89c681185b..89c681185b 100644 --- a/examples/tutorials/extending/chapter2-methods/main.cpp +++ b/examples/quick/tutorials/extending/chapter2-methods/main.cpp diff --git a/examples/tutorials/extending/chapter2-methods/piechart.cpp b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp index 27b39d0df2..27b39d0df2 100644 --- a/examples/tutorials/extending/chapter2-methods/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter2-methods/piechart.cpp diff --git a/examples/tutorials/extending/chapter2-methods/piechart.h b/examples/quick/tutorials/extending/chapter2-methods/piechart.h index 2655299f1a..2655299f1a 100644 --- a/examples/tutorials/extending/chapter2-methods/piechart.h +++ b/examples/quick/tutorials/extending/chapter2-methods/piechart.h diff --git a/examples/tutorials/extending/chapter3-bindings/app.qml b/examples/quick/tutorials/extending/chapter3-bindings/app.qml index 1267697ee7..1267697ee7 100644 --- a/examples/tutorials/extending/chapter3-bindings/app.qml +++ b/examples/quick/tutorials/extending/chapter3-bindings/app.qml diff --git a/examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/quick/tutorials/extending/chapter3-bindings/chapter3-bindings.pro index 8ed66f8b66..8ed66f8b66 100644 --- a/examples/tutorials/extending/chapter3-bindings/chapter3-bindings.pro +++ b/examples/quick/tutorials/extending/chapter3-bindings/chapter3-bindings.pro diff --git a/examples/tutorials/extending/chapter3-bindings/main.cpp b/examples/quick/tutorials/extending/chapter3-bindings/main.cpp index 89c681185b..89c681185b 100644 --- a/examples/tutorials/extending/chapter3-bindings/main.cpp +++ b/examples/quick/tutorials/extending/chapter3-bindings/main.cpp diff --git a/examples/tutorials/extending/chapter3-bindings/piechart.cpp b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp index ca7f0d701f..ca7f0d701f 100644 --- a/examples/tutorials/extending/chapter3-bindings/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter3-bindings/piechart.cpp diff --git a/examples/tutorials/extending/chapter3-bindings/piechart.h b/examples/quick/tutorials/extending/chapter3-bindings/piechart.h index 216a6012e9..216a6012e9 100644 --- a/examples/tutorials/extending/chapter3-bindings/piechart.h +++ b/examples/quick/tutorials/extending/chapter3-bindings/piechart.h diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml index b96cb554ac..b96cb554ac 100644 --- a/examples/tutorials/extending/chapter4-customPropertyTypes/app.qml +++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/app.qml diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 23eb222ea3..23eb222ea3 100644 --- a/examples/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp index 367a252bf9..367a252bf9 100644 --- a/examples/tutorials/extending/chapter4-customPropertyTypes/main.cpp +++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/main.cpp diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp index 9c907593f7..9c907593f7 100644 --- a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.cpp diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h index 0259720091..0259720091 100644 --- a/examples/tutorials/extending/chapter4-customPropertyTypes/piechart.h +++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/piechart.h diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp index b104e31c65..b104e31c65 100644 --- a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp +++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.cpp diff --git a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h index 5dbe3e53cf..5dbe3e53cf 100644 --- a/examples/tutorials/extending/chapter4-customPropertyTypes/pieslice.h +++ b/examples/quick/tutorials/extending/chapter4-customPropertyTypes/pieslice.h diff --git a/examples/tutorials/extending/chapter5-listproperties/app.qml b/examples/quick/tutorials/extending/chapter5-listproperties/app.qml index 4acd456131..4acd456131 100644 --- a/examples/tutorials/extending/chapter5-listproperties/app.qml +++ b/examples/quick/tutorials/extending/chapter5-listproperties/app.qml diff --git a/examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/quick/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index 23eb222ea3..23eb222ea3 100644 --- a/examples/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/quick/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro diff --git a/examples/tutorials/extending/chapter5-listproperties/main.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/main.cpp index 7af7dc8037..7af7dc8037 100644 --- a/examples/tutorials/extending/chapter5-listproperties/main.cpp +++ b/examples/quick/tutorials/extending/chapter5-listproperties/main.cpp diff --git a/examples/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp index 91e056a0cb..91e056a0cb 100644 --- a/examples/tutorials/extending/chapter5-listproperties/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.cpp diff --git a/examples/tutorials/extending/chapter5-listproperties/piechart.h b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.h index 1234d07e6a..1234d07e6a 100644 --- a/examples/tutorials/extending/chapter5-listproperties/piechart.h +++ b/examples/quick/tutorials/extending/chapter5-listproperties/piechart.h diff --git a/examples/tutorials/extending/chapter5-listproperties/pieslice.cpp b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp index d2a927c01a..d2a927c01a 100644 --- a/examples/tutorials/extending/chapter5-listproperties/pieslice.cpp +++ b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.cpp diff --git a/examples/tutorials/extending/chapter5-listproperties/pieslice.h b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.h index e1fc76d445..e1fc76d445 100644 --- a/examples/tutorials/extending/chapter5-listproperties/pieslice.h +++ b/examples/quick/tutorials/extending/chapter5-listproperties/pieslice.h diff --git a/examples/tutorials/extending/chapter6-plugins/Charts/qmldir b/examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir index d9e8471b3c..d9e8471b3c 100644 --- a/examples/tutorials/extending/chapter6-plugins/Charts/qmldir +++ b/examples/quick/tutorials/extending/chapter6-plugins/Charts/qmldir diff --git a/examples/tutorials/extending/chapter6-plugins/app.qml b/examples/quick/tutorials/extending/chapter6-plugins/app.qml index 19c39c9d2b..19c39c9d2b 100644 --- a/examples/tutorials/extending/chapter6-plugins/app.qml +++ b/examples/quick/tutorials/extending/chapter6-plugins/app.qml diff --git a/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index c84b6fe7ff..c84b6fe7ff 100644 --- a/examples/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/quick/tutorials/extending/chapter6-plugins/chapter6-plugins.pro diff --git a/examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp index df079f767c..df079f767c 100644 --- a/examples/tutorials/extending/chapter6-plugins/chartsplugin.cpp +++ b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.cpp diff --git a/examples/tutorials/extending/chapter6-plugins/chartsplugin.h b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h index 09a120666b..09a120666b 100644 --- a/examples/tutorials/extending/chapter6-plugins/chartsplugin.h +++ b/examples/quick/tutorials/extending/chapter6-plugins/chartsplugin.h diff --git a/examples/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp index 5110153acc..5110153acc 100644 --- a/examples/tutorials/extending/chapter6-plugins/piechart.cpp +++ b/examples/quick/tutorials/extending/chapter6-plugins/piechart.cpp diff --git a/examples/tutorials/extending/chapter6-plugins/piechart.h b/examples/quick/tutorials/extending/chapter6-plugins/piechart.h index e292cdbc7a..e292cdbc7a 100644 --- a/examples/tutorials/extending/chapter6-plugins/piechart.h +++ b/examples/quick/tutorials/extending/chapter6-plugins/piechart.h diff --git a/examples/tutorials/extending/chapter6-plugins/pieslice.cpp b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp index d2a927c01a..d2a927c01a 100644 --- a/examples/tutorials/extending/chapter6-plugins/pieslice.cpp +++ b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.cpp diff --git a/examples/tutorials/extending/chapter6-plugins/pieslice.h b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.h index 2ea15302fb..2ea15302fb 100644 --- a/examples/tutorials/extending/chapter6-plugins/pieslice.h +++ b/examples/quick/tutorials/extending/chapter6-plugins/pieslice.h diff --git a/examples/tutorials/extending/extending.pro b/examples/quick/tutorials/extending/extending.pro index 967473fda0..967473fda0 100644 --- a/examples/tutorials/extending/extending.pro +++ b/examples/quick/tutorials/extending/extending.pro diff --git a/examples/tutorials/gettingStartedQml/core/Button.qml b/examples/quick/tutorials/gettingStartedQml/core/Button.qml index a5afcc0297..a5afcc0297 100644 --- a/examples/tutorials/gettingStartedQml/core/Button.qml +++ b/examples/quick/tutorials/gettingStartedQml/core/Button.qml diff --git a/examples/tutorials/gettingStartedQml/core/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/core/EditMenu.qml index 2665442685..2665442685 100644 --- a/examples/tutorials/gettingStartedQml/core/EditMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/core/EditMenu.qml diff --git a/examples/tutorials/gettingStartedQml/core/FileDialog.qml b/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml index 24501efd89..24501efd89 100644 --- a/examples/tutorials/gettingStartedQml/core/FileDialog.qml +++ b/examples/quick/tutorials/gettingStartedQml/core/FileDialog.qml diff --git a/examples/tutorials/gettingStartedQml/core/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/core/FileMenu.qml index 37afca62b9..37afca62b9 100644 --- a/examples/tutorials/gettingStartedQml/core/FileMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/core/FileMenu.qml diff --git a/examples/tutorials/gettingStartedQml/core/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml index 045e00e6c0..045e00e6c0 100644 --- a/examples/tutorials/gettingStartedQml/core/MenuBar.qml +++ b/examples/quick/tutorials/gettingStartedQml/core/MenuBar.qml diff --git a/examples/tutorials/gettingStartedQml/core/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/core/TextArea.qml index 5165533f65..5165533f65 100644 --- a/examples/tutorials/gettingStartedQml/core/TextArea.qml +++ b/examples/quick/tutorials/gettingStartedQml/core/TextArea.qml diff --git a/examples/tutorials/gettingStartedQml/core/qmldir b/examples/quick/tutorials/gettingStartedQml/core/qmldir index da1f373433..da1f373433 100644 --- a/examples/tutorials/gettingStartedQml/core/qmldir +++ b/examples/quick/tutorials/gettingStartedQml/core/qmldir diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp index a77b93ae33..a77b93ae33 100644 --- a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.cpp diff --git a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.h index 05e076839a..05e076839a 100644 --- a/examples/tutorials/gettingStartedQml/filedialog/dialogPlugin.h +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/dialogPlugin.h diff --git a/examples/tutorials/gettingStartedQml/filedialog/directory.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.cpp index 38a47f0431..38a47f0431 100644 --- a/examples/tutorials/gettingStartedQml/filedialog/directory.cpp +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.cpp diff --git a/examples/tutorials/gettingStartedQml/filedialog/directory.h b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.h index 90c427c1c5..90c427c1c5 100644 --- a/examples/tutorials/gettingStartedQml/filedialog/directory.h +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/directory.h diff --git a/examples/tutorials/gettingStartedQml/filedialog/file.cpp b/examples/quick/tutorials/gettingStartedQml/filedialog/file.cpp index b53c569d56..b53c569d56 100644 --- a/examples/tutorials/gettingStartedQml/filedialog/file.cpp +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/file.cpp diff --git a/examples/tutorials/gettingStartedQml/filedialog/file.h b/examples/quick/tutorials/gettingStartedQml/filedialog/file.h index 7a0da05b70..7a0da05b70 100644 --- a/examples/tutorials/gettingStartedQml/filedialog/file.h +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/file.h diff --git a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro index 36ae0fc7f4..36d88588e4 100644 --- a/examples/tutorials/gettingStartedQml/filedialog/filedialog.pro +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro @@ -16,7 +16,7 @@ SOURCES += directory.cpp \ file.cpp \ dialogPlugin.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials/gettingStartedQml/filedialog -sources.files = $$SOURCES $$HEADERS filedialog.pro -sources.path = $$target.path -INSTALLS = sources target +target.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/gettingStartedQml/filedialog +qml.files = qmldir +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/tutorials/gettingStartedQml/filedialog +INSTALLS += target qml diff --git a/examples/tutorials/gettingStartedQml/filedialog/qmldir b/examples/quick/tutorials/gettingStartedQml/filedialog/qmldir index 4a8d13d026..4a8d13d026 100644 --- a/examples/tutorials/gettingStartedQml/filedialog/qmldir +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/qmldir diff --git a/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro new file mode 100644 index 0000000000..1fc74b69f3 --- /dev/null +++ b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro @@ -0,0 +1,10 @@ +TEMPLATE = subdirs +SUBDIRS = \ + filedialog\ + +EXAMPLE_FILES = \ + core \ + images \ + parts \ + pics \ + texteditor.qml diff --git a/examples/tutorials/gettingStartedQml/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/images/arrow.png Binary files differindex 14978c2e56..14978c2e56 100644 --- a/examples/tutorials/gettingStartedQml/images/arrow.png +++ b/examples/quick/tutorials/gettingStartedQml/images/arrow.png diff --git a/examples/tutorials/gettingStartedQml/parts/part0/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part0/Button.qml index f49ca9359f..f49ca9359f 100644 --- a/examples/tutorials/gettingStartedQml/parts/part0/Button.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part0/Button.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/Button.qml index ab85963593..ab85963593 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/Button.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/Button.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/EditMenu.qml index 1940aebac3..1940aebac3 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/EditMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/EditMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/FileMenu.qml index abb7fba41b..abb7fba41b 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/FileMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/FileMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml b/examples/quick/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml index 7559d4a917..7559d4a917 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/SimpleButton.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png Binary files differindex aab64bcf39..aab64bcf39 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_button.png diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png Binary files differindex d3ff66f2fd..d3ff66f2fd 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_editmenu.png diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png Binary files differindex f2e2b0d990..f2e2b0d990 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_filemenu.png diff --git a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png Binary files differindex 21ce50929b..21ce50929b 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/pics/qml-texteditor1_simplebutton.png diff --git a/examples/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject index 2bb4016996..2bb4016996 100644 --- a/examples/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject +++ b/examples/quick/tutorials/gettingStartedQml/parts/part1/qml-texteditor.qmlproject diff --git a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/Button.qml index 7119feeb08..7119feeb08 100644 --- a/examples/tutorials/gettingStartedQml/parts/part2/Button.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/Button.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/EditMenu.qml index 47a37059b0..47a37059b0 100644 --- a/examples/tutorials/gettingStartedQml/parts/part2/EditMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/EditMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/FileMenu.qml index 41c7369fc0..41c7369fc0 100644 --- a/examples/tutorials/gettingStartedQml/parts/part2/FileMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/FileMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part2/MenuBar.qml index f9a293361e..f9a293361e 100644 --- a/examples/tutorials/gettingStartedQml/parts/part2/MenuBar.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/MenuBar.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png b/examples/quick/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png Binary files differindex da959a3468..da959a3468 100644 --- a/examples/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/pics/qml-texteditor2_menubar.png diff --git a/examples/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject index 2bb4016996..2bb4016996 100644 --- a/examples/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject +++ b/examples/quick/tutorials/gettingStartedQml/parts/part2/qml-texteditor2.qmlproject diff --git a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml index 7119feeb08..7119feeb08 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/Button.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/Button.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml index 47a37059b0..47a37059b0 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/EditMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/EditMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml index 41c7369fc0..41c7369fc0 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/FileMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/FileMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml index f9a293361e..f9a293361e 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/MenuBar.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/MenuBar.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml index fa79c71fd9..fa79c71fd9 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/TextArea.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextArea.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml index 49be5e84cd..49be5e84cd 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/TextEditor.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/TextEditor.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part3/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part3/images/arrow.png Binary files differindex 14978c2e56..14978c2e56 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/images/arrow.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/images/arrow.png diff --git a/examples/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png b/examples/quick/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png Binary files differindex d0623b5a79..d0623b5a79 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/pics/qml-texteditor3_texteditor.png diff --git a/examples/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject index 2bb4016996..2bb4016996 100644 --- a/examples/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject +++ b/examples/quick/tutorials/gettingStartedQml/parts/part3/qml-texteditor3.qmlproject diff --git a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/Button.qml index 50d4c9059f..50d4c9059f 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/Button.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/Button.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/EditMenu.qml index 9613e3aaf5..9613e3aaf5 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/EditMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/EditMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/FileMenu.qml index fd3ccbd710..fd3ccbd710 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/FileMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/FileMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/MenuBar.qml index abd8a313cf..abd8a313cf 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/MenuBar.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/MenuBar.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml index 27f6923c1d..27f6923c1d 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/SimpleButton.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextArea.qml index 88a60d049c..88a60d049c 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/TextArea.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextArea.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextEditor.qml index 09bcb37cb2..09bcb37cb2 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/TextEditor.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/TextEditor.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part4/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part4/images/arrow.png Binary files differindex 14978c2e56..14978c2e56 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/images/arrow.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/images/arrow.png diff --git a/examples/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png b/examples/quick/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png Binary files differindex a195fb87c3..a195fb87c3 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/pics/qml-texteditor4_texteditor.png diff --git a/examples/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject index 2bb4016996..2bb4016996 100644 --- a/examples/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject +++ b/examples/quick/tutorials/gettingStartedQml/parts/part4/qml-texteditor4.qmlproject diff --git a/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/TextEditor.qml index 5ce5a89ceb..5ce5a89ceb 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/TextEditor.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/TextEditor.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/Button.qml index eca367e859..eca367e859 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/Button.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/Button.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml index 57e297c509..57e297c509 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/EditMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml index b73e908464..b73e908464 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileDialog.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml index c13e753f06..c13e753f06 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/FileMenu.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml index 89f21c021d..89f21c021d 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/MenuBar.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml index a19e53264d..a19e53264d 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/TextArea.qml diff --git a/examples/tutorials/gettingStartedQml/parts/part5/core/qmldir b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/qmldir index b8b0c7c431..b8b0c7c431 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/core/qmldir +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/core/qmldir diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp index d71e622b33..d71e622b33 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.cpp diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h index 82035193c8..82035193c8 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/dialogPlugin.h diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp index 4cd9d2da85..4cd9d2da85 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.cpp diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h index 25b121d5b3..25b121d5b3 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/directory.h diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp index 162350eb0f..162350eb0f 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.cpp diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.h index 7125a9aae5..7125a9aae5 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/file.h +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/file.h diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro index 71abddc7e3..71abddc7e3 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/filedialog.pro diff --git a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir index 4a8d13d026..4a8d13d026 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/filedialog/qmldir diff --git a/examples/tutorials/gettingStartedQml/parts/part5/images/arrow.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/images/arrow.png Binary files differindex 14978c2e56..14978c2e56 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/images/arrow.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/images/arrow.png diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png Binary files differindex 27feed5e82..27feed5e82 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_editmenu.png diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png Binary files differindex 4d8f9f22b2..4d8f9f22b2 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_filemenu.png diff --git a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png Binary files differindex 680acfe839..680acfe839 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/pics/qml-texteditor5_newfile.png diff --git a/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject b/examples/quick/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject index 2bb4016996..2bb4016996 100644 --- a/examples/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject +++ b/examples/quick/tutorials/gettingStartedQml/parts/part5/qml-texteditor5.qmlproject diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png Binary files differindex 27feed5e82..27feed5e82 100644 --- a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png +++ b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_editmenu.png diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png Binary files differindex 4d8f9f22b2..4d8f9f22b2 100644 --- a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png +++ b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_filemenu.png diff --git a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png Binary files differindex 680acfe839..680acfe839 100644 --- a/examples/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png +++ b/examples/quick/tutorials/gettingStartedQml/pics/qml-texteditor5_newfile.png diff --git a/examples/tutorials/gettingStartedQml/texteditor.qml b/examples/quick/tutorials/gettingStartedQml/texteditor.qml index 8e09b7fcf9..8e09b7fcf9 100644 --- a/examples/tutorials/gettingStartedQml/texteditor.qml +++ b/examples/quick/tutorials/gettingStartedQml/texteditor.qml diff --git a/examples/tutorials/helloworld/Cell.qml b/examples/quick/tutorials/helloworld/Cell.qml index 760c468eaa..760c468eaa 100644 --- a/examples/tutorials/helloworld/Cell.qml +++ b/examples/quick/tutorials/helloworld/Cell.qml diff --git a/examples/tutorials/helloworld/tutorial1.qml b/examples/quick/tutorials/helloworld/tutorial1.qml index f55a5d50cd..f55a5d50cd 100644 --- a/examples/tutorials/helloworld/tutorial1.qml +++ b/examples/quick/tutorials/helloworld/tutorial1.qml diff --git a/examples/tutorials/helloworld/tutorial2.qml b/examples/quick/tutorials/helloworld/tutorial2.qml index fbcae467c3..fbcae467c3 100644 --- a/examples/tutorials/helloworld/tutorial2.qml +++ b/examples/quick/tutorials/helloworld/tutorial2.qml diff --git a/examples/tutorials/helloworld/tutorial3.qml b/examples/quick/tutorials/helloworld/tutorial3.qml index 9b95e012a9..9b95e012a9 100644 --- a/examples/tutorials/helloworld/tutorial3.qml +++ b/examples/quick/tutorials/helloworld/tutorial3.qml diff --git a/examples/tutorials/samegame/samegame1/Block.qml b/examples/quick/tutorials/samegame/samegame1/Block.qml index 65cff95dbe..65cff95dbe 100644 --- a/examples/tutorials/samegame/samegame1/Block.qml +++ b/examples/quick/tutorials/samegame/samegame1/Block.qml diff --git a/examples/tutorials/samegame/samegame1/Button.qml b/examples/quick/tutorials/samegame/samegame1/Button.qml index 6fdc6c707f..6fdc6c707f 100644 --- a/examples/tutorials/samegame/samegame1/Button.qml +++ b/examples/quick/tutorials/samegame/samegame1/Button.qml diff --git a/examples/tutorials/samegame/samegame1/samegame.qml b/examples/quick/tutorials/samegame/samegame1/samegame.qml index ab3aca19a2..ab3aca19a2 100644 --- a/examples/tutorials/samegame/samegame1/samegame.qml +++ b/examples/quick/tutorials/samegame/samegame1/samegame.qml diff --git a/examples/tutorials/samegame/samegame1/samegame1.qmlproject b/examples/quick/tutorials/samegame/samegame1/samegame1.qmlproject index 42ffacf4f8..42ffacf4f8 100644 --- a/examples/tutorials/samegame/samegame1/samegame1.qmlproject +++ b/examples/quick/tutorials/samegame/samegame1/samegame1.qmlproject diff --git a/examples/tutorials/samegame/samegame2/Block.qml b/examples/quick/tutorials/samegame/samegame2/Block.qml index f4065565b6..f4065565b6 100644 --- a/examples/tutorials/samegame/samegame2/Block.qml +++ b/examples/quick/tutorials/samegame/samegame2/Block.qml diff --git a/examples/tutorials/samegame/samegame2/Button.qml b/examples/quick/tutorials/samegame/samegame2/Button.qml index db1b52e2cd..db1b52e2cd 100644 --- a/examples/tutorials/samegame/samegame2/Button.qml +++ b/examples/quick/tutorials/samegame/samegame2/Button.qml diff --git a/examples/tutorials/samegame/samegame2/samegame.js b/examples/quick/tutorials/samegame/samegame2/samegame.js index c749dc17b1..c749dc17b1 100644 --- a/examples/tutorials/samegame/samegame2/samegame.js +++ b/examples/quick/tutorials/samegame/samegame2/samegame.js diff --git a/examples/tutorials/samegame/samegame2/samegame.qml b/examples/quick/tutorials/samegame/samegame2/samegame.qml index 85f5f39b0c..85f5f39b0c 100644 --- a/examples/tutorials/samegame/samegame2/samegame.qml +++ b/examples/quick/tutorials/samegame/samegame2/samegame.qml diff --git a/examples/tutorials/samegame/samegame2/samegame2.qmlproject b/examples/quick/tutorials/samegame/samegame2/samegame2.qmlproject index 42ffacf4f8..42ffacf4f8 100644 --- a/examples/tutorials/samegame/samegame2/samegame2.qmlproject +++ b/examples/quick/tutorials/samegame/samegame2/samegame2.qmlproject diff --git a/examples/tutorials/samegame/samegame3/Block.qml b/examples/quick/tutorials/samegame/samegame3/Block.qml index 55fe7f876a..55fe7f876a 100644 --- a/examples/tutorials/samegame/samegame3/Block.qml +++ b/examples/quick/tutorials/samegame/samegame3/Block.qml diff --git a/examples/tutorials/samegame/samegame3/Button.qml b/examples/quick/tutorials/samegame/samegame3/Button.qml index db1b52e2cd..db1b52e2cd 100644 --- a/examples/tutorials/samegame/samegame3/Button.qml +++ b/examples/quick/tutorials/samegame/samegame3/Button.qml diff --git a/examples/tutorials/samegame/samegame3/Dialog.qml b/examples/quick/tutorials/samegame/samegame3/Dialog.qml index f89ad16ba1..f89ad16ba1 100644 --- a/examples/tutorials/samegame/samegame3/Dialog.qml +++ b/examples/quick/tutorials/samegame/samegame3/Dialog.qml diff --git a/examples/tutorials/samegame/samegame3/samegame.js b/examples/quick/tutorials/samegame/samegame3/samegame.js index df5bdfb049..df5bdfb049 100644 --- a/examples/tutorials/samegame/samegame3/samegame.js +++ b/examples/quick/tutorials/samegame/samegame3/samegame.js diff --git a/examples/tutorials/samegame/samegame3/samegame.qml b/examples/quick/tutorials/samegame/samegame3/samegame.qml index 26d0212250..26d0212250 100644 --- a/examples/tutorials/samegame/samegame3/samegame.qml +++ b/examples/quick/tutorials/samegame/samegame3/samegame.qml diff --git a/examples/tutorials/samegame/samegame3/samegame3.qmlproject b/examples/quick/tutorials/samegame/samegame3/samegame3.qmlproject index 42ffacf4f8..42ffacf4f8 100644 --- a/examples/tutorials/samegame/samegame3/samegame3.qmlproject +++ b/examples/quick/tutorials/samegame/samegame3/samegame3.qmlproject diff --git a/examples/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml index 335f4aecf6..335f4aecf6 100644 --- a/examples/tutorials/samegame/samegame4/content/BoomBlock.qml +++ b/examples/quick/tutorials/samegame/samegame4/content/BoomBlock.qml diff --git a/examples/tutorials/samegame/samegame4/content/Button.qml b/examples/quick/tutorials/samegame/samegame4/content/Button.qml index db1b52e2cd..db1b52e2cd 100644 --- a/examples/tutorials/samegame/samegame4/content/Button.qml +++ b/examples/quick/tutorials/samegame/samegame4/content/Button.qml diff --git a/examples/tutorials/samegame/samegame4/content/Dialog.qml b/examples/quick/tutorials/samegame/samegame4/content/Dialog.qml index ca4d573543..ca4d573543 100644 --- a/examples/tutorials/samegame/samegame4/content/Dialog.qml +++ b/examples/quick/tutorials/samegame/samegame4/content/Dialog.qml diff --git a/examples/tutorials/samegame/samegame4/content/samegame.js b/examples/quick/tutorials/samegame/samegame4/content/samegame.js index ad4d39d7b1..ad4d39d7b1 100755 --- a/examples/tutorials/samegame/samegame4/content/samegame.js +++ b/examples/quick/tutorials/samegame/samegame4/content/samegame.js diff --git a/examples/tutorials/samegame/samegame4/highscores/README b/examples/quick/tutorials/samegame/samegame4/highscores/README index eaa00fae37..eaa00fae37 100644 --- a/examples/tutorials/samegame/samegame4/highscores/README +++ b/examples/quick/tutorials/samegame/samegame4/highscores/README diff --git a/examples/tutorials/samegame/samegame4/highscores/score_data.xml b/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml index c3fd90d9cf..c3fd90d9cf 100755 --- a/examples/tutorials/samegame/samegame4/highscores/score_data.xml +++ b/examples/quick/tutorials/samegame/samegame4/highscores/score_data.xml diff --git a/examples/tutorials/samegame/samegame4/highscores/score_style.xsl b/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl index 670354c965..670354c965 100755 --- a/examples/tutorials/samegame/samegame4/highscores/score_style.xsl +++ b/examples/quick/tutorials/samegame/samegame4/highscores/score_style.xsl diff --git a/examples/tutorials/samegame/samegame4/highscores/scores.php b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php index daf480e21b..daf480e21b 100755 --- a/examples/tutorials/samegame/samegame4/highscores/scores.php +++ b/examples/quick/tutorials/samegame/samegame4/highscores/scores.php diff --git a/examples/tutorials/samegame/samegame4/samegame.qml b/examples/quick/tutorials/samegame/samegame4/samegame.qml index e6edcc35b8..e6edcc35b8 100644 --- a/examples/tutorials/samegame/samegame4/samegame.qml +++ b/examples/quick/tutorials/samegame/samegame4/samegame.qml diff --git a/examples/tutorials/samegame/samegame4/samegame4.qmlproject b/examples/quick/tutorials/samegame/samegame4/samegame4.qmlproject index 42ffacf4f8..42ffacf4f8 100644 --- a/examples/tutorials/samegame/samegame4/samegame4.qmlproject +++ b/examples/quick/tutorials/samegame/samegame4/samegame4.qmlproject diff --git a/examples/tutorials/samegame/shared/pics/background.jpg b/examples/quick/tutorials/samegame/shared/pics/background.jpg Binary files differindex 903d395c8d..903d395c8d 100644 --- a/examples/tutorials/samegame/shared/pics/background.jpg +++ b/examples/quick/tutorials/samegame/shared/pics/background.jpg diff --git a/examples/tutorials/samegame/shared/pics/blueStar.png b/examples/quick/tutorials/samegame/shared/pics/blueStar.png Binary files differindex ff9588f80a..ff9588f80a 100644 --- a/examples/tutorials/samegame/shared/pics/blueStar.png +++ b/examples/quick/tutorials/samegame/shared/pics/blueStar.png diff --git a/examples/tutorials/samegame/shared/pics/blueStone.png b/examples/quick/tutorials/samegame/shared/pics/blueStone.png Binary files differindex 20e43c75b6..20e43c75b6 100644 --- a/examples/tutorials/samegame/shared/pics/blueStone.png +++ b/examples/quick/tutorials/samegame/shared/pics/blueStone.png diff --git a/examples/tutorials/samegame/shared/pics/greenStar.png b/examples/quick/tutorials/samegame/shared/pics/greenStar.png Binary files differindex cd06854719..cd06854719 100644 --- a/examples/tutorials/samegame/shared/pics/greenStar.png +++ b/examples/quick/tutorials/samegame/shared/pics/greenStar.png diff --git a/examples/tutorials/samegame/shared/pics/greenStone.png b/examples/quick/tutorials/samegame/shared/pics/greenStone.png Binary files differindex b568a1900c..b568a1900c 100644 --- a/examples/tutorials/samegame/shared/pics/greenStone.png +++ b/examples/quick/tutorials/samegame/shared/pics/greenStone.png diff --git a/examples/tutorials/samegame/shared/pics/redStar.png b/examples/quick/tutorials/samegame/shared/pics/redStar.png Binary files differindex 0a4dffe583..0a4dffe583 100644 --- a/examples/tutorials/samegame/shared/pics/redStar.png +++ b/examples/quick/tutorials/samegame/shared/pics/redStar.png diff --git a/examples/tutorials/samegame/shared/pics/redStone.png b/examples/quick/tutorials/samegame/shared/pics/redStone.png Binary files differindex 36b09a2686..36b09a2686 100644 --- a/examples/tutorials/samegame/shared/pics/redStone.png +++ b/examples/quick/tutorials/samegame/shared/pics/redStone.png diff --git a/examples/tutorials/samegame/shared/pics/star.png b/examples/quick/tutorials/samegame/shared/pics/star.png Binary files differindex defbde53ca..defbde53ca 100644 --- a/examples/tutorials/samegame/shared/pics/star.png +++ b/examples/quick/tutorials/samegame/shared/pics/star.png diff --git a/examples/tutorials/samegame/shared/pics/yellowStone.png b/examples/quick/tutorials/samegame/shared/pics/yellowStone.png Binary files differindex b1ce76212c..b1ce76212c 100644 --- a/examples/tutorials/samegame/shared/pics/yellowStone.png +++ b/examples/quick/tutorials/samegame/shared/pics/yellowStone.png diff --git a/examples/quick/tutorials/tutorials.pro b/examples/quick/tutorials/tutorials.pro new file mode 100644 index 0000000000..fd6117b2d0 --- /dev/null +++ b/examples/quick/tutorials/tutorials.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs +SUBDIRS += gettingStartedQml + +EXAMPLE_FILES = \ + dynamicview \ + extending \ + helloworld \ + samegame diff --git a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc index c694e9ad63..4e302e7256 100644 --- a/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc +++ b/examples/quick/ui-components/slideswitch/doc/src/example-slideswitch.qdoc @@ -34,7 +34,7 @@ This example shows how to create a reusable switch component in QML. -The code for this example can be found in the \c examples/tutorials/ui-components/slideswitch directory. +The code for this example can be found in the \c examples/quick/tutorials/ui-components/slideswitch directory. The elements that compose the switch are: diff --git a/examples/window/screen/screenInfo.qml b/examples/quick/window/screen/screenInfo.qml index adf92ee028..adf92ee028 100644 --- a/examples/window/screen/screenInfo.qml +++ b/examples/quick/window/screen/screenInfo.qml diff --git a/examples/quick/window/window.pro b/examples/quick/window/window.pro new file mode 100644 index 0000000000..93e43fcd65 --- /dev/null +++ b/examples/quick/window/window.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs +SUBDIRS += \ + window + +EXAMPLE_FILES = \ + screen diff --git a/examples/window/window/Window.qml b/examples/quick/window/window/Window.qml index b7fbf7206c..b7fbf7206c 100644 --- a/examples/window/window/Window.qml +++ b/examples/quick/window/window/Window.qml diff --git a/examples/window/window/nogui.qml b/examples/quick/window/window/nogui.qml index bed055679d..bed055679d 100644 --- a/examples/window/window/nogui.qml +++ b/examples/quick/window/window/nogui.qml diff --git a/examples/window/window/standalone.qml b/examples/quick/window/window/standalone.qml index a7a7ed2d7a..a7a7ed2d7a 100644 --- a/examples/window/window/standalone.qml +++ b/examples/quick/window/window/standalone.qml diff --git a/examples/window/window/twowindows.qml b/examples/quick/window/window/twowindows.qml index 345598cf12..345598cf12 100644 --- a/examples/window/window/twowindows.qml +++ b/examples/quick/window/window/twowindows.qml diff --git a/examples/window/window/window.cpp b/examples/quick/window/window/window.cpp index c9e6e90997..c9e6e90997 100644 --- a/examples/window/window/window.cpp +++ b/examples/quick/window/window/window.cpp diff --git a/examples/quick/window/window/window.pro b/examples/quick/window/window/window.pro new file mode 100644 index 0000000000..e8a022361f --- /dev/null +++ b/examples/quick/window/window/window.pro @@ -0,0 +1,11 @@ +TEMPLATE = app +CONFIG += qt +QT += qml + +SOURCES += window.cpp + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/window/window +qml.files = Window.qml nogui.qml standalone.qml twowindows.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/window/window + +INSTALLS = target qml diff --git a/examples/shared/shared.pro b/examples/shared/shared.pro deleted file mode 100644 index 3bc9bfebbe..0000000000 --- a/examples/shared/shared.pro +++ /dev/null @@ -1,9 +0,0 @@ -#just install the files, all QML for now -TEMPLATE = aux - -qml.files = images \ - LauncherList.qml \ - SimpleLauncherDelegate.qml \ - Button.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/shared -INSTALLS = qml diff --git a/examples/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/tutorials/gettingStartedQml/gettingStartedQml.pro deleted file mode 100644 index 10ce079896..0000000000 --- a/examples/tutorials/gettingStartedQml/gettingStartedQml.pro +++ /dev/null @@ -1,8 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = \ - filedialog\ - -# install -sources.files = gettingStartedQml.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials/gettingStartedQml -INSTALLS += sources diff --git a/examples/tutorials/tutorials.pro b/examples/tutorials/tutorials.pro deleted file mode 100644 index 9cb5c57c3f..0000000000 --- a/examples/tutorials/tutorials.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += gettingStartedQml - -# install -sources.files = tutorials.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/tutorials -INSTALLS += sources diff --git a/examples/window/window.pro b/examples/window/window.pro deleted file mode 100644 index 5dea5d621f..0000000000 --- a/examples/window/window.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - #screen \ - window - -# install -sources.files = window.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/window -INSTALLS += sources diff --git a/examples/window/window/window.pro b/examples/window/window/window.pro deleted file mode 100644 index 7939773b17..0000000000 --- a/examples/window/window/window.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app -CONFIG += qt -QT += qml - -SOURCES += window.cpp -OTHER_FILES = Window.qml nogui.qml standalone.qml twowindows.qml - -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/window/window -sources.files = $$SOURCES $$OTHER_FILES window.pro -sources.path = $$target.path -INSTALLS = sources target |