Port examples and demos to Qt5 QML2

In most cases simply changing the import line to QtQuick 2.0 fixed any
problems.

Also fixed a few warnings and spurious includes.

Task-number: QTBUG-20050
Change-Id: I311a6d63f899e2fd3621fb608c587375a27378f6
Reviewed-on: http://codereview.qt.nokia.com/2546
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/pkg.pri b/pkg.pri
index ec444624e..92809be00 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -199,9 +199,9 @@ defineTest(qtcAddDeployment) {
                 source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
                 source = $$replace(source, \\\\, /)
                 macx {
-                    target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+                    target = $$DESTDIR/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
                 } else {
-                    target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                    target = $$DESTDIR/$$eval($${deploymentfolder}.target)
                 }
                 target = $$replace(target, \\\\, /)
                 sourcePathSegments = $$split(source, /)