Merge master <-> api_changes

[profile/ivi/qtdeclarative.git] / examples / quick / animation / main.cpp

diff --git a/examples/qtquick/animation/main.cpp b/examples/quick/animation/main.cpp
similarity index 100%
rename from examples/qtquick/animation/main.cpp
rename to examples/quick/animation/main.cpp