Toys Examples Modifications
authorartoka <arto.katajasalo@digia.com>
Thu, 17 Nov 2011 14:50:02 +0000 (15:50 +0100)
committerCasper van Donderen <casper.vandonderen@nokia.com>
Thu, 17 Nov 2011 14:59:40 +0000 (15:59 +0100)
commitdf92e56be8b3e20ad02f9da0e9d956bbb7db78cf
tree6f97a8ee0e03dabfb90fda9b5727ea1711baf4f8
parent7a98c9cca6dade7a2074d9dd19a44c8c23bd412b
Toys Examples Modifications

toys/ clocks, corkboards, dynamicscene, tic-tac-toe and tvtennis
example modifications

Modified examples to use centralized qmlapplicationviewer,
removed duplicate files and modified project files according
to the changes.

Merge-request: 2719
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
137 files changed:
examples/declarative/toys/clocks/clocks.pro
examples/declarative/toys/clocks/clocks.qml [deleted file]
examples/declarative/toys/clocks/clocks.qmlproject [new file with mode: 0644]
examples/declarative/toys/clocks/content/Clock.qml [deleted file]
examples/declarative/toys/clocks/content/QuitButton.qml [deleted file]
examples/declarative/toys/clocks/content/background.png [deleted file]
examples/declarative/toys/clocks/content/center.png [deleted file]
examples/declarative/toys/clocks/content/clock-night.png [deleted file]
examples/declarative/toys/clocks/content/clock.png [deleted file]
examples/declarative/toys/clocks/content/hour.png [deleted file]
examples/declarative/toys/clocks/content/minute.png [deleted file]
examples/declarative/toys/clocks/content/quit.png [deleted file]
examples/declarative/toys/clocks/content/second.png [deleted file]
examples/declarative/toys/clocks/main.cpp
examples/declarative/toys/clocks/qml/clocks.qml [deleted file]
examples/declarative/toys/clocks/qml/clocks.qmlproject [deleted file]
examples/declarative/toys/clocks/qml/clocks/clocks.qml [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/Clock.qml [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/QuitButton.qml [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/background.png [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/center.png [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/clock-night.png [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/clock.png [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/hour.png [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/minute.png [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/quit.png [new file with mode: 0644]
examples/declarative/toys/clocks/qml/clocks/content/second.png [new file with mode: 0644]
examples/declarative/toys/clocks/qml/content/Clock.qml [deleted file]
examples/declarative/toys/clocks/qml/content/QuitButton.qml [deleted file]
examples/declarative/toys/clocks/qml/content/background.png [deleted file]
examples/declarative/toys/clocks/qml/content/center.png [deleted file]
examples/declarative/toys/clocks/qml/content/clock-night.png [deleted file]
examples/declarative/toys/clocks/qml/content/clock.png [deleted file]
examples/declarative/toys/clocks/qml/content/hour.png [deleted file]
examples/declarative/toys/clocks/qml/content/minute.png [deleted file]
examples/declarative/toys/clocks/qml/content/quit.png [deleted file]
examples/declarative/toys/clocks/qml/content/second.png [deleted file]
examples/declarative/toys/clocks/qmlapplicationviewer/qmlapplicationviewer.cpp [deleted file]
examples/declarative/toys/clocks/qmlapplicationviewer/qmlapplicationviewer.h [deleted file]
examples/declarative/toys/clocks/qmlapplicationviewer/qmlapplicationviewer.pri [deleted file]
examples/declarative/toys/corkboards/Day.qml [deleted file]
examples/declarative/toys/corkboards/corkboards.pro
examples/declarative/toys/corkboards/corkboards.qml [deleted file]
examples/declarative/toys/corkboards/corkboards.qmlproject [new file with mode: 0644]
examples/declarative/toys/corkboards/main.cpp
examples/declarative/toys/corkboards/qml/Day.qml [deleted file]
examples/declarative/toys/corkboards/qml/cork.jpg [deleted file]
examples/declarative/toys/corkboards/qml/corkboards.qml [deleted file]
examples/declarative/toys/corkboards/qml/corkboards.qmlproject [deleted file]
examples/declarative/toys/corkboards/qml/corkboards/Day.qml [new file with mode: 0644]
examples/declarative/toys/corkboards/qml/corkboards/cork.jpg [new file with mode: 0644]
examples/declarative/toys/corkboards/qml/corkboards/corkboards.qml [new file with mode: 0644]
examples/declarative/toys/corkboards/qml/corkboards/note-yellow.png [new file with mode: 0644]
examples/declarative/toys/corkboards/qml/corkboards/tack.png [new file with mode: 0644]
examples/declarative/toys/corkboards/qml/note-yellow.png [deleted file]
examples/declarative/toys/corkboards/qml/tack.png [deleted file]
examples/declarative/toys/corkboards/qmlapplicationviewer/qmlapplicationviewer.cpp [deleted file]
examples/declarative/toys/corkboards/qmlapplicationviewer/qmlapplicationviewer.h [deleted file]
examples/declarative/toys/corkboards/qmlapplicationviewer/qmlapplicationviewer.pri [deleted file]
examples/declarative/toys/dynamicscene/dynamicscene.pro
examples/declarative/toys/dynamicscene/dynamicscene.qml [deleted file]
examples/declarative/toys/dynamicscene/dynamicscene.qmlproject [new file with mode: 0644]
examples/declarative/toys/dynamicscene/main.cpp
examples/declarative/toys/dynamicscene/qml/Button.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/PaletteItem.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/Sun.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/dynamicscene.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/dynamicscene.qmlproject [deleted file]
examples/declarative/toys/dynamicscene/qml/dynamicscene/Button.qml [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/GenericSceneItem.qml [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/PaletteItem.qml [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/PerspectiveItem.qml [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/Sun.qml [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/images/NOTE [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/images/face-smile.png [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/images/moon.png [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/images/rabbit_brown.png [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/images/rabbit_bw.png [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/images/star.png [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/images/sun.png [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/images/tree_s.png [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/dynamicscene/itemCreation.js [new file with mode: 0644]
examples/declarative/toys/dynamicscene/qml/images/NOTE [deleted file]
examples/declarative/toys/dynamicscene/qml/images/face-smile.png [deleted file]
examples/declarative/toys/dynamicscene/qml/images/moon.png [deleted file]
examples/declarative/toys/dynamicscene/qml/images/rabbit_brown.png [deleted file]
examples/declarative/toys/dynamicscene/qml/images/rabbit_bw.png [deleted file]
examples/declarative/toys/dynamicscene/qml/images/star.png [deleted file]
examples/declarative/toys/dynamicscene/qml/images/sun.png [deleted file]
examples/declarative/toys/dynamicscene/qml/images/tree_s.png [deleted file]
examples/declarative/toys/dynamicscene/qml/qml/Button.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/qml/GenericSceneItem.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/qml/PaletteItem.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/qml/PerspectiveItem.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/qml/Sun.qml [deleted file]
examples/declarative/toys/dynamicscene/qml/qml/itemCreation.js [deleted file]
examples/declarative/toys/dynamicscene/qmlapplicationviewer/qmlapplicationviewer.cpp [deleted file]
examples/declarative/toys/dynamicscene/qmlapplicationviewer/qmlapplicationviewer.h [deleted file]
examples/declarative/toys/dynamicscene/qmlapplicationviewer/qmlapplicationviewer.pri [deleted file]
examples/declarative/toys/tic-tac-toe/content/Button.qml [deleted file]
examples/declarative/toys/tic-tac-toe/content/TicTac.qml [deleted file]
examples/declarative/toys/tic-tac-toe/main.cpp
examples/declarative/toys/tic-tac-toe/qml/content/Button.qml [deleted file]
examples/declarative/toys/tic-tac-toe/qml/content/TicTac.qml [deleted file]
examples/declarative/toys/tic-tac-toe/qml/content/pics/board.png [deleted file]
examples/declarative/toys/tic-tac-toe/qml/content/pics/o.png [deleted file]
examples/declarative/toys/tic-tac-toe/qml/content/pics/x.png [deleted file]
examples/declarative/toys/tic-tac-toe/qml/content/tic-tac-toe.js [deleted file]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe.qml [deleted file]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe.qmlproject [deleted file]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/Button.qml [new file with mode: 0644]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/TicTac.qml [new file with mode: 0644]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/pics/board.png [new file with mode: 0644]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/pics/o.png [new file with mode: 0644]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/pics/x.png [new file with mode: 0644]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/tic-tac-toe.js [new file with mode: 0644]
examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/tic-tac-toe.qml [new file with mode: 0644]
examples/declarative/toys/tic-tac-toe/qmlapplicationviewer/qmlapplicationviewer.cpp [deleted file]
examples/declarative/toys/tic-tac-toe/qmlapplicationviewer/qmlapplicationviewer.h [deleted file]
examples/declarative/toys/tic-tac-toe/qmlapplicationviewer/qmlapplicationviewer.pri [deleted file]
examples/declarative/toys/tic-tac-toe/tic-tac-toe.pro [deleted file]
examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml [deleted file]
examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject [new file with mode: 0644]
examples/declarative/toys/tic-tac-toe/tictactoe.pro
examples/declarative/toys/tvtennis/main.cpp
examples/declarative/toys/tvtennis/qml/tvtennis.qml [deleted file]
examples/declarative/toys/tvtennis/qml/tvtennis.qmlproject [deleted file]
examples/declarative/toys/tvtennis/qml/tvtennis/tvtennis.qml [new file with mode: 0644]
examples/declarative/toys/tvtennis/qmlapplicationviewer/qmlapplicationviewer.cpp [deleted file]
examples/declarative/toys/tvtennis/qmlapplicationviewer/qmlapplicationviewer.h [deleted file]
examples/declarative/toys/tvtennis/qmlapplicationviewer/qmlapplicationviewer.pri [deleted file]
examples/declarative/toys/tvtennis/tvtennis.pro
examples/declarative/toys/tvtennis/tvtennis.qml [deleted file]
examples/declarative/toys/tvtennis/tvtennis.qmlproject [new file with mode: 0644]