Merge branch 'stable' into dev

Change-Id: I0ff4fb4cb9acd73db397bc44c2970a7286a2d0c2

780 files changed, 481 insertions, 31366 deletions

diff --git a/basicsuite/about-b2qt/AboutBoot2Qt.qml b/basicsuite/about-b2qt/AboutBoot2Qt.qml
index ada3eb1..76da891 100644
--- a/basicsuite/about-b2qt/AboutBoot2Qt.qml
+++ b/basicsuite/about-b2qt/AboutBoot2Qt.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
@@ -271,7 +271,7 @@ Column {
                 for common developer boards from</p>'
     }
     HighlightText {
-        text: "http://qt.digia.com/QtEnterpriseEmbedded"
+        text: "http://www.qt.io"
         color: qtpurple
         font.bold: true
         horizontalAlignment: Text.AlignHCenter
diff --git a/basicsuite/about-b2qt/Box.qml b/basicsuite/about-b2qt/Box.qml
index 72ede4b..d86e62e 100644
--- a/basicsuite/about-b2qt/Box.qml
+++ b/basicsuite/about-b2qt/Box.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/about-b2qt/ColouredTitle.qml b/basicsuite/about-b2qt/ColouredTitle.qml
index c73192c..f243393 100644
--- a/basicsuite/about-b2qt/ColouredTitle.qml
+++ b/basicsuite/about-b2qt/ColouredTitle.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/about-b2qt/ContentText.qml b/basicsuite/about-b2qt/ContentText.qml
index ec4b791..70065d3 100644
--- a/basicsuite/about-b2qt/ContentText.qml
+++ b/basicsuite/about-b2qt/ContentText.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/about-b2qt/HighlightText.qml b/basicsuite/about-b2qt/HighlightText.qml
index e1fc68e..c8620dc 100644
--- a/basicsuite/about-b2qt/HighlightText.qml
+++ b/basicsuite/about-b2qt/HighlightText.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/about-b2qt/QtForAndroid.qml b/basicsuite/about-b2qt/QtForAndroid.qml
index 6b3b81f..fdb45ef 100644
--- a/basicsuite/about-b2qt/QtForAndroid.qml
+++ b/basicsuite/about-b2qt/QtForAndroid.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/about-b2qt/QtFramework.qml b/basicsuite/about-b2qt/QtFramework.qml
index 76c2865..e5cbe28 100644
--- a/basicsuite/about-b2qt/QtFramework.qml
+++ b/basicsuite/about-b2qt/QtFramework.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/about-b2qt/Title.qml b/basicsuite/about-b2qt/Title.qml
index 0f7f792..4a63f69 100644
--- a/basicsuite/about-b2qt/Title.qml
+++ b/basicsuite/about-b2qt/Title.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/about-b2qt/codeless.png b/basicsuite/about-b2qt/codeless.png
index 53e4806..0aadc90 100644
--- a/basicsuite/about-b2qt/codeless.png
+++ b/basicsuite/about-b2qt/codeless.png
diff --git a/basicsuite/about-b2qt/main.qml b/basicsuite/about-b2qt/main.qml
index 2b21a6b..8f5296b 100644
--- a/basicsuite/about-b2qt/main.qml
+++ b/basicsuite/about-b2qt/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/about-b2qt/preview_l.jpg b/basicsuite/about-b2qt/preview_l.jpg
index 5ea4310..026892f 100644
--- a/basicsuite/about-b2qt/preview_l.jpg
+++ b/basicsuite/about-b2qt/preview_l.jpg
diff --git a/basicsuite/about-b2qt/qt-logo.png b/basicsuite/about-b2qt/qt-logo.png
deleted file mode 100644
index 748392d..0000000
--- a/basicsuite/about-b2qt/qt-logo.png
+++ /dev/null
diff --git a/basicsuite/basicsuite.pro b/basicsuite/basicsuite.pro
index 49d1123..e8954f1 100644
--- a/basicsuite/basicsuite.pro
+++ b/basicsuite/basicsuite.pro
@@ -3,8 +3,8 @@ SUBDIRS += \
     sensorexplorer
 
 qtHaveModule(multimedia) {
-    SUBDIRS += qt5-everywhere \
-               camera
+    SUBDIRS += \
+        camera
 }
 
 qtHaveModule(datavisualization) {
diff --git a/basicsuite/camera/CameraControlButton.qml b/basicsuite/camera/CameraControlButton.qml
index f0dc438..64a10cf 100644
--- a/basicsuite/camera/CameraControlButton.qml
+++ b/basicsuite/camera/CameraControlButton.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/CameraSetting.qml b/basicsuite/camera/CameraSetting.qml
index bf8fb6b..93f6647 100644
--- a/basicsuite/camera/CameraSetting.qml
+++ b/basicsuite/camera/CameraSetting.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/CaptureControl.qml b/basicsuite/camera/CaptureControl.qml
index 5a14e4e..e45f9bf 100644
--- a/basicsuite/camera/CaptureControl.qml
+++ b/basicsuite/camera/CaptureControl.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/CapturePreview.qml b/basicsuite/camera/CapturePreview.qml
index db01ca4..008a15d 100644
--- a/basicsuite/camera/CapturePreview.qml
+++ b/basicsuite/camera/CapturePreview.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/Controls.qml b/basicsuite/camera/Controls.qml
index cc1e1ad..64f95bb 100644
--- a/basicsuite/camera/Controls.qml
+++ b/basicsuite/camera/Controls.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/FocusControl.qml b/basicsuite/camera/FocusControl.qml
index 83fd2fe..8191b7c 100644
--- a/basicsuite/camera/FocusControl.qml
+++ b/basicsuite/camera/FocusControl.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/Picker.qml b/basicsuite/camera/Picker.qml
index e29d70f..bb262a0 100644
--- a/basicsuite/camera/Picker.qml
+++ b/basicsuite/camera/Picker.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/RecordingTime.qml b/basicsuite/camera/RecordingTime.qml
index 941f76a..c60b824 100644
--- a/basicsuite/camera/RecordingTime.qml
+++ b/basicsuite/camera/RecordingTime.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/Slider.qml b/basicsuite/camera/Slider.qml
index 18853ad..0722f80 100644
--- a/basicsuite/camera/Slider.qml
+++ b/basicsuite/camera/Slider.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/ZoomControl.qml b/basicsuite/camera/ZoomControl.qml
index 0c1cbdd..2f929e0 100644
--- a/basicsuite/camera/ZoomControl.qml
+++ b/basicsuite/camera/ZoomControl.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/camerautils/camerautils.cpp b/basicsuite/camera/camerautils/camerautils.cpp
index 9e890d5..cde2d79 100644
--- a/basicsuite/camera/camerautils/camerautils.cpp
+++ b/basicsuite/camera/camerautils/camerautils.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/camerautils/camerautils.h b/basicsuite/camera/camerautils/camerautils.h
index 67c5b0d..bc38534 100644
--- a/basicsuite/camera/camerautils/camerautils.h
+++ b/basicsuite/camera/camerautils/camerautils.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/main.qml b/basicsuite/camera/main.qml
index a0cf449..cb36028 100644
--- a/basicsuite/camera/main.qml
+++ b/basicsuite/camera/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/camera/preview_l.jpg b/basicsuite/camera/preview_l.jpg
index 3f15310..f949eb7 100644
--- a/basicsuite/camera/preview_l.jpg
+++ b/basicsuite/camera/preview_l.jpg
diff --git a/basicsuite/controls-touch/preview_l.jpg b/basicsuite/controls-touch/preview_l.jpg
index c57eac3..0653058 100644
--- a/basicsuite/controls-touch/preview_l.jpg
+++ b/basicsuite/controls-touch/preview_l.jpg
diff --git a/basicsuite/enterprise-charts/View1.qml b/basicsuite/enterprise-charts/View1.qml
index e3850ae..e245cef 100644
--- a/basicsuite/enterprise-charts/View1.qml
+++ b/basicsuite/enterprise-charts/View1.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View10.qml b/basicsuite/enterprise-charts/View10.qml
index 2a5a297..ede5d50 100644
--- a/basicsuite/enterprise-charts/View10.qml
+++ b/basicsuite/enterprise-charts/View10.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View11.qml b/basicsuite/enterprise-charts/View11.qml
index 2b2d444..d08fb7b 100644
--- a/basicsuite/enterprise-charts/View11.qml
+++ b/basicsuite/enterprise-charts/View11.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View12.qml b/basicsuite/enterprise-charts/View12.qml
index 2a0dc55..9a48af8 100644
--- a/basicsuite/enterprise-charts/View12.qml
+++ b/basicsuite/enterprise-charts/View12.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View13.qml b/basicsuite/enterprise-charts/View13.qml
index 1322e97..610cce1 100644
--- a/basicsuite/enterprise-charts/View13.qml
+++ b/basicsuite/enterprise-charts/View13.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View14.qml b/basicsuite/enterprise-charts/View14.qml
index e6662a1..467a4a5 100644
--- a/basicsuite/enterprise-charts/View14.qml
+++ b/basicsuite/enterprise-charts/View14.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View15.qml b/basicsuite/enterprise-charts/View15.qml
index 74d9789..8aff22b 100644
--- a/basicsuite/enterprise-charts/View15.qml
+++ b/basicsuite/enterprise-charts/View15.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View2.qml b/basicsuite/enterprise-charts/View2.qml
index a7e0ace..73e1c9c 100644
--- a/basicsuite/enterprise-charts/View2.qml
+++ b/basicsuite/enterprise-charts/View2.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View3.qml b/basicsuite/enterprise-charts/View3.qml
index d56ceeb..839551d 100644
--- a/basicsuite/enterprise-charts/View3.qml
+++ b/basicsuite/enterprise-charts/View3.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View4.qml b/basicsuite/enterprise-charts/View4.qml
index 5ca5906..49dc1b9 100644
--- a/basicsuite/enterprise-charts/View4.qml
+++ b/basicsuite/enterprise-charts/View4.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View5.qml b/basicsuite/enterprise-charts/View5.qml
index 4b0882c..2a99c3a 100644
--- a/basicsuite/enterprise-charts/View5.qml
+++ b/basicsuite/enterprise-charts/View5.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View6.qml b/basicsuite/enterprise-charts/View6.qml
index b9db3ac..1669274 100644
--- a/basicsuite/enterprise-charts/View6.qml
+++ b/basicsuite/enterprise-charts/View6.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View7.qml b/basicsuite/enterprise-charts/View7.qml
index 998097a..96fc2e7 100644
--- a/basicsuite/enterprise-charts/View7.qml
+++ b/basicsuite/enterprise-charts/View7.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View8.qml b/basicsuite/enterprise-charts/View8.qml
index fcb8a72..9ec4d5d 100644
--- a/basicsuite/enterprise-charts/View8.qml
+++ b/basicsuite/enterprise-charts/View8.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/View9.qml b/basicsuite/enterprise-charts/View9.qml
index 5ba3d36..3e3d0fb 100644
--- a/basicsuite/enterprise-charts/View9.qml
+++ b/basicsuite/enterprise-charts/View9.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/loader.qml b/basicsuite/enterprise-charts/loader.qml
index f9b7569..42198e4 100644
--- a/basicsuite/enterprise-charts/loader.qml
+++ b/basicsuite/enterprise-charts/loader.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml
index 10376c8..a500bd9 100644
--- a/basicsuite/enterprise-charts/main.qml
+++ b/basicsuite/enterprise-charts/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the Qt Enterprise Charts Add-on.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/basicsuite/enterprise-charts/preview_l.jpg b/basicsuite/enterprise-charts/preview_l.jpg
index 2776b0b..00deaf4 100644
--- a/basicsuite/enterprise-charts/preview_l.jpg
+++ b/basicsuite/enterprise-charts/preview_l.jpg
diff --git a/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml b/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml
deleted file mode 100644
index 632b63b..0000000
--- a/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml
+++ /dev/null
@@ -1,144 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-CircularGaugeStyle {
-    tickmarkInset: toPixels(0.04)
-    minorTickmarkInset: tickmarkInset
-    labelStepSize: 20
-    labelInset: toPixels(0.23)
-
-    property real xCenter: outerRadius
-    property real yCenter: outerRadius
-    property real needleLength: outerRadius - tickmarkInset * 1.25
-    property real needleTipWidth: toPixels(0.02)
-    property real needleBaseWidth: toPixels(0.06)
-    property bool halfGauge: false
-
-    function toPixels(percentage) {
-        return percentage * outerRadius;
-    }
-
-    function degToRad(degrees) {
-        return degrees * (Math.PI / 180);
-    }
-
-    function radToDeg(radians) {
-        return radians * (180 / Math.PI);
-    }
-
-    function paintBackground(ctx) {
-        if (halfGauge) {
-            ctx.beginPath();
-            ctx.rect(0, 0, ctx.canvas.width, ctx.canvas.height / 2);
-            ctx.clip();
-        }
-
-        ctx.beginPath();
-        ctx.fillStyle = "black";
-        ctx.ellipse(0, 0, ctx.canvas.width, ctx.canvas.height);
-        ctx.fill();
-
-        ctx.beginPath();
-        ctx.lineWidth = tickmarkInset;
-        ctx.strokeStyle = "black";
-        ctx.arc(xCenter, yCenter, outerRadius - ctx.lineWidth / 2, outerRadius - ctx.lineWidth / 2, 0, Math.PI * 2);
-        ctx.stroke();
-
-        ctx.beginPath();
-        ctx.lineWidth = tickmarkInset / 2;
-        ctx.strokeStyle = "#222";
-        ctx.arc(xCenter, yCenter, outerRadius - ctx.lineWidth / 2, outerRadius - ctx.lineWidth / 2, 0, Math.PI * 2);
-        ctx.stroke();
-
-        ctx.beginPath();
-        var gradient = ctx.createRadialGradient(xCenter, yCenter, outerRadius * 0.8, xCenter, yCenter, outerRadius);
-        gradient.addColorStop(0, Qt.rgba(1, 1, 1, 0));
-        gradient.addColorStop(0.7, Qt.rgba(1, 1, 1, 0.13));
-        gradient.addColorStop(1, Qt.rgba(1, 1, 1, 1));
-        ctx.fillStyle = gradient;
-        ctx.arc(xCenter, yCenter, outerRadius - tickmarkInset, outerRadius - tickmarkInset, 0, Math.PI * 2);
-        ctx.fill();
-    }
-
-    background: Canvas {
-        onPaint: {
-            var ctx = getContext("2d");
-            ctx.reset();
-            paintBackground(ctx);
-        }
-
-        Text {
-            id: speedText
-            font.pixelSize: toPixels(0.3)
-            text: kphInt
-            color: "white"
-            horizontalAlignment: Text.AlignRight
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: parent.verticalCenter
-            anchors.topMargin: toPixels(0.1)
-
-            readonly property int kphInt: control.value
-        }
-        Text {
-            text: "km/h"
-            color: "white"
-            font.pixelSize: toPixels(0.09)
-            anchors.top: speedText.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-
-    needle: Canvas {
-        width: needleBaseWidth
-        height: needleLength
-
-        property real xCenter: width / 2
-        property real yCenter: height / 2
-
-        onPaint: {
-            var ctx = getContext("2d");
-            ctx.reset();
-
-            ctx.beginPath();
-            ctx.moveTo(xCenter, height);
-            ctx.lineTo(xCenter - needleBaseWidth / 2, height - needleBaseWidth / 2);
-            ctx.lineTo(xCenter - needleTipWidth / 2, 0);
-            ctx.lineTo(xCenter, yCenter - needleLength);
-            ctx.lineTo(xCenter, 0);
-            ctx.closePath();
-            ctx.fillStyle = Qt.rgba(0.66, 0, 0, 0.66);
-            ctx.fill();
-
-            ctx.beginPath();
-            ctx.moveTo(xCenter, height)
-            ctx.lineTo(width, height - needleBaseWidth / 2);
-            ctx.lineTo(xCenter + needleTipWidth / 2, 0);
-            ctx.lineTo(xCenter, 0);
-            ctx.closePath();
-            ctx.fillStyle = Qt.lighter(Qt.rgba(0.66, 0, 0, 0.66));
-            ctx.fill();
-        }
-    }
-
-    foreground: null
-}
diff --git a/basicsuite/enterprise-dashboard/IconGaugeStyle.qml b/basicsuite/enterprise-dashboard/IconGaugeStyle.qml
deleted file mode 100644
index a04d0e9..0000000
--- a/basicsuite/enterprise-dashboard/IconGaugeStyle.qml
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-DashboardGaugeStyle {
-    id: fuelGaugeStyle
-    minimumValueAngle: 300
-    maximumValueAngle: 60
-    tickmarkStepSize: 1
-    labelStepSize: 1
-    labelInset: toPixels(-0.25)
-    minorTickmarkCount: 3
-
-    needleLength: toPixels(0.85)
-    needleBaseWidth: toPixels(0.08)
-    needleTipWidth: toPixels(0.03)
-
-    halfGauge: true
-
-    property string icon: ""
-    property color minWarningColor: "transparent"
-    property color maxWarningColor: "transparent"
-    readonly property real minWarningStartAngle: minimumValueAngle - 90
-    readonly property real maxWarningStartAngle: maximumValueAngle - 90
-
-    tickmark: Rectangle {
-        width: toPixels(0.06)
-        antialiasing: true
-        height: toPixels(0.2)
-        color: "#c8c8c8"
-    }
-
-    minorTickmark: Rectangle {
-        width: toPixels(0.03)
-        antialiasing: true
-        height: toPixels(0.15)
-        color: "#c8c8c8"
-    }
-
-    background: Item {
-        Canvas {
-            anchors.fill: parent
-            onPaint: {
-                var ctx = getContext("2d");
-                ctx.reset();
-
-                paintBackground(ctx);
-
-                if (minWarningColor != "transparent") {
-                    ctx.beginPath();
-                    ctx.lineWidth = fuelGaugeStyle.toPixels(0.08);
-                    ctx.strokeStyle = minWarningColor;
-                    ctx.arc(outerRadius, outerRadius,
-                        // Start the line in from the decorations, and account for the width of the line itself.
-                        outerRadius - tickmarkInset - ctx.lineWidth / 2,
-                        degToRad(minWarningStartAngle),
-                        degToRad(minWarningStartAngle + angleRange / (minorTickmarkCount + 1)), false);
-                    ctx.stroke();
-                }
-                if (maxWarningColor != "transparent") {
-                    ctx.beginPath();
-                    ctx.lineWidth = fuelGaugeStyle.toPixels(0.08);
-                    ctx.strokeStyle = maxWarningColor;
-                    ctx.arc(outerRadius, outerRadius,
-                        // Start the line in from the decorations, and account for the width of the line itself.
-                        outerRadius - tickmarkInset - ctx.lineWidth / 2,
-                        degToRad(maxWarningStartAngle - angleRange / (minorTickmarkCount + 1)),
-                        degToRad(maxWarningStartAngle), false);
-                    ctx.stroke();
-                }
-            }
-        }
-
-        Image {
-            source: icon
-            anchors.bottom: parent.verticalCenter
-            anchors.bottomMargin: toPixels(0.3)
-            anchors.horizontalCenter: parent.horizontalCenter
-            width: toPixels(0.3)
-            height: width
-            fillMode: Image.PreserveAspectFit
-        }
-    }
-}
diff --git a/basicsuite/enterprise-dashboard/TachometerStyle.qml b/basicsuite/enterprise-dashboard/TachometerStyle.qml
deleted file mode 100644
index 15a2601..0000000
--- a/basicsuite/enterprise-dashboard/TachometerStyle.qml
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-DashboardGaugeStyle {
-    id: tachometerStyle
-    tickmarkStepSize: 1
-    labelStepSize: 1
-    needleLength: toPixels(0.85)
-    needleBaseWidth: toPixels(0.08)
-    needleTipWidth: toPixels(0.03)
-
-    tickmark: Rectangle {
-        width: toPixels(0.03)
-        antialiasing: true
-        height: toPixels(0.08)
-        color: styleData.index === 7 || styleData.index === 8 ? Qt.rgba(0.5, 0, 0, 1) : "#c8c8c8"
-    }
-
-    minorTickmark: null
-
-    tickmarkLabel: Text {
-        font.pixelSize: Math.max(6, toPixels(0.12))
-        text: styleData.value
-        color: styleData.index === 7 || styleData.index === 8 ? Qt.rgba(0.5, 0, 0, 1) : "#c8c8c8"
-        antialiasing: true
-    }
-
-    background: Canvas {
-        onPaint: {
-            var ctx = getContext("2d");
-            ctx.reset();
-            paintBackground(ctx);
-
-            ctx.beginPath();
-            ctx.lineWidth = tachometerStyle.toPixels(0.08);
-            ctx.strokeStyle = Qt.rgba(0.5, 0, 0, 1);
-            var warningCircumference = maximumValueAngle - minimumValueAngle * 0.1;
-            var startAngle = maximumValueAngle - 90;
-            ctx.arc(outerRadius, outerRadius,
-                // Start the line in from the decorations, and account for the width of the line itself.
-                outerRadius - tickmarkInset - ctx.lineWidth / 2,
-                degToRad(startAngle - angleRange / 8 + angleRange * 0.015),
-                degToRad(startAngle - angleRange * 0.015), false);
-            ctx.stroke();
-        }
-
-        Text {
-            id: rpmText
-            font.pixelSize: tachometerStyle.toPixels(0.3)
-            text: rpmInt
-            color: "white"
-            horizontalAlignment: Text.AlignRight
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.top: parent.verticalCenter
-            anchors.topMargin: 20
-
-            readonly property int rpmInt: valueSource.rpm
-        }
-        Text {
-            text: "x1000"
-            color: "white"
-            font.pixelSize: tachometerStyle.toPixels(0.1)
-            anchors.top: parent.top
-            anchors.topMargin: parent.height / 4
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-        Text {
-            text: "RPM"
-            color: "white"
-            font.pixelSize: tachometerStyle.toPixels(0.1)
-            anchors.top: rpmText.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-        }
-    }
-}
diff --git a/basicsuite/enterprise-dashboard/TurnIndicator.qml b/basicsuite/enterprise-dashboard/TurnIndicator.qml
deleted file mode 100644
index 22d0ea9..0000000
--- a/basicsuite/enterprise-dashboard/TurnIndicator.qml
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-Item {
-    // This enum is actually keyboard-related, but it serves its purpose
-    // as an indication of direction for us.
-    property int direction: Qt.LeftArrow
-    property bool on: false
-
-    property bool flashing: false
-
-    scale: direction === Qt.LeftArrow ? 1 : -1
-
-    Timer {
-        id: flashTimer
-        interval: 500
-        running: on
-        repeat: true
-        onTriggered: flashing = !flashing
-    }
-
-    function paintOutlinePath(ctx) {
-        ctx.beginPath();
-        ctx.moveTo(0, height * 0.5);
-        ctx.lineTo(0.6 * width, 0);
-        ctx.lineTo(0.6 * width, height * 0.28);
-        ctx.lineTo(width, height * 0.28);
-        ctx.lineTo(width, height * 0.72);
-        ctx.lineTo(0.6 * width, height * 0.72);
-        ctx.lineTo(0.6 * width, height);
-        ctx.lineTo(0, height * 0.5);
-    }
-
-    Canvas {
-        id: backgroundCanvas
-        anchors.fill: parent
-
-        onPaint: {
-            var ctx = getContext("2d");
-            ctx.reset();
-
-            paintOutlinePath(ctx);
-
-            ctx.lineWidth = 1;
-            ctx.strokeStyle = "black";
-            ctx.stroke();
-
-//            ctx.fillStyle = "#552222";
-//            ctx.fill();
-        }
-    }
-
-    Canvas {
-        id: foregroundCanvas
-        anchors.fill: parent
-        visible: on && flashing
-
-        onPaint: {
-            var ctx = getContext("2d");
-            ctx.reset();
-
-            paintOutlinePath(ctx);
-
-            ctx.fillStyle = "green";
-            ctx.fill();
-        }
-    }
-}
diff --git a/basicsuite/enterprise-dashboard/ValueSource.qml b/basicsuite/enterprise-dashboard/ValueSource.qml
deleted file mode 100644
index 6bd1952..0000000
--- a/basicsuite/enterprise-dashboard/ValueSource.qml
+++ /dev/null
@@ -1,300 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: valueSource
-    property real kph: 0
-    property real rpm: 1
-    property real fuel: 0.85
-    property string gear: {
-        var g;
-        if (kph == 0) {
-            return "P";
-        }
-        if (kph < 30) {
-            return "1";
-        }
-        if (kph < 50) {
-            return "2";
-        }
-        if (kph < 80) {
-            return "3";
-        }
-        if (kph < 120) {
-            return "4";
-        }
-        if (kph < 160) {
-            return "5";
-        }
-    }
-    property int turnSignal: gear == "P" && !start ? randomDirection() : -1
-    property real temperature: 0.6
-    property bool start: true
-
-    function randomDirection() {
-        return Math.random() > 0.5 ? Qt.LeftArrow : Qt.RightArrow;
-    }
-
-    SequentialAnimation {
-        running: true
-        loops: 1
-
-        // We want a small pause at the beginning, but we only want it to happen once.
-        PauseAnimation {
-            duration: 1000
-        }
-
-        PropertyAction {
-            target: valueSource
-            property: "start"
-            value: false
-        }
-
-        SequentialAnimation {
-            loops: Animation.Infinite
-
-            ParallelAnimation {
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    from: 0
-                    to: 30
-                    duration: 3000
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    from: 1
-                    to: 6.1
-                    duration: 3000
-                }
-            }
-            ParallelAnimation {
-                // We changed gears so we lost a bit of speed.
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    from: 30
-                    to: 26
-                    duration: 600
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    from: 6
-                    to: 2.4
-                    duration: 600
-                }
-            }
-            ParallelAnimation {
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    to: 60
-                    duration: 3000
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 5.6
-                    duration: 3000
-                }
-            }
-            ParallelAnimation {
-                // We changed gears so we lost a bit of speed.
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    to: 56
-                    duration: 600
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 2.3
-                    duration: 600
-                }
-            }
-            ParallelAnimation {
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    to: 100
-                    duration: 3000
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 5.1
-                    duration: 3000
-                }
-            }
-            ParallelAnimation {
-                // We changed gears so we lost a bit of speed.
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    to: 96
-                    duration: 600
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 2.2
-                    duration: 600
-                }
-            }
-
-            ParallelAnimation {
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    to: 140
-                    duration: 3000
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 6.2
-                    duration: 3000
-                }
-            }
-
-            // Start downshifting.
-
-            // Fifth to fourth gear.
-            ParallelAnimation {
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.Linear
-                    to: 100
-                    duration: 5000
-                }
-
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 3.1
-                    duration: 5000
-                }
-            }
-
-            // Fourth to third gear.
-            NumberAnimation {
-                target: valueSource
-                property: "rpm"
-                easing.type: Easing.InOutSine
-                to: 5.5
-                duration: 600
-            }
-
-            ParallelAnimation {
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    to: 60
-                    duration: 5000
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 2.6
-                    duration: 5000
-                }
-            }
-
-            // Third to second gear.
-            NumberAnimation {
-                target: valueSource
-                property: "rpm"
-                easing.type: Easing.InOutSine
-                to: 6.3
-                duration: 600
-            }
-
-            ParallelAnimation {
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    to: 30
-                    duration: 5000
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 2.6
-                    duration: 5000
-                }
-            }
-
-            NumberAnimation {
-                target: valueSource
-                property: "rpm"
-                easing.type: Easing.InOutSine
-                to: 6.5
-                duration: 600
-            }
-
-            // Second to first gear.
-            ParallelAnimation {
-                NumberAnimation {
-                    target: valueSource
-                    property: "kph"
-                    easing.type: Easing.InOutSine
-                    to: 0
-                    duration: 5000
-                }
-                NumberAnimation {
-                    target: valueSource
-                    property: "rpm"
-                    easing.type: Easing.InOutSine
-                    to: 1
-                    duration: 4500
-                }
-            }
-
-            PauseAnimation {
-                duration: 5000
-            }
-        }
-    }
-}
diff --git a/basicsuite/enterprise-dashboard/enterprise-dashboard.pro b/basicsuite/enterprise-dashboard/enterprise-dashboard.pro
index 9fb29f2..d61e3a6 100644
--- a/basicsuite/enterprise-dashboard/enterprise-dashboard.pro
+++ b/basicsuite/enterprise-dashboard/enterprise-dashboard.pro
@@ -5,9 +5,11 @@ b2qtdemo_deploy_defaults()
 
 content.files = \
     *.qml \
+    qml \
     images
 content.path = $$DESTPATH
 
 OTHER_FILES += $${content.files}
 
-INSTALLS += target content
\ No newline at end of file
+INSTALLS += target content
+
diff --git a/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf b/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf
deleted file mode 100644
index 19ed0b4..0000000
--- a/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf
+++ /dev/null
diff --git a/basicsuite/enterprise-dashboard/images/fuel-icon.png b/basicsuite/enterprise-dashboard/images/fuel-icon.png
deleted file mode 100644
index f521e90..0000000
--- a/basicsuite/enterprise-dashboard/images/fuel-icon.png
+++ /dev/null
diff --git a/basicsuite/enterprise-dashboard/images/temperature-icon.png b/basicsuite/enterprise-dashboard/images/temperature-icon.png
deleted file mode 100644
index 5a4334e..0000000
--- a/basicsuite/enterprise-dashboard/images/temperature-icon.png
+++ /dev/null
diff --git a/basicsuite/enterprise-dashboard/main.qml b/basicsuite/enterprise-dashboard/main.qml
index 7f8ee75..7b9fa28 100644
--- a/basicsuite/enterprise-dashboard/main.qml
+++ b/basicsuite/enterprise-dashboard/main.qml
@@ -1,155 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
 import QtQuick 2.0
-import QtQuick.Window 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-import QtQuick.Enterprise.Controls 1.1
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-Rectangle {
-    id: root
-    visible: true
-    width: 1024
-    height: 600
-
-    color: "#161616"
-    //title: "QtQuick Enterprise Controls Demo"
-
-    ValueSource {
-        id: valueSource
-    }
-
-    // Dashboards are typically in a landscape orientation, so we need to ensure
-    // our height is never greater than our width.
-    Item {
-        id: container
-        width: root.width
-        height: Math.min(root.width, root.height)
-        anchors.centerIn: parent
-
-        Row {
-            id: gaugeRow
-            spacing: container.width * 0.02
-            anchors.centerIn: parent
-
-            TurnIndicator {
-                id: leftIndicator
-                anchors.verticalCenter: parent.verticalCenter
-                width: height
-                height: container.height * 0.1 - gaugeRow.spacing
-
-                direction: Qt.LeftArrow
-                on: valueSource.turnSignal == Qt.LeftArrow
-            }
-
-            Item {
-                width: height
-                height: container.height * 0.25 - gaugeRow.spacing
-                anchors.verticalCenter: parent.verticalCenter
-
-                CircularGauge {
-                    id: fuelGauge
-                    value: valueSource.fuel
-                    maximumValue: 1
-                    y: parent.height / 2 - height / 2 - container.height * 0.01
-                    width: parent.width
-                    height: parent.height * 0.7
-
-                    style: IconGaugeStyle {
-                        id: fuelGaugeStyle
-
-                        icon: "images/fuel-icon.png"
-                        minWarningColor: Qt.rgba(0.5, 0, 0, 1)
-
-                        tickmarkLabel: Text {
-                            color: "white"
-                            visible: styleData.value === 0 || styleData.value === 1
-                            font.pixelSize: fuelGaugeStyle.toPixels(0.225)
-                            text: styleData.value === 0 ? "E" : (styleData.value === 1 ? "F" : "")
-                        }
-                    }
-                }
-
-                CircularGauge {
-                    value: valueSource.temperature
-                    maximumValue: 1
-                    width: parent.width
-                    height: parent.height * 0.7
-                    y: parent.height / 2 + container.height * 0.01
-
-                    style: IconGaugeStyle {
-                        id: tempGaugeStyle
-
-                        icon: "images/temperature-icon.png"
-                        maxWarningColor: Qt.rgba(0.5, 0, 0, 1)
-
-                        tickmarkLabel: Text {
-                            color: "white"
-                            visible: styleData.value === 0 || styleData.value === 1
-                            font.pixelSize: tempGaugeStyle.toPixels(0.225)
-                            text: styleData.value === 0 ? "C" : (styleData.value === 1 ? "H" : "")
-                        }
-                    }
-                }
-            }
-
-            CircularGauge {
-                id: speedometer
-                value: valueSource.kph
-                anchors.verticalCenter: parent.verticalCenter
-                maximumValue: 280
-                // We set the width to the height, because the height will always be
-                // the more limited factor. Also, all circular controls letterbox
-                // their contents to ensure that they remain circular. However, we
-                // don't want to extra space on the left and right of our gauges,
-                // because they're laid out horizontally, and that would create
-                // large horizontal gaps between gauges on wide screens.
-                width: height
-                height: container.height * 0.5
-
-                style: DashboardGaugeStyle {}
-            }
-
-            CircularGauge {
-                id: tachometer
-                width: height
-                height: container.height * 0.25 - gaugeRow.spacing
-                value: valueSource.rpm
-                maximumValue: 8
-                anchors.verticalCenter: parent.verticalCenter
-
-                style: TachometerStyle {}
-            }
-
-            TurnIndicator {
-                id: rightIndicator
-                anchors.verticalCenter: parent.verticalCenter
-                width: height
-                height: container.height * 0.1 - gaugeRow.spacing
-
-                direction: Qt.RightArrow
-                on: valueSource.turnSignal == Qt.RightArrow
-            }
 
-        }
-    }
+Loader {
+    source: "qml/dashboard.qml"
 }
diff --git a/basicsuite/enterprise-dashboard/preview_l.jpg b/basicsuite/enterprise-dashboard/preview_l.jpg
index eb2e3b5..c9785a0 100644
--- a/basicsuite/enterprise-dashboard/preview_l.jpg
+++ b/basicsuite/enterprise-dashboard/preview_l.jpg
diff --git a/basicsuite/enterprise-gallery/BlackButtonBackground.qml b/basicsuite/enterprise-gallery/BlackButtonBackground.qml
deleted file mode 100644
index 008668f..0000000
--- a/basicsuite/enterprise-gallery/BlackButtonBackground.qml
+++ /dev/null
@@ -1,51 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-Rectangle {
-    property bool pressed: false
-
-    gradient: Gradient {
-        GradientStop {
-            color: pressed ? "#222" : "#333"
-            position: 0
-        }
-        GradientStop {
-            color: "#222"
-            position: 1
-        }
-    }
-    Rectangle {
-        height: 1
-        width: parent.width
-        anchors.top: parent.top
-        color: "#444"
-        visible: !pressed
-    }
-    Rectangle {
-        height: 1
-        width: parent.width
-        anchors.bottom: parent.bottom
-        color: "#000"
-    }
-}
diff --git a/basicsuite/enterprise-gallery/BlackButtonStyle.qml b/basicsuite/enterprise-gallery/BlackButtonStyle.qml
deleted file mode 100644
index 73f6373..0000000
--- a/basicsuite/enterprise-gallery/BlackButtonStyle.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-ButtonStyle {
-    property color fontColor;
-
-    background: BlackButtonBackground {
-        pressed: control.pressed
-    }
-    label: Item {
-        Text {
-            text: control.text
-            color: fontColor
-            font.pixelSize: control.height * 0.25
-            font.family: openSans.name
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignVCenter
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-        }
-    }
-}
diff --git a/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml
deleted file mode 100644
index 0de1180..0000000
--- a/basicsuite/enterprise-gallery/CircularGaugeDarkStyle.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-CircularGaugeStyle {
-    id: root
-    tickmarkStepSize: 10
-    minorTickmarkCount: 1
-    labelStepSize: 20
-    tickmarkInset: outerRadius * 0.06
-    minorTickmarkInset: tickmarkInset
-    labelInset: outerRadius * 0.23
-
-    background: Image {
-        source: "images/background.png"
-    }
-
-    needle: Image {
-        id: needleImage
-        transformOrigin: Item.Bottom
-        source: "images/needle.png"
-        scale: {
-            var distanceFromLabelToRadius = labelInset / 2;
-            var idealHeight = outerRadius - distanceFromLabelToRadius;
-            var originalImageHeight = needleImage.sourceSize.height;
-            idealHeight / originalImageHeight;
-        }
-    }
-
-    foreground: Item {
-        Image {
-            anchors.centerIn: parent
-            source: "images/center.png"
-            scale: (outerRadius * 0.25) / sourceSize.height
-        }
-    }
-
-    tickmark: Rectangle {
-        width: outerRadius * 0.02
-        antialiasing: true
-        height: outerRadius * 0.05
-        color: "#888"
-    }
-
-    minorTickmark: Rectangle {
-        width: outerRadius * 0.01
-        antialiasing: true
-        height: outerRadius * 0.02
-        color: "#444"
-    }
-
-    tickmarkLabel: Text {
-        font.pixelSize: Math.max(6, outerRadius * 0.1)
-        text: styleData.value
-        color: "white"
-    }
-}
diff --git a/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml
deleted file mode 100644
index 23b25c4..0000000
--- a/basicsuite/enterprise-gallery/CircularGaugeDefaultStyle.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-CircularGaugeStyle {
-    labelStepSize: 20
-}
diff --git a/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml b/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml
deleted file mode 100644
index 87afa7d..0000000
--- a/basicsuite/enterprise-gallery/CircularGaugeLightStyle.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-CircularGaugeStyle {
-    id: root
-    tickmarkStepSize: 10
-    minorTickmarkCount: 2
-    labelStepSize: 40
-    tickmarkInset: outerRadius * 0.06
-    minorTickmarkInset: tickmarkInset
-    labelInset: outerRadius * 0.23
-
-    background: Image {
-        source: "images/background-light.png"
-    }
-
-    needle: Image {
-        id: needleImage
-        source: "images/needle-light.png"
-        transformOrigin: Item.Bottom
-        scale: {
-            var distanceFromLabelToRadius = labelInset / 2;
-            var idealHeight = outerRadius - distanceFromLabelToRadius;
-            var originalImageHeight = needleImage.sourceSize.height;
-            idealHeight / originalImageHeight;
-        }
-    }
-
-    foreground: Item {
-        Image {
-            anchors.centerIn: parent
-            source: "images/center-light.png"
-            scale: (outerRadius * 0.25) / sourceSize.height
-        }
-    }
-
-    tickmark: Rectangle {
-        width: outerRadius * 0.01
-        antialiasing: true
-        height: outerRadius * 0.04
-        color: "#999"
-    }
-
-    minorTickmark: Rectangle {
-        width: outerRadius * 0.01
-        antialiasing: true
-        height: outerRadius * 0.02
-        color: "#bbb"
-    }
-
-    tickmarkLabel: Text {
-        font.family: "Helvetica neue"
-        font.pixelSize: Math.max(6, outerRadius * 0.1)
-        text: styleData.value
-        color: "#333"
-    }
-}
diff --git a/basicsuite/enterprise-gallery/CircularGaugeView.qml b/basicsuite/enterprise-gallery/CircularGaugeView.qml
deleted file mode 100644
index a24b980..0000000
--- a/basicsuite/enterprise-gallery/CircularGaugeView.qml
+++ /dev/null
@@ -1,204 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 1.0
-import QtQuick.Enterprise.Controls 1.1
-
-ControlView {
-    id: controlView
-    darkBackground: customizerItem.currentStyleDark
-
-    property color fontColor: darkBackground ? "white" : "black"
-
-    property bool accelerating: false
-
-    Keys.onSpacePressed: accelerating = true
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Space) {
-            accelerating = false;
-            event.accepted = true;
-        }
-    }
-
-    Button {
-        id: accelerate
-        text: "Accelerate"
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        height: root.height * 0.125
-
-        onPressedChanged: accelerating = pressed
-
-        style: BlackButtonStyle {
-            background: BlackButtonBackground {
-                pressed: control.pressed
-            }
-            label: Text {
-                text: control.text
-                color: "white"
-                font.pixelSize: root.toPixels(0.04)
-                font.family: openSans.name
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-        }
-    }
-
-    control: CircularGauge {
-        id: gauge
-        minimumValue: customizerItem.minimumValue
-        maximumValue: customizerItem.maximumValue
-        width: controlBounds.width
-        height: controlBounds.height
-
-        value: accelerating ? maximumValue : 0
-        style: styleMap[customizerItem.currentStylePath]
-
-        // This stops the styles being recreated when a new one is chosen.
-        property var styleMap: {
-            var styles = {};
-            for (var i = 0; i < customizerItem.allStylePaths.length; ++i) {
-                var path = customizerItem.allStylePaths[i];
-                styles[path] = Qt.createComponent(path, gauge);
-            }
-            styles;
-        }
-
-        // Called to update the style after the user has edited a property.
-        Connections {
-            target: customizerItem
-            onMinimumValueAngleChanged: __style.minimumValueAngle = customizerItem.minimumValueAngle
-            onMaximumValueAngleChanged: __style.maximumValueAngle = customizerItem.maximumValueAngle
-            onLabelStepSizeChanged: __style.tickmarkStepSize = __style.labelStepSize = customizerItem.labelStepSize
-        }
-
-        Behavior on value {
-            NumberAnimation {
-                easing.type: Easing.OutCubic
-                duration: 6000
-            }
-        }
-    }
-
-    customizer: Column {
-        readonly property var allStylePaths: {
-            var paths = [];
-            for (var i = 0; i < stylePicker.model.count; ++i) {
-                paths.push(stylePicker.model.get(i).path);
-            }
-            paths;
-        }
-        property alias currentStylePath: stylePicker.currentStylePath
-        property alias currentStyleDark: stylePicker.currentStyleDark
-        property alias minimumValue: minimumValueSlider.value
-        property alias maximumValue: maximumValueSlider.value
-        property alias minimumValueAngle: minimumAngleSlider.value
-        property alias maximumValueAngle: maximumAngleSlider.value
-        property alias labelStepSize: labelStepSizeSlider.value
-
-        id: circularGaugeColumn
-        spacing: customizerPropertySpacing
-
-        readonly property bool isDefaultStyle: stylePicker.model.get(stylePicker.currentIndex).name === "Default"
-
-        StylePicker {
-            id: stylePicker
-            currentIndex: 1
-
-            model: ListModel {
-                ListElement {
-                    name: "Default"
-                    path: "CircularGaugeDefaultStyle.qml"
-                    dark: true
-                }
-                ListElement {
-                    name: "Dark"
-                    path: "CircularGaugeDarkStyle.qml"
-                    dark: true
-                }
-                ListElement {
-                    name: "Light"
-                    path: "CircularGaugeLightStyle.qml"
-                    dark: false
-                }
-            }
-        }
-
-        CustomizerLabel {
-            text: "Minimum angle"
-        }
-
-        CustomizerSlider {
-            id: minimumAngleSlider
-            minimumValue: 0
-            value: 215
-            maximumValue: 360
-            width: parent.width
-        }
-
-        CustomizerLabel {
-            text: "Maximum angle"
-        }
-
-        CustomizerSlider {
-            id: maximumAngleSlider
-            minimumValue: 0
-            value: 145
-            maximumValue: 360
-        }
-
-        CustomizerLabel {
-            text: "Minimum value"
-        }
-
-        CustomizerSlider {
-            id: minimumValueSlider
-            minimumValue: 0
-            value: 0
-            maximumValue: 360
-            stepSize: 1
-        }
-
-        CustomizerLabel {
-            text: "Maximum value"
-        }
-
-        CustomizerSlider {
-            id: maximumValueSlider
-            minimumValue: 0
-            value: 240
-            maximumValue: 300
-            stepSize: 1
-        }
-
-        CustomizerLabel {
-            text: "Label step size"
-        }
-
-        CustomizerSlider {
-            id: labelStepSizeSlider
-            minimumValue: 10
-            value: 20
-            maximumValue: 100
-            stepSize: 20
-        }
-    }
-}
diff --git a/basicsuite/enterprise-gallery/ControlLabel.qml b/basicsuite/enterprise-gallery/ControlLabel.qml
deleted file mode 100644
index 0335342..0000000
--- a/basicsuite/enterprise-gallery/ControlLabel.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Text {
-    font.pixelSize: Math.min(32, root.toPixels(0.045))
-    color: "#4e4e4e"
-    styleColor: "#ffffff"
-    style: Text.Raised
-}
diff --git a/basicsuite/enterprise-gallery/ControlView.qml b/basicsuite/enterprise-gallery/ControlView.qml
deleted file mode 100644
index 2c6a7cf..0000000
--- a/basicsuite/enterprise-gallery/ControlView.qml
+++ /dev/null
@@ -1,168 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 1.0
-
-Rectangle {
-    id: view
-    color: darkBackground ? "transparent" : lightBackgroundColor
-
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Back) {
-            stackView.pop();
-            event.accepted = true;
-        }
-    }
-
-    property bool darkBackground: true
-
-    property Component control
-    property Component customizer
-
-    property alias controlItem: controlLoader.item
-    property alias customizerItem: customizerLoader.item
-
-    property bool isCustomizerVisible: false
-
-    property real margin: root.toPixels(0.05)
-
-    property rect controlBounds: Qt.rect(largestControlItem.x + controlBoundsItem.x,
-        largestControlItem.y + controlBoundsItem.y, controlBoundsItem.width, controlBoundsItem.height)
-
-    Item {
-        id: largestControlItem
-        x: margin
-        y: margin
-        width: isCustomizerVisible ? widthWhenCustomizing : widthWhenNotCustomizing
-        height: isCustomizerVisible ? heightWhenCustomizing : heightWhenNotCustomizing
-
-        readonly property real widthWhenCustomizing: (!isScreenPortrait ? parent.width / 2 : parent.width) - margin * 2
-        readonly property real heightWhenCustomizing: (isScreenPortrait ? parent.height / 2 : parent.height - toolbar.height) - margin * 2
-        readonly property real widthWhenNotCustomizing: parent.width - margin * 2
-        readonly property real heightWhenNotCustomizing: parent.height - toolbar.height - margin * 2
-
-        Item {
-            id: controlBoundsItem
-            x: parent.width / 2 - controlBoundsItem.width / 2
-            y: customizer && customizerItem.visible ? 0 : (isScreenPortrait ? (parent.height / 2) - (controlBoundsItem.height / 2) : 0)
-            width: Math.min(parent.widthWhenCustomizing, parent.widthWhenNotCustomizing)
-            height: Math.min(parent.heightWhenCustomizing, parent.heightWhenNotCustomizing)
-
-            Behavior on x {
-                id: controlXBehavior
-                enabled: false
-                NumberAnimation {}
-            }
-
-            Behavior on y {
-                id: controlYBehavior
-                enabled: false
-                NumberAnimation {}
-            }
-
-            Loader {
-                id: controlLoader
-                sourceComponent: control
-                anchors.centerIn: parent
-
-                property alias view: view
-            }
-        }
-    }
-
-    Flickable {
-        id: flickable
-        // Hide the customizer on the right of the screen if it's not visible.
-        x: (isScreenPortrait ? 0 : (isCustomizerVisible ? largestControlItem.x + largestControlItem.width + margin : view.width)) + margin
-        y: (isScreenPortrait ? largestControlItem.y + largestControlItem.height : 0) + margin
-        width: largestControlItem.width
-        height: parent.height - y - toolbar.height - margin
-        anchors.leftMargin: margin
-        anchors.rightMargin: margin
-        visible: customizerLoader.opacity > 0
-
-        flickableDirection: Flickable.VerticalFlick
-
-        clip: true
-        contentWidth: width
-        contentHeight: customizerLoader.height
-
-        Behavior on x {
-            id: flickableXBehavior
-            enabled: false
-            NumberAnimation {}
-        }
-
-        Behavior on y {
-            id: flickableYBehavior
-            enabled: false
-            NumberAnimation {}
-        }
-
-        Loader {
-            id: customizerLoader
-            sourceComponent: customizer
-            opacity: 0
-            width: flickable.width
-
-            property alias view: view
-
-            Behavior on opacity {
-                NumberAnimation {
-                    duration: 300
-                }
-            }
-        }
-    }
-
-    ControlViewToolbar {
-        id: toolbar
-
-        onCustomizeClicked: {
-            controlXBehavior.enabled = !isScreenPortrait;
-            controlYBehavior.enabled = isScreenPortrait;
-
-            isCustomizerVisible = !isCustomizerVisible;
-
-            if (isScreenPortrait) {
-                flickableXBehavior.enabled = false;
-                flickableYBehavior.enabled = true;
-            } else {
-                flickableXBehavior.enabled = true;
-                flickableYBehavior.enabled = false;
-            }
-
-            customizerLoader.opacity = isCustomizerVisible ? 1 : 0;
-        }
-    }
-
-    FlickableMoreIndicator {
-        flickable: flickable
-        atTop: true
-        gradientColor: view.darkBackground ? darkBackgroundColor : lightBackgroundColor
-    }
-
-    FlickableMoreIndicator {
-        flickable: flickable
-        atTop: false
-        gradientColor: view.darkBackground ? darkBackgroundColor : lightBackgroundColor
-    }
-}
diff --git a/basicsuite/enterprise-gallery/ControlViewToolbar.qml b/basicsuite/enterprise-gallery/ControlViewToolbar.qml
deleted file mode 100644
index f3dd07b..0000000
--- a/basicsuite/enterprise-gallery/ControlViewToolbar.qml
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 1.0
-
-BlackButtonBackground {
-    anchors.bottom: parent.bottom
-    anchors.left: parent.left
-    anchors.right: parent.right
-    height: root.height * 0.125
-
-    signal customizeClicked
-
-    gradient: Gradient {
-        GradientStop {
-            color: "#333"
-            position: 0
-        }
-        GradientStop {
-            color: "#222"
-            position: 1
-        }
-    }
-
-    Button {
-        id: back
-        width: parent.height
-        height: parent.height
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-
-        onClicked: stackView.pop()
-
-        style: BlackButtonStyle {
-        }
-
-        Image {
-            source: "images/icon-go.png"
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.horizontalCenter: parent.horizontalCenter
-            scale: -1
-        }
-    }
-
-    Button {
-        id: customize
-        width: parent.height
-        height: parent.height
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        visible: customizer
-
-        style: BlackButtonStyle {
-        }
-
-        onClicked: customizeClicked()
-
-        Image {
-            source: "images/icon-settings.png"
-            anchors.centerIn: parent
-        }
-    }
-}
diff --git a/basicsuite/enterprise-gallery/CustomizerLabel.qml b/basicsuite/enterprise-gallery/CustomizerLabel.qml
deleted file mode 100644
index c85807c..0000000
--- a/basicsuite/enterprise-gallery/CustomizerLabel.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Text {
-    color: darkBackground ? root.darkFontColor : root.lightFontColor
-    font.pixelSize: root.toPixels(0.04)
-    font.family: openSans.name
-    anchors.horizontalCenter: parent.horizontalCenter
-}
diff --git a/basicsuite/enterprise-gallery/CustomizerSlider.qml b/basicsuite/enterprise-gallery/CustomizerSlider.qml
deleted file mode 100644
index fb09a17..0000000
--- a/basicsuite/enterprise-gallery/CustomizerSlider.qml
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-Slider {
-    id: slider
-    width: parent.width
-    height: root.toPixels(0.1)
-
-    style: SliderStyle {
-        handle: Rectangle {
-            height: root.toPixels(0.06)
-            width: height
-            radius: width/2
-            color: "#fff"
-        }
-
-        groove: Rectangle {
-            implicitHeight: root.toPixels(0.015)
-            implicitWidth: 100
-            radius: height/2
-            border.color: "#333"
-            color: "#222"
-            Rectangle {
-                height: parent.height
-                width: styleData.handlePosition
-                implicitHeight: 6
-                implicitWidth: 100
-                radius: height/2
-                color: "#555"
-            }
-        }
-
-    }
-}
diff --git a/basicsuite/enterprise-gallery/CustomizerSwitch.qml b/basicsuite/enterprise-gallery/CustomizerSwitch.qml
deleted file mode 100644
index 3048aae..0000000
--- a/basicsuite/enterprise-gallery/CustomizerSwitch.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 1.1
-
-Switch {
-    anchors.horizontalCenter: parent.horizontalCenter
-}
diff --git a/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml b/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml
deleted file mode 100644
index c8b9fe5..0000000
--- a/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    anchors.top: atTop ? flickable.top : undefined
-    anchors.bottom: atTop ? undefined : flickable.bottom
-    anchors.left: isScreenPortrait ? parent.left : parent.horizontalCenter
-    anchors.right: parent.right
-    height: 30
-    visible: flickable.visible
-    opacity: atTop
-        ? (flickable.contentY > showDistance ? 1 : 0)
-        : (flickable.contentY < flickable.contentHeight - showDistance ? 1 : 0)
-    scale: atTop ? 1 : -1
-
-    readonly property real showDistance: 0
-    property Flickable flickable
-    property color gradientColor
-    /*! \c true if this indicator is at the top of the item */
-    property bool atTop
-
-    Behavior on opacity {
-        NumberAnimation {
-        }
-    }
-
-    gradient: Gradient {
-        GradientStop {
-            position: 0.0
-            color: gradientColor
-        }
-        GradientStop {
-            position: 1.0
-            color: "transparent"
-        }
-    }
-}
diff --git a/basicsuite/enterprise-gallery/PieMenuControlView.qml b/basicsuite/enterprise-gallery/PieMenuControlView.qml
deleted file mode 100644
index 2c06176..0000000
--- a/basicsuite/enterprise-gallery/PieMenuControlView.qml
+++ /dev/null
@@ -1,168 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-import QtQuick.Controls 1.0
-import QtQuick.Enterprise.Controls 1.1
-
-Rectangle {
-    id: view
-    color: customizerItem.currentStyleDark ? "#111" : "#555"
-
-    Behavior on color {
-        ColorAnimation {}
-    }
-
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Back) {
-            stackView.pop();
-            event.accepted = true;
-        }
-    }
-
-    property bool darkBackground: true
-
-    property Component mouseArea
-
-    property Component customizer: Column {
-        property alias currentStylePath: stylePicker.currentStylePath
-        property alias currentStyleDark: stylePicker.currentStyleDark
-
-        StylePicker {
-            id: stylePicker
-            currentIndex: 0
-
-            model: ListModel {
-                ListElement {
-                    name: "Default"
-                    path: "PieMenuDefaultStyle.qml"
-                    dark: false
-                }
-                ListElement {
-                    name: "Dark"
-                    path: "PieMenuDarkStyle.qml"
-                    dark: true
-                }
-            }
-        }
-    }
-
-    property alias controlItem: pieMenu
-    property alias customizerItem: customizerLoader.item
-
-    Item {
-        id: controlBoundsItem
-        width: parent.width
-        height: parent.height - toolbar.height
-        visible: customizerLoader.opacity === 0
-
-        Image {
-            id: bgImage
-            anchors.centerIn: parent
-            height: 48
-            Text {
-                id: bgLabel
-                anchors.top: parent.bottom
-                anchors.topMargin: 20
-                anchors.horizontalCenter: parent.horizontalCenter
-                text: "Tap to open"
-                color: "#999"
-                font.pointSize: 20
-            }
-        }
-
-        MouseArea {
-            id: touchArea
-            anchors.fill: parent
-
-            onClicked: {
-                pieMenu.popup(touchArea.mouseX, touchArea.mouseY);
-            }
-        }
-
-        PieMenu {
-            id: pieMenu
-            activationMode: ActivationMode.ActivateOnClick
-            width: Math.min(controlBoundsItem.width, controlBoundsItem.height) * 0.5
-            height: width
-
-            style: Qt.createComponent(customizerItem.currentStylePath)
-
-            MenuItem {
-                text: "Zoom In"
-                onTriggered: {
-                    bgImage.source = iconSource
-                    bgLabel.text = text + " selected"
-                }
-                iconSource: "images/zoom_in.png"
-            }
-            MenuItem {
-                text: "Zoom Out"
-                onTriggered: {
-                    bgImage.source = iconSource
-                    bgLabel.text = text + " selected"
-                }
-                iconSource: "images/zoom_out.png"
-            }
-            MenuItem {
-                text: "Info"
-                onTriggered: {
-                    bgImage.source = iconSource
-                    bgLabel.text = text + " selected"
-                }
-                iconSource: "images/info.png"
-            }
-        }
-    }
-    Loader {
-        id: customizerLoader
-        sourceComponent: customizer
-        opacity: 0
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.leftMargin: 30
-        anchors.rightMargin: 30
-        y: parent.height / 2 - height / 2 - toolbar.height
-        visible: customizerLoader.opacity > 0
-
-        property alias view: view
-
-        Behavior on y {
-            NumberAnimation {
-                duration: 300
-            }
-        }
-
-        Behavior on opacity {
-            NumberAnimation {
-                duration: 300
-            }
-        }
-    }
-
-    ControlViewToolbar {
-        id: toolbar
-
-        onCustomizeClicked: {
-            customizerLoader.opacity = customizerLoader.opacity == 0 ? 1 : 0;
-        }
-    }
-}
diff --git a/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml b/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml
deleted file mode 100644
index ab03701..0000000
--- a/basicsuite/enterprise-gallery/PieMenuDarkStyle.qml
+++ /dev/null
@@ -1,26 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-PieMenuStyle {
-    backgroundColor: "#222"
-    shadowColor: Qt.rgba(1, 1, 1, 0.26)
-}
diff --git a/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml b/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml
deleted file mode 100644
index 4b0edb1..0000000
--- a/basicsuite/enterprise-gallery/PieMenuDefaultStyle.qml
+++ /dev/null
@@ -1,24 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-PieMenuStyle {
-}
diff --git a/basicsuite/enterprise-gallery/StylePicker.qml b/basicsuite/enterprise-gallery/StylePicker.qml
deleted file mode 100644
index f4e097e..0000000
--- a/basicsuite/enterprise-gallery/StylePicker.qml
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-import QtQuick.Enterprise.Controls 1.1
-import QtQuick.Enterprise.Controls.Styles 1.1
-
-ListView {
-    id: stylePicker
-    width: parent.width
-    height: root.height * 0.06
-    interactive: false
-    spacing: -1
-
-    orientation: ListView.Horizontal
-
-    readonly property string currentStylePath: stylePicker.model.get(stylePicker.currentIndex).path
-    readonly property bool currentStyleDark: stylePicker.model.get(stylePicker.currentIndex).dark !== undefined
-        ? stylePicker.model.get(stylePicker.currentIndex).dark
-        : true
-
-    ExclusiveGroup {
-        id: styleExclusiveGroup
-    }
-
-    delegate: Button {
-        width: stylePicker.width / stylePicker.model.count
-        height: stylePicker.height
-        checkable: true
-        checked: index == ListView.view.currentIndex
-        exclusiveGroup: styleExclusiveGroup
-
-        onCheckedChanged: {
-            if (checked) {
-                ListView.view.currentIndex = index;
-            }
-        }
-
-        style: ButtonStyle {
-            background: Rectangle {
-                readonly property color checkedColor: currentStyleDark ? "#444" : "#777"
-                readonly property color uncheckedColor: currentStyleDark ? "#222" : "#bbb"
-                color: checked ? checkedColor : uncheckedColor
-                border.color: checkedColor
-                border.width: 1
-                radius: 1
-            }
-
-            label: Text {
-                text: name
-                color: currentStyleDark ? "white" : (checked ? "white" : "black")
-                font.pixelSize: root.toPixels(0.04)
-                font.family: openSans.name
-                anchors.centerIn: parent
-                horizontalAlignment: Text.AlignHCenter
-                verticalAlignment: Text.AlignVCenter
-            }
-        }
-    }
-}
diff --git a/basicsuite/enterprise-gallery/enterprise-gallery.pro b/basicsuite/enterprise-gallery/enterprise-gallery.pro
index 3601432..accbc9d 100644
--- a/basicsuite/enterprise-gallery/enterprise-gallery.pro
+++ b/basicsuite/enterprise-gallery/enterprise-gallery.pro
@@ -5,10 +5,11 @@ b2qtdemo_deploy_defaults()
 
 content.files = \
     *.qml \
+    qml \
     fonts \
     images
 content.path = $$DESTPATH
 
 OTHER_FILES += $${content.files}
 
-INSTALLS += target content
\ No newline at end of file
+INSTALLS += target content
diff --git a/basicsuite/enterprise-gallery/fonts/LICENSE.txt b/basicsuite/enterprise-gallery/fonts/LICENSE.txt
deleted file mode 100644
index d645695..0000000
--- a/basicsuite/enterprise-gallery/fonts/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/basicsuite/enterprise-gallery/fonts/OpenSans-Regular.ttf b/basicsuite/enterprise-gallery/fonts/OpenSans-Regular.ttf
deleted file mode 100644
index db43334..0000000
--- a/basicsuite/enterprise-gallery/fonts/OpenSans-Regular.ttf
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/background-light.png b/basicsuite/enterprise-gallery/images/background-light.png
deleted file mode 100644
index 2f76984..0000000
--- a/basicsuite/enterprise-gallery/images/background-light.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/background.png b/basicsuite/enterprise-gallery/images/background.png
deleted file mode 100644
index a3f4302..0000000
--- a/basicsuite/enterprise-gallery/images/background.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/center-light.png b/basicsuite/enterprise-gallery/images/center-light.png
deleted file mode 100644
index 75add20..0000000
--- a/basicsuite/enterprise-gallery/images/center-light.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/center.png b/basicsuite/enterprise-gallery/images/center.png
deleted file mode 100644
index b18a5fa..0000000
--- a/basicsuite/enterprise-gallery/images/center.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/icon-go.png b/basicsuite/enterprise-gallery/images/icon-go.png
deleted file mode 100644
index ed86c2d..0000000
--- a/basicsuite/enterprise-gallery/images/icon-go.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/icon-settings.png b/basicsuite/enterprise-gallery/images/icon-settings.png
deleted file mode 100644
index 6f37083..0000000
--- a/basicsuite/enterprise-gallery/images/icon-settings.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/info.png b/basicsuite/enterprise-gallery/images/info.png
deleted file mode 100644
index 5c7a9df..0000000
--- a/basicsuite/enterprise-gallery/images/info.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/needle-light.png b/basicsuite/enterprise-gallery/images/needle-light.png
deleted file mode 100644
index d486d9e..0000000
--- a/basicsuite/enterprise-gallery/images/needle-light.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/needle.png b/basicsuite/enterprise-gallery/images/needle.png
deleted file mode 100644
index 6b10c60..0000000
--- a/basicsuite/enterprise-gallery/images/needle.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/qt-logo.png b/basicsuite/enterprise-gallery/images/qt-logo.png
deleted file mode 100644
index 14ddf2a..0000000
--- a/basicsuite/enterprise-gallery/images/qt-logo.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/zoom_in.png b/basicsuite/enterprise-gallery/images/zoom_in.png
deleted file mode 100644
index 4128210..0000000
--- a/basicsuite/enterprise-gallery/images/zoom_in.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/images/zoom_out.png b/basicsuite/enterprise-gallery/images/zoom_out.png
deleted file mode 100644
index 772d6ac..0000000
--- a/basicsuite/enterprise-gallery/images/zoom_out.png
+++ /dev/null
diff --git a/basicsuite/enterprise-gallery/main.qml b/basicsuite/enterprise-gallery/main.qml
index de60f47..df2ec8a 100644
--- a/basicsuite/enterprise-gallery/main.qml
+++ b/basicsuite/enterprise-gallery/main.qml
@@ -1,356 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the QtQuick Enterprise Controls Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
 import QtQuick 2.0
-import QtGraphicalEffects 1.0
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-import QtQuick.Controls.Private 1.0
-import QtQuick.Dialogs 1.0
-import QtQuick.Enterprise.Controls 1.1
-import QtQuick.Enterprise.Controls.Styles 1.1
-import QtQuick.Layouts 1.0
-import QtQuick.Window 2.1
-
-Rectangle {
-    id: root
-    objectName: "window"
-    visible: true
-    width: 480
-    height: 800
-
-    color: "#161616"
-    //title: "QtQuick Enterprise Controls Demo"
-
-    function toPixels(percentage) {
-        return percentage * Math.min(root.width, root.height);
-    }
-
-    property bool isScreenPortrait: height > width
-    property color lightFontColor: "#222"
-    property color darkFontColor: "#e7e7e7"
-    readonly property color lightBackgroundColor: "#cccccc"
-    readonly property color darkBackgroundColor: "#161616"
-    property real customizerPropertySpacing: 10
-    property real colorPickerRowSpacing: 8
-
-    property Component circularGauge: CircularGaugeView {}
-
-    property Component dial: ControlView {
-        darkBackground: false
-
-        control: Column {
-            id: dialColumn
-            width: controlBounds.width
-            height: controlBounds.height - spacing
-            spacing: root.toPixels(0.05)
-
-            Column {
-                id: volumeColumn
-                width: parent.width
-                height: (dialColumn.height - dialColumn.spacing) / 2
-                spacing: height * 0.025
-
-                Dial {
-                    id: volumeDial
-                    width: parent.width
-                    height: volumeColumn.height - volumeText.height - volumeColumn.spacing
-
-                    /*!
-                        Determines whether the dial animates its rotation to the new value when
-                        a single click or touch is received on the dial.
-                    */
-                    property bool animate: customizerItem.animate
-
-                    Behavior on value {
-                        enabled: volumeDial.animate && !volumeDial.pressed
-                        NumberAnimation {
-                            duration: 300
-                            easing.type: Easing.OutSine
-                        }
-                    }
-                }
-
-                ControlLabel {
-                    id: volumeText
-                    text: "Volume"
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-            }
-
-            Column {
-                id: trebleColumn
-                width: parent.width
-                height: (dialColumn.height - dialColumn.spacing) / 2
-                spacing: height * 0.025
-
-                Dial {
-                    id: dial2
-                    width: parent.width
-                    height: trebleColumn.height - trebleText.height - trebleColumn.spacing
-
-                    stepSize: 1
-                    maximumValue: 10
-
-                    style: DialStyle {
-                        labelInset: outerRadius * 0
-                    }
-                }
-
-                ControlLabel {
-                    id: trebleText
-                    text: "Treble"
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-            }
-        }
-
-        customizer: Column {
-            spacing: customizerPropertySpacing
-
-            property alias animate: animateCheckBox.checked
-
-            CustomizerLabel {
-                text: "Animate"
-            }
-
-            CustomizerSwitch {
-                id: animateCheckBox
-            }
-        }
-    }
-
-    property Component delayButton: ControlView {
-        darkBackground: false
-
-        control: DelayButton {
-            text: "Alarm"
-            anchors.centerIn: parent
-            width: toPixels(0.3)
-            height: width
-        }
-    }
-
-    property Component gauge: ControlView {
-        id: gaugeView
-        control: Gauge {
-            id: gauge
-            width: orientation === Qt.Vertical ? gaugeView.controlBounds.height * 0.3 : gaugeView.controlBounds.width
-            height: orientation === Qt.Vertical ? gaugeView.controlBounds.height : gaugeView.controlBounds.height * 0.3
-            anchors.centerIn: parent
-
-            minimumValue: 0
-            value: customizerItem.value
-            maximumValue: 100
-            orientation: customizerItem.orientationFlag ? Qt.Vertical : Qt.Horizontal
-            tickmarkAlignment: orientation === Qt.Vertical
-                ? (customizerItem.alignFlag ? Qt.AlignLeft : Qt.AlignRight)
-                : (customizerItem.alignFlag ? Qt.AlignTop : Qt.AlignBottom)
-        }
-
-        customizer: Column {
-            spacing: customizerPropertySpacing
-
-            property alias value: valueSlider.value
-            property alias orientationFlag: orientationCheckBox.checked
-            property alias alignFlag: alignCheckBox.checked
-
-            CustomizerLabel {
-                text: "Value"
-            }
-
-            CustomizerSlider {
-                id: valueSlider
-                minimumValue: 0
-                value: 50
-                maximumValue: 100
-            }
-
-            CustomizerLabel {
-                text: "Vertical orientation"
-            }
-
-            CustomizerSwitch {
-                id: orientationCheckBox
-                checked: true
-            }
-
-            CustomizerLabel {
-                text: controlItem.orientation === Qt.Vertical ? "Left align" : "Top align"
-            }
-
-            CustomizerSwitch {
-                id: alignCheckBox
-                checked: true
-            }
-        }
-    }
-
-    property Component toggleButton: ControlView {
-        darkBackground: false
-
-        control: ToggleButton {
-            text: checked ? "On" : "Off"
-            width: toPixels(0.3)
-            height: width
-            anchors.centerIn: parent
-        }
-    }
-
-    property Component pieMenu: PieMenuControlView {}
-
-    property Component statusIndicator: ControlView {
-        id: statusIndicatorView
-        darkBackground: false
-
-        Timer {
-            id: recordingFlashTimer
-            running: true
-            repeat: true
-            interval: 1000
-        }
-
-        ColumnLayout {
-            id: indicatorLayout
-            width: statusIndicatorView.controlBounds.width * 0.25
-            height: statusIndicatorView.controlBounds.height * 0.75
-            anchors.centerIn: parent
-
-            Repeater {
-                model: ListModel {
-                    id: indicatorModel
-                    ListElement {
-                        name: "Power"
-                        indicatorColor: "green"
-                    }
-                    ListElement {
-                        name: "Recording"
-                        indicatorColor: "red"
-                    }
-                }
-
-                ColumnLayout {
-                    Layout.preferredWidth: indicatorLayout.width
-//                    Layout.preferredHeight: indicatorLayout.height * 0.25
-                    spacing: 0
-
-                    StatusIndicator {
-                        id: indicator
-                        color: indicatorColor
-                        Layout.preferredWidth: statusIndicatorView.controlBounds.width * 0.07
-                        Layout.preferredHeight: Layout.preferredWidth
-                        Layout.alignment: Qt.AlignHCenter
-                        on: true
-
-                        Connections {
-                            target: recordingFlashTimer
-                            onTriggered: if (name == "Recording") indicator.on = !indicator.on
-                        }
-                    }
-                    ControlLabel {
-                        id: indicatorLabel
-                        text: name
-//                        elide: Text.ElideRight
-                        Layout.alignment: Qt.AlignHCenter
-                        Layout.maximumWidth: parent.width
-                        horizontalAlignment: Text.AlignHCenter
-                    }
-                }
-            }
-        }
-    }
-
-    FontLoader {
-        id: openSans
-        Component.onCompleted: {
-            // QTBUG-35909
-            if (Qt.platform.os === "ios")
-                name = "Open Sans"
-            else
-                source = "fonts/OpenSans-Regular.ttf"
-        }
-     }
-
-    property var componentMap: {
-        "CircularGauge": circularGauge,
-        "DelayButton": delayButton,
-        "Dial": dial,
-        "Gauge": gauge,
-        "PieMenu": pieMenu,
-        "StatusIndicator": statusIndicator,
-        "ToggleButton": toggleButton
-    }
-
-    StackView {
-        id: stackView
-        anchors.fill: parent
-
-        initialItem: ListView {
-            model: ListModel {
-                ListElement {
-                    title: "CircularGauge"
-                }
-                ListElement {
-                    title: "DelayButton"
-                }
-                ListElement {
-                    title: "Dial"
-                }
-                ListElement {
-                    title: "Gauge"
-                }
-//                ListElement {
-//                    title: "PieMenu"
-//                }
-                ListElement {
-                    title: "StatusIndicator"
-                }
-                ListElement {
-                    title: "ToggleButton"
-                }
-            }
-
-            delegate: Button {
-                width: stackView.width
-                height: root.height * 0.125
-                text: title
-
-                Image {
-                    source: "images/icon-go.png"
-                    anchors.verticalCenter: parent.verticalCenter
-                    anchors.right: parent.right
-                    anchors.rightMargin: 30
-                }
-
-                style: BlackButtonStyle {
-                    fontColor: root.darkFontColor
-                }
 
-                onClicked: {
-                    if (stackView.depth == 1) {
-                        // Only push the control view if we haven't already pushed it...
-                        stackView.push({item: componentMap[title]});
-                        stackView.currentItem.forceActiveFocus();
-                    }
-                }
-            }
-        }
-    }
+Loader {
+    source: "qml/gallery.qml"
 }
diff --git a/basicsuite/enterprise-gallery/preview_l.jpg b/basicsuite/enterprise-gallery/preview_l.jpg
index 644bac5..d208b31 100644
--- a/basicsuite/enterprise-gallery/preview_l.jpg
+++ b/basicsuite/enterprise-gallery/preview_l.jpg
diff --git a/basicsuite/enterprise-qtdatavis3d/main.qml b/basicsuite/enterprise-qtdatavis3d/main.qml
index 417ade0..49ec4de 100644
--- a/basicsuite/enterprise-qtdatavis3d/main.qml
+++ b/basicsuite/enterprise-qtdatavis3d/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of the QtDataVisualization module.
 **
@@ -12,7 +12,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 **
 ****************************************************************************/
 
diff --git a/basicsuite/enterprise-qtdatavis3d/preview_l.jpg b/basicsuite/enterprise-qtdatavis3d/preview_l.jpg
index ee3d50d..9220269 100644
--- a/basicsuite/enterprise-qtdatavis3d/preview_l.jpg
+++ b/basicsuite/enterprise-qtdatavis3d/preview_l.jpg
diff --git a/basicsuite/graphicaleffects/Checkers.qml b/basicsuite/graphicaleffects/Checkers.qml
index 4dc37b1..404baef 100644
--- a/basicsuite/graphicaleffects/Checkers.qml
+++ b/basicsuite/graphicaleffects/Checkers.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_BrightnessContrast.qml b/basicsuite/graphicaleffects/effect_BrightnessContrast.qml
index c4d425b..ea391c7 100644
--- a/basicsuite/graphicaleffects/effect_BrightnessContrast.qml
+++ b/basicsuite/graphicaleffects/effect_BrightnessContrast.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_Colorize.qml b/basicsuite/graphicaleffects/effect_Colorize.qml
index a6007b2..65675ca 100644
--- a/basicsuite/graphicaleffects/effect_Colorize.qml
+++ b/basicsuite/graphicaleffects/effect_Colorize.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_CustomDissolve.qml b/basicsuite/graphicaleffects/effect_CustomDissolve.qml
index a7c4522..53bd082 100644
--- a/basicsuite/graphicaleffects/effect_CustomDissolve.qml
+++ b/basicsuite/graphicaleffects/effect_CustomDissolve.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_CustomWave.qml b/basicsuite/graphicaleffects/effect_CustomWave.qml
index eff9a45..79caaae 100644
--- a/basicsuite/graphicaleffects/effect_CustomWave.qml
+++ b/basicsuite/graphicaleffects/effect_CustomWave.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_Displacement.qml b/basicsuite/graphicaleffects/effect_Displacement.qml
index 2ca3b6a..0b20906 100644
--- a/basicsuite/graphicaleffects/effect_Displacement.qml
+++ b/basicsuite/graphicaleffects/effect_Displacement.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_DropShadow.qml b/basicsuite/graphicaleffects/effect_DropShadow.qml
index 342e531..fd3dbfc 100644
--- a/basicsuite/graphicaleffects/effect_DropShadow.qml
+++ b/basicsuite/graphicaleffects/effect_DropShadow.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_GaussianBlur.qml b/basicsuite/graphicaleffects/effect_GaussianBlur.qml
index 33e5317..8a3550c 100644
--- a/basicsuite/graphicaleffects/effect_GaussianBlur.qml
+++ b/basicsuite/graphicaleffects/effect_GaussianBlur.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_Glow.qml b/basicsuite/graphicaleffects/effect_Glow.qml
index 96d1a4b..82f64d8 100644
--- a/basicsuite/graphicaleffects/effect_Glow.qml
+++ b/basicsuite/graphicaleffects/effect_Glow.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_HueSaturation.qml b/basicsuite/graphicaleffects/effect_HueSaturation.qml
index e799ae8..58ed717 100644
--- a/basicsuite/graphicaleffects/effect_HueSaturation.qml
+++ b/basicsuite/graphicaleffects/effect_HueSaturation.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_OpacityMask.qml b/basicsuite/graphicaleffects/effect_OpacityMask.qml
index fcf4df8..6ec3cb7 100644
--- a/basicsuite/graphicaleffects/effect_OpacityMask.qml
+++ b/basicsuite/graphicaleffects/effect_OpacityMask.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/effect_ThresholdMask.qml b/basicsuite/graphicaleffects/effect_ThresholdMask.qml
index b2b87b3..2cd2d48 100644
--- a/basicsuite/graphicaleffects/effect_ThresholdMask.qml
+++ b/basicsuite/graphicaleffects/effect_ThresholdMask.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/main.qml b/basicsuite/graphicaleffects/main.qml
index 0108180..78a5f42 100644
--- a/basicsuite/graphicaleffects/main.qml
+++ b/basicsuite/graphicaleffects/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/graphicaleffects/preview_l.jpg b/basicsuite/graphicaleffects/preview_l.jpg
index 80fbbd5..7f75ed5 100644
--- a/basicsuite/graphicaleffects/preview_l.jpg
+++ b/basicsuite/graphicaleffects/preview_l.jpg
diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp b/basicsuite/launchersettings/SettingsButtonStyle.qml
index fe03f0e..bebae48 100644
--- a/basicsuite/qt5-everywhere/demos/shaders/import/main.cpp
+++ b/basicsuite/launchersettings/SettingsButtonStyle.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
@@ -38,25 +38,31 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtQml/QQmlExtensionPlugin>
-#include <QtQml/QtQml>
-#include "shaderfilereader.h"
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
 
-QT_BEGIN_NAMESPACE
+ButtonStyle {
+    panel: Item {
+        implicitHeight: engine.smallFontSize() * 2.4
+        implicitWidth: engine.centimeter() * 5
 
-class SensorExplorerDeclarativeModule : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json")
-public:
-    virtual void registerTypes(const char *uri)
-    {
-        Q_ASSERT(QLatin1String(uri) == QLatin1String("ShaderReader"));
-        qmlRegisterType<ShaderFileReader>(uri, 1, 0, "ShaderFileReader");
+        BorderImage {
+            anchors.fill: parent
+            antialiasing: true
+            border.bottom: 8
+            border.top: 8
+            border.left: 8
+            border.right: 8
+            anchors.margins: control.pressed ? -4 : 0
+            source: control.pressed ? "images/button_pressed.png" : "images/button_default.png"
+            Text {
+                text: control.text
+                anchors.centerIn: parent
+                color: "white"
+                font.pixelSize: engine.smallFontSize()
+                renderType: Text.NativeRendering
+            }
+        }
     }
-};
-
-QT_END_NAMESPACE
-
-#include "main.moc"
-
+}
diff --git a/basicsuite/launchersettings/WifiController.qml b/basicsuite/launchersettings/SettingsCheckBoxStyle.qml
index 3725478..c7c55d0 100644
--- a/basicsuite/launchersettings/WifiController.qml
+++ b/basicsuite/launchersettings/SettingsCheckBoxStyle.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
@@ -38,21 +38,24 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import Qt.labs.wifi 0.1 as Wifi
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
 
-QtObject {
-    function createWifiGroupBox()
-    {
-        if (Wifi.Interface.wifiSupported()) {
-            var component = Qt.createComponent("WifiGroupBox.qml");
-            var wifi = component.createObject(wifiOptions.contentItem);
-            if (wifi == null) {
-                wifiOptions.visible = false
-                print("Error creating WifiGroupBox");
+CheckBoxStyle {
+    indicator: Rectangle {
+            implicitWidth: engine.mm(7)
+            implicitHeight: engine.mm(7)
+            radius: 10
+            border.color: "black"
+            border.width: 2
+            Rectangle {
+                visible: control.checked
+                color: "#45b7e2"
+                border.color: "darkblue"
+                radius: 10
+                anchors.margins: engine.mm(1)
+                anchors.fill: parent
             }
-        } else {
-            wifiOptions.visible = false
-        }
     }
 }
diff --git a/experimental/qt5-intro-android/main.cpp b/basicsuite/launchersettings/SettingsGroupBoxStyle.qml
index 9147a55..c5c71b5 100644
--- a/experimental/qt5-intro-android/main.cpp
+++ b/basicsuite/launchersettings/SettingsGroupBoxStyle.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
@@ -38,36 +38,44 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtGui>
-#include <QtQuick>
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
+import QtQuick.Controls.Private 1.0
 
-QtMessageHandler oldMessageHandler = 0;
-void messageHandler(QtMsgType type, const QMessageLogContext &ctx, const QString &msg)
-{
-    if (type == QtCriticalMsg || type == QtFatalMsg)
-        oldMessageHandler(type, ctx, msg);
-}
-
-int main(int argc, char **argv)
-{
-#if defined(QT_NO_DEBUG)
-    oldMessageHandler = qInstallMessageHandler(messageHandler);
-#endif
-
-    QGuiApplication app(argc, argv);
-
-    QString videoPath = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
-    if (!QFile::exists(videoPath + QLatin1String("/Qt5_Animation_small.mp4"))) {
-        QDir().mkpath(videoPath);
-        if (!QFile::copy(QLatin1String("assets:/video/Qt5_Animation_small.mp4"), videoPath + QLatin1String("/Qt5_Animation_small.mp4")))
-            qWarning("main: Couldn't copy video.");
+// GroupBoxStyle currently is not available as a public API,
+// so we write our own by importing private Styles API.
+Style {
+    // The margin from the content item to the groupbox
+    padding {
+        top: (control.title.length > 0 ? TextSingleton.implicitHeight : 0) + 30
+        left: 8
+        right: 8
+        bottom: 8
     }
+    // The groupbox frame
+    property Component panel: Item {
+        anchors.fill: parent
 
-    QQuickView view;
-    view.engine()->rootContext()->setContextProperty("videoPath", QLatin1String("file://") + videoPath + QLatin1String("/Qt5_Animation_small.mp4"));
-    view.setResizeMode(QQuickView::SizeRootObjectToView);
-    view.setSource(QUrl("qrc:/main.qml"));
-    view.show();
+        Text {
+            id: label
+            anchors.bottom: borderImage.top
+            anchors.margins: 2
+            text: control.title
+            font.pixelSize: engine.smallFontSize() * 1.1
+            color: "white"
+            renderType: Text.NativeRendering
+        }
 
-    return app.exec();
+        BorderImage {
+            id: borderImage
+            anchors.fill: parent
+            anchors.topMargin: padding.top - 7
+            source: "images/groupbox.png"
+            border.left: 4
+            border.right: 4
+            border.top: 4
+            border.bottom: 4
+        }
+    }
 }
diff --git a/experimental/qt5-intro-android/WebkitSlide.qml b/basicsuite/launchersettings/SettingsRadioButtonStyle.qml
index 9febcdf..9959ea1 100644
--- a/experimental/qt5-intro-android/WebkitSlide.qml
+++ b/basicsuite/launchersettings/SettingsRadioButtonStyle.qml
@@ -38,22 +38,29 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import "presentation"
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Controls.Styles 1.2
 
-Slide {
-    id: slide
-
-    title: "Qt WebKit - WebView"
-
-    Loader {
-        id: webkitLoader
-
-        anchors.fill: parent
-
-        source: "WebKitSlideContent.qml"
+RadioButtonStyle {
+    indicator: Rectangle {
+        implicitWidth: engine.mm(7)
+        implicitHeight: engine.mm(7)
+        radius: 40
+        border.color: "black"
+        border.width: 2
+        Rectangle {
+            anchors.fill: parent
+            visible: control.checked
+            color: "#45b7e2"
+            border.color: "darkblue"
+            radius: 40
+            anchors.margins: engine.mm(1)
+        }
+    }
+    label: Label {
+        text: control.text
+        font.pixelSize: engine.smallFontSize() * 0.8
+        color: "white"
     }
-
-    centeredText: webkitLoader.status == Loader.Error ? "Qt WebKit not installed or otherwise failed to load" : ""
 }
-
diff --git a/basicsuite/launchersettings/WifiGroupBox.qml b/basicsuite/launchersettings/WifiGroupBox.qml
index e88f5cb..3ce35c9 100644
--- a/basicsuite/launchersettings/WifiGroupBox.qml
+++ b/basicsuite/launchersettings/WifiGroupBox.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
@@ -38,10 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 1.0
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import QtQuick.Layouts 1.0
-
 import Qt.labs.wifi 0.1
 
 ColumnLayout {
@@ -61,7 +60,7 @@ ColumnLayout {
             Button {
                 id: wifiOnOffButton
                 Layout.fillWidth: true
-                style: root.buttonStyle
+                style: SettingsButtonStyle {}
                 text: (wifiManager.backendReady) ? "Switch Off" : "Switch On"
                 onClicked: {
                     if (wifiManager.backendReady) {
@@ -77,7 +76,7 @@ ColumnLayout {
             Button {
                 id: listNetworksButton
                 Layout.fillWidth: true
-                style: root.buttonStyle
+                style: SettingsButtonStyle {}
                 visible: wifiManager.backendReady
                 text: (networkList.visible) ? "Hide wifi networks"
                                             : "List available wifi networks"
@@ -85,9 +84,9 @@ ColumnLayout {
             }
         }
 
-        NetworkList {
+        WifiNetworkList {
             id: networkList
-            implicitHeight: 400
+            implicitHeight: engine.centimeter(7)
             Layout.fillWidth: true
             visible: false
             clip: true
diff --git a/basicsuite/launchersettings/NetworkList.qml b/basicsuite/launchersettings/WifiNetworkList.qml
index 1820dac..bbc99b0 100644
--- a/basicsuite/launchersettings/NetworkList.qml
+++ b/basicsuite/launchersettings/WifiNetworkList.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
@@ -38,19 +38,21 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Controls 1.0
+import QtQuick 2.2
+import QtQuick.Controls 1.2
 import Qt.labs.wifi 0.1
 
 Item {
     Component {
         id: listDelegate
         Rectangle {
-            id: delegateBackground
             property bool expanded: false
             property bool connected: wifiManager.connectedSSID == network.ssid
             property bool actingNetwork: networkView.currentNetworkSsid == network.ssid
-            height: (expanded ? (connected ? 180: 260) : 70)
+            property int notExpandedHeight: ssidLabel.height + bssidLabel.height + engine.mm(4)
+            property int expandedHeight: notExpandedHeight + passwordInput.height + connectionButton.height + engine.mm(7)
+            property int connectedExpandedHeight: notExpandedHeight + connectionButton.height + engine.mm(4)
+            height: (expanded ? (connected ? connectedExpandedHeight : expandedHeight) : notExpandedHeight)
             width: parent.width
             clip: true // ### fixme
             color: "#5C5C5C"
@@ -76,8 +78,9 @@ Item {
                 id: ssidLabel
                 anchors.top: parent.top
                 anchors.left: parent.left
-                anchors.margins: 10
-                font.pixelSize: 20
+                anchors.margins: engine.mm(1)
+                anchors.leftMargin: engine.mm(2)
+                font.pixelSize: engine.smallFontSize()
                 font.bold: true
                 color: "#E6E6E6"
                 text: network.ssid + (actingNetwork ? networkView.networkStateText : "");
@@ -87,41 +90,43 @@ Item {
                 id: bssidLabel
                 anchors.top: ssidLabel.bottom
                 anchors.left: parent.left
-                anchors.margins: 5
-                anchors.leftMargin: 40
+                anchors.margins: engine.mm(1)
+                anchors.leftMargin: engine.mm(6)
                 text: network.bssid
                 color: "#E6E6E6"
-                font.pixelSize: ssidLabel.font.pixelSize * 0.5
+                font.pixelSize: ssidLabel.font.pixelSize * 0.8
             }
 
             Text {
                 id: flagsLabel
-                x: 200
                 anchors.top: bssidLabel.top
+                anchors.left: bssidLabel.right
+                anchors.leftMargin: engine.mm(7)
                 text: (network.supportsWPA2 ? "WPA2 " : "")
                       + (network.supportsWPA ? "WPA " : "")
                       + (network.supportsWEP ? "WEP " : "")
                       + (network.supportsWPS ? "WPS " : "");
                 color: "#E6E6E6"
-                font.pixelSize: ssidLabel.font.pixelSize * 0.5
+                font.pixelSize: ssidLabel.font.pixelSize * 0.8
                 font.italic: true
             }
 
             Rectangle {
                 id: signalStrengthBar
-                height: 20
-                radius: 10
+                height: engine.mm(3)
+                radius: 20
                 antialiasing: true
-                anchors.margins: 20
+                anchors.margins: engine.mm(2)
                 anchors.right: parent.right
                 anchors.top: parent.top
                 color: "#BF8888"
                 border.color: "#212126"
-
+                // ### TODO - Qt Wifi library should provide alternative methods
+                // of describing signal strength besides dBm.
                 property int strengthBarWidth: Math.max(100 + network.signalStrength, 0) / 100 * parent.width
                 onStrengthBarWidthChanged: {
-                    if (strengthBarWidth > parent.width * 0.7)
-                        signalStrengthBar.width = parent.width * 0.7
+                    if (strengthBarWidth > parent.width * 0.55)
+                        signalStrengthBar.width = parent.width * 0.55
                     else
                         signalStrengthBar.width = strengthBarWidth
                 }
@@ -135,19 +140,24 @@ Item {
 
             TextField {
                 id: passwordInput
-                y: 100
-                height: 50
-                width: 300
+                anchors.top: flagsLabel.bottom
+                anchors.topMargin: engine.mm(3)
+                anchors.horizontalCenter: parent.horizontalCenter
+                width: parent.width * 0.36
+                height: font.pixelSize * 2.4
                 placeholderText: "Enter Password"
                 visible: !connected
-                anchors.horizontalCenter: parent.horizontalCenter
-                font.pixelSize: 18
+                font.pixelSize: engine.smallFontSize() * 0.8
+                echoMode: TextInput.Password
                 inputMethodHints: Qt.ImhNoPredictiveText
             }
 
             Button {
-                style: root.buttonStyle
-                y: passwordInput.visible ? passwordInput.y + passwordInput.height + 20 : passwordInput.y
+                id: connectionButton
+                style: SettingsButtonStyle {}
+                y: connected ? passwordInput.y
+                             : passwordInput.y + passwordInput.height + engine.mm(2)
+                width: passwordInput.width
                 anchors.horizontalCenter: parent.horizontalCenter
                 text: connected ? "Disconnect" : "Connect"
                 onClicked: connected ? wifiManager.disconnect()
diff --git a/basicsuite/launchersettings/main.qml b/basicsuite/launchersettings/main.qml
index 085ec4d..c698aaf 100644
--- a/basicsuite/launchersettings/main.qml
+++ b/basicsuite/launchersettings/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
@@ -38,133 +38,58 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import QtQuick 2.0
-
-import QtQuick.Controls 1.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls.Styles 1.0
-import QtQuick.Controls.Private 1.0
-import QtQuick.Window 2.1
+import QtQuick 2.2
+import QtQuick.Controls 1.2
+import QtQuick.Layouts 1.1
+import QtQuick.Controls.Styles 1.2
+import QtQuick.Enterprise.VirtualKeyboard.Settings 1.2
+import Qt.labs.wifi 0.1 as Wifi
 import B2Qt.Utils 1.0
 
 Rectangle {
-    id: root
-    width: 1280
-    height: 800
+    anchors.fill: parent
     color: "#212126"
-    property int margin: 10
-    property alias buttonStyle: buttonStyle
-
-    // ******************************* STYLES **********************************
-    Component {
-        id: buttonStyle
-        ButtonStyle {
-            panel: Item {
-                implicitHeight: 50
-                implicitWidth: 320
-                BorderImage {
-                    anchors.fill: parent
-                    antialiasing: true
-                    border.bottom: 8
-                    border.top: 8
-                    border.left: 8
-                    border.right: 8
-                    anchors.margins: control.pressed ? -4 : 0
-                    source: control.pressed ? "images/button_pressed.png" : "images/button_default.png"
-                    Text {
-                        text: control.text
-                        anchors.centerIn: parent
-                        color: "white"
-                        font.pixelSize: 22
-                        renderType: Text.NativeRendering
-                    }
-                }
-            }
-        }
-    }
 
-    // GroupBoxStyle currently is not available as a public API, so we write our own...
-    Component {
-        id: groupBoxStyle
-        Style {
-            // The margin from the content item to the groupbox
-            padding {
-                top: (control.title.length > 0 ? TextSingleton.implicitHeight : 0) + 30
-                left: 8
-                right: 8
-                bottom: 8
-            }
-            // The groupbox frame
-            property Component panel: Item {
-                anchors.fill: parent
-
-                Text {
-                    id: label
-                    anchors.bottom: borderImage.top
-                    anchors.margins: 2
-                    text: control.title
-                    font.pixelSize: 22
-                    color: "white"
-                    renderType: Text.NativeRendering
-                }
-
-                BorderImage {
-                    id: borderImage
-                    anchors.fill: parent
-                    anchors.topMargin: padding.top - 7
-                    source: "images/groupbox.png"
-                    border.left: 4
-                    border.right: 4
-                    border.top: 4
-                    border.bottom: 4
-                }
-            }
-        }
-    }
-
-    // ******************************** UI ****************************************
-    Loader { id: wifiControllerLoader; source: "WifiController.qml" }
 
     Flickable {
         anchors.top: parent.top
         anchors.horizontalCenter: parent.horizontalCenter
-        anchors.margins: margin
-        anchors.topMargin: 50
+        anchors.topMargin: engine.mm(5)
         height: parent.height
-        width: mainLayout.width
-        contentHeight: mainLayout.height + 100
+        width: parent.width
+        contentHeight: mainLayout.height + engine.centimeter(2)
         contentWidth: mainLayout.width
         flickableDirection: Flickable.VerticalFlick
+        leftMargin: (width - contentWidth) * 0.5
 
         ColumnLayout {
             id: mainLayout
-            // can not use size of "root" here, it will shrink UI when virtual keyboard is open
-            width: Math.min(Screen.width, Screen.height)
+            width: Math.min(engine.screenWidth(), engine.screenHeight())
             height: implicitHeight
             anchors.left: parent.left
             anchors.right: parent.right
+            spacing: engine.mm(4)
 
             GroupBox {
                 id: powerOptions
                 title: "Power"
                 Layout.fillWidth: true
-                style: groupBoxStyle
+                style: SettingsGroupBoxStyle {}
                 implicitWidth: 0
+                height: implicitHeight
 
                 RowLayout {
-                    id: powerButtonRow
-
                     anchors.fill: parent
 
                     Button {
-                        style: buttonStyle
+                        style: SettingsButtonStyle {}
                         text: "Shut Down"
                         Layout.fillWidth: true
                         onClicked: B2QtDevice.powerOff();
                     }
 
                     Button {
-                        style: buttonStyle
+                        style: SettingsButtonStyle {}
                         text: "Reboot"
                         Layout.fillWidth: true
                         onClicked: B2QtDevice.reboot();
@@ -175,19 +100,27 @@ Rectangle {
             GroupBox {
                 id: displayOptions
                 title: "Display"
-                style: groupBoxStyle
+                style: SettingsGroupBoxStyle {}
                 Layout.fillWidth: true
                 implicitWidth: 0
+                height: implicitHeight
 
                 GridLayout {
-                    id: displayGrid
-
                     rows: 2
                     flow: GridLayout.TopToBottom
                     anchors.fill: parent
 
-                    Label { text: "Brightness: "; font.pixelSize: 18; color: "white" }
-                    Label { text: "Display FPS: "; font.pixelSize: 18; color: "white" }
+                    Label {
+                        text: "Brightness: "
+                        font.pixelSize: engine.smallFontSize() * 0.8
+                        color: "white"
+                    }
+
+                    Label {
+                        text: "Display FPS: "
+                        font.pixelSize: engine.smallFontSize() * 0.8
+                        color: "white"
+                    }
 
                     Slider {
                         id: brightnessSlider
@@ -195,11 +128,53 @@ Rectangle {
                         minimumValue: 1
                         Layout.fillWidth: true
                         value: B2QtDevice.displayBrightness
+                        style: SliderStyle {
+                            handle: Rectangle {
+                                anchors.centerIn: parent
+                                color: "white"
+                                border.color: "gray"
+                                border.width: 2
+                                width: engine.mm(6)
+                                height: engine.mm(6)
+                                radius: 20
+                            }
+                        }
                     }
 
                     CheckBox {
+                        style: SettingsCheckBoxStyle {}
                         checked: engine.fpsEnabled
-                        onCheckedChanged: engine.fpsEnabled = checked;
+                        onCheckedChanged: engine.fpsEnabled = checked
+                    }
+                }
+            }
+
+            GroupBox {
+                id: vkbOptions
+                title: "Virtual Keyboard Style"
+                style: SettingsGroupBoxStyle {}
+                Layout.fillWidth: true
+
+                function updateVKBStyle(styleRadioButton) {
+                    VirtualKeyboardSettings.styleName = styleRadioButton.text.toLowerCase()
+                }
+
+                Row {
+                    spacing: engine.mm(6)
+                    ExclusiveGroup { id: vkbStyleGroup }
+                    RadioButton {
+                        id: defaultStyle
+                        style: SettingsRadioButtonStyle {}
+                        text: "Default"
+                        exclusiveGroup: vkbStyleGroup
+                        onClicked: vkbOptions.updateVKBStyle(defaultStyle)
+                    }
+                    RadioButton {
+                        id: retroStyle
+                        style: SettingsRadioButtonStyle {}
+                        text: "Retro"
+                        exclusiveGroup: vkbStyleGroup
+                        onClicked: vkbOptions.updateVKBStyle(retroStyle)
                     }
                 }
 
@@ -208,34 +183,49 @@ Rectangle {
                     property: "displayBrightness"
                     value: brightnessSlider.value
                 }
+
+                Component.onCompleted: {
+                   if (VirtualKeyboardSettings.styleName == "default")
+                       defaultStyle.checked = true
+                   if (VirtualKeyboardSettings.styleName == "retro")
+                       retroStyle.checked = true
+                }
             }
 
             GroupBox {
                 id: networkOptions
                 title: "Network"
-                style: groupBoxStyle
+                style: SettingsGroupBoxStyle {}
                 Layout.fillWidth: true
                 implicitWidth: 0
+                height: implicitHeight
 
                 GridLayout {
-                    id: networkGrid
-
                     rows: 2
                     columns: 3
                     flow: GridLayout.TopToBottom
                     anchors.fill: parent
 
-                    Label { text: "Hostname: "; font.pixelSize: 18; color: "white" }
-                    Label { text: "IP address: "; font.pixelSize: 18; color: "white"}
+                    Label {
+                        text: "Hostname: "
+                        font.pixelSize: engine.smallFontSize() * 0.8
+                        color: "white"
+                    }
+
+                    Label {
+                        text: "IP address: "
+                        font.pixelSize: engine.smallFontSize() * 0.8
+                        color: "white"
+                    }
 
                     TextField {
                         id: hostname
-                        implicitHeight: hostnameButton.height - 8
                         text: B2QtDevice.hostname
                         placeholderText: "Enter hostname"
+                        font.pixelSize: engine.smallFontSize()
                         inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhPreferLowercase | Qt.ImhNoPredictiveText
-                        font.pixelSize: 18
                         Layout.fillWidth: true
+                        Layout.preferredHeight: font.pixelSize * 2.4
                         onAccepted: {
                             Qt.inputMethod.commit()
                             Qt.inputMethod.hide()
@@ -246,16 +236,15 @@ Rectangle {
 
                     Label {
                         text: B2QtDevice.ipAddress
-                        font.pixelSize: 18
+                        font.pixelSize: engine.smallFontSize()
                         color: "white"
                         Layout.columnSpan: 2
                     }
 
                     Button {
                         id: hostnameButton
-                        style: buttonStyle
+                        style: SettingsButtonStyle {}
                         text: "Change hostname"
-                        implicitWidth: 260
                         onClicked: hostname.accepted()
                     }
                 }
@@ -264,15 +253,23 @@ Rectangle {
             GroupBox {
                 id: wifiOptions
                 title: "Wifi"
-                style: groupBoxStyle
+                style: SettingsGroupBoxStyle {}
                 Layout.fillWidth: true
-            }
+                visible: false
+
+                function createWifiGroupBox()
+                {
+                    if (Wifi.Interface.wifiSupported()) {
+                        var component = Qt.createComponent("WifiGroupBox.qml")
+                        var wifi = component.createObject(wifiOptions.contentItem)
+                        if (wifi)
+                            wifiOptions.visible = true
+                        else
+                            print("Error creating WifiGroupBox")
+                    }
+                }
 
-            Component.onCompleted: {
-                if (wifiControllerLoader.item != undefined)
-                    wifiControllerLoader.item.createWifiGroupBox()
-                else
-                    wifiOptions.visible = false
+                Component.onCompleted: wifiOptions.createWifiGroupBox()
             }
         }
     }
diff --git a/basicsuite/launchersettings/preview_l.jpg b/basicsuite/launchersettings/preview_l.jpg
index b9b232b..a5496b0 100644
--- a/basicsuite/launchersettings/preview_l.jpg
+++ b/basicsuite/launchersettings/preview_l.jpg
diff --git a/basicsuite/mediaplayer/Content.qml b/basicsuite/mediaplayer/Content.qml
index d519fcb..7ea860f 100755
--- a/basicsuite/mediaplayer/Content.qml
+++ b/basicsuite/mediaplayer/Content.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/ContentVideo.qml b/basicsuite/mediaplayer/ContentVideo.qml
index fb5c86d..443b402 100755
--- a/basicsuite/mediaplayer/ContentVideo.qml
+++ b/basicsuite/mediaplayer/ContentVideo.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/ControlBar.qml b/basicsuite/mediaplayer/ControlBar.qml
index b6c1b9e..5492a96 100755
--- a/basicsuite/mediaplayer/ControlBar.qml
+++ b/basicsuite/mediaplayer/ControlBar.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/EffectSelectionPanel.qml b/basicsuite/mediaplayer/EffectSelectionPanel.qml
index 4f7e161..8dda73f 100755
--- a/basicsuite/mediaplayer/EffectSelectionPanel.qml
+++ b/basicsuite/mediaplayer/EffectSelectionPanel.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/Effect.qml b/basicsuite/mediaplayer/Effects/Effect.qml
index 99308fd..29d6f1d 100755
--- a/basicsuite/mediaplayer/Effects/Effect.qml
+++ b/basicsuite/mediaplayer/Effects/Effect.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectBillboard.qml b/basicsuite/mediaplayer/Effects/EffectBillboard.qml
index 947209e..3f37e8e 100755
--- a/basicsuite/mediaplayer/Effects/EffectBillboard.qml
+++ b/basicsuite/mediaplayer/Effects/EffectBillboard.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectBlackAndWhite.qml b/basicsuite/mediaplayer/Effects/EffectBlackAndWhite.qml
index 8cbba60..2dcd1d7 100755
--- a/basicsuite/mediaplayer/Effects/EffectBlackAndWhite.qml
+++ b/basicsuite/mediaplayer/Effects/EffectBlackAndWhite.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectEmboss.qml b/basicsuite/mediaplayer/Effects/EffectEmboss.qml
index 23ef1cb..fc88691 100755
--- a/basicsuite/mediaplayer/Effects/EffectEmboss.qml
+++ b/basicsuite/mediaplayer/Effects/EffectEmboss.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectGaussianBlur.qml b/basicsuite/mediaplayer/Effects/EffectGaussianBlur.qml
index f866524..ddb18ef 100755
--- a/basicsuite/mediaplayer/Effects/EffectGaussianBlur.qml
+++ b/basicsuite/mediaplayer/Effects/EffectGaussianBlur.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectGlow.qml b/basicsuite/mediaplayer/Effects/EffectGlow.qml
index 2cfee3b..ee835e7 100755
--- a/basicsuite/mediaplayer/Effects/EffectGlow.qml
+++ b/basicsuite/mediaplayer/Effects/EffectGlow.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectIsolate.qml b/basicsuite/mediaplayer/Effects/EffectIsolate.qml
index 4c569a5..770bd76 100755
--- a/basicsuite/mediaplayer/Effects/EffectIsolate.qml
+++ b/basicsuite/mediaplayer/Effects/EffectIsolate.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectMagnify.qml b/basicsuite/mediaplayer/Effects/EffectMagnify.qml
index 01f33a5..fb1915e 100755
--- a/basicsuite/mediaplayer/Effects/EffectMagnify.qml
+++ b/basicsuite/mediaplayer/Effects/EffectMagnify.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectPageCurl.qml b/basicsuite/mediaplayer/Effects/EffectPageCurl.qml
index 39947d9..f4cf87d 100755
--- a/basicsuite/mediaplayer/Effects/EffectPageCurl.qml
+++ b/basicsuite/mediaplayer/Effects/EffectPageCurl.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectPassThrough.qml b/basicsuite/mediaplayer/Effects/EffectPassThrough.qml
index 1f259be..f98ea33 100755
--- a/basicsuite/mediaplayer/Effects/EffectPassThrough.qml
+++ b/basicsuite/mediaplayer/Effects/EffectPassThrough.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectPixelate.qml b/basicsuite/mediaplayer/Effects/EffectPixelate.qml
index 4bc73d3..7545a89 100755
--- a/basicsuite/mediaplayer/Effects/EffectPixelate.qml
+++ b/basicsuite/mediaplayer/Effects/EffectPixelate.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectPosterize.qml b/basicsuite/mediaplayer/Effects/EffectPosterize.qml
index 4b661a5..9b97d03 100755
--- a/basicsuite/mediaplayer/Effects/EffectPosterize.qml
+++ b/basicsuite/mediaplayer/Effects/EffectPosterize.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectRipple.qml b/basicsuite/mediaplayer/Effects/EffectRipple.qml
index 7a82f50..cf634d0 100755
--- a/basicsuite/mediaplayer/Effects/EffectRipple.qml
+++ b/basicsuite/mediaplayer/Effects/EffectRipple.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectSepia.qml b/basicsuite/mediaplayer/Effects/EffectSepia.qml
index 2539680..5d8fa89 100755
--- a/basicsuite/mediaplayer/Effects/EffectSepia.qml
+++ b/basicsuite/mediaplayer/Effects/EffectSepia.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectSharpen.qml b/basicsuite/mediaplayer/Effects/EffectSharpen.qml
index c30f298..1295206 100755
--- a/basicsuite/mediaplayer/Effects/EffectSharpen.qml
+++ b/basicsuite/mediaplayer/Effects/EffectSharpen.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectShockwave.qml b/basicsuite/mediaplayer/Effects/EffectShockwave.qml
index 1078b73..fe068c0 100755
--- a/basicsuite/mediaplayer/Effects/EffectShockwave.qml
+++ b/basicsuite/mediaplayer/Effects/EffectShockwave.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectSobelEdgeDetection1.qml b/basicsuite/mediaplayer/Effects/EffectSobelEdgeDetection1.qml
index 56f4869..fbda1aa 100755
--- a/basicsuite/mediaplayer/Effects/EffectSobelEdgeDetection1.qml
+++ b/basicsuite/mediaplayer/Effects/EffectSobelEdgeDetection1.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectSobelEdgeDetection2.qml b/basicsuite/mediaplayer/Effects/EffectSobelEdgeDetection2.qml
index 938912d..ab4fa27 100755
--- a/basicsuite/mediaplayer/Effects/EffectSobelEdgeDetection2.qml
+++ b/basicsuite/mediaplayer/Effects/EffectSobelEdgeDetection2.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectTiltShift.qml b/basicsuite/mediaplayer/Effects/EffectTiltShift.qml
index d0cf9c4..20a7f3a 100755
--- a/basicsuite/mediaplayer/Effects/EffectTiltShift.qml
+++ b/basicsuite/mediaplayer/Effects/EffectTiltShift.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectToon.qml b/basicsuite/mediaplayer/Effects/EffectToon.qml
index a17ad1c..9a1eb56 100755
--- a/basicsuite/mediaplayer/Effects/EffectToon.qml
+++ b/basicsuite/mediaplayer/Effects/EffectToon.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectVignette.qml b/basicsuite/mediaplayer/Effects/EffectVignette.qml
index 5ec5090..944cc37 100755
--- a/basicsuite/mediaplayer/Effects/EffectVignette.qml
+++ b/basicsuite/mediaplayer/Effects/EffectVignette.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectWarhol.qml b/basicsuite/mediaplayer/Effects/EffectWarhol.qml
index 1e40b30..a4ae067 100755
--- a/basicsuite/mediaplayer/Effects/EffectWarhol.qml
+++ b/basicsuite/mediaplayer/Effects/EffectWarhol.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/Effects/EffectWobble.qml b/basicsuite/mediaplayer/Effects/EffectWobble.qml
index 4b07639..77cfc1a 100755
--- a/basicsuite/mediaplayer/Effects/EffectWobble.qml
+++ b/basicsuite/mediaplayer/Effects/EffectWobble.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/FileBrowser.qml b/basicsuite/mediaplayer/FileBrowser.qml
index f9f2f81..66f5e74 100644
--- a/basicsuite/mediaplayer/FileBrowser.qml
+++ b/basicsuite/mediaplayer/FileBrowser.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/ImageButton.qml b/basicsuite/mediaplayer/ImageButton.qml
index 6dcb6dd..5668a21 100755
--- a/basicsuite/mediaplayer/ImageButton.qml
+++ b/basicsuite/mediaplayer/ImageButton.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/Intro.qml b/basicsuite/mediaplayer/Intro.qml
index 094fe3e..f268419 100644
--- a/basicsuite/mediaplayer/Intro.qml
+++ b/basicsuite/mediaplayer/Intro.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/MetadataView.qml b/basicsuite/mediaplayer/MetadataView.qml
index c9a9ccf..449bc17 100644
--- a/basicsuite/mediaplayer/MetadataView.qml
+++ b/basicsuite/mediaplayer/MetadataView.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/ParameterPanel.qml b/basicsuite/mediaplayer/ParameterPanel.qml
index 51b9938..40b4d87 100644
--- a/basicsuite/mediaplayer/ParameterPanel.qml
+++ b/basicsuite/mediaplayer/ParameterPanel.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/PlaybackControl.qml b/basicsuite/mediaplayer/PlaybackControl.qml
index 65bb7ca..9f7b18d 100755
--- a/basicsuite/mediaplayer/PlaybackControl.qml
+++ b/basicsuite/mediaplayer/PlaybackControl.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/SeekControl.qml b/basicsuite/mediaplayer/SeekControl.qml
index 9a75517..812cad0 100755
--- a/basicsuite/mediaplayer/SeekControl.qml
+++ b/basicsuite/mediaplayer/SeekControl.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/Slider.qml b/basicsuite/mediaplayer/Slider.qml
index 20a3aa7..7835657 100644
--- a/basicsuite/mediaplayer/Slider.qml
+++ b/basicsuite/mediaplayer/Slider.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/UrlBar.qml b/basicsuite/mediaplayer/UrlBar.qml
index 5da4d64..bd52297 100644
--- a/basicsuite/mediaplayer/UrlBar.qml
+++ b/basicsuite/mediaplayer/UrlBar.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/VolumeControl.qml b/basicsuite/mediaplayer/VolumeControl.qml
index 9844350..df57ada 100755
--- a/basicsuite/mediaplayer/VolumeControl.qml
+++ b/basicsuite/mediaplayer/VolumeControl.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/mediaplayer/images/qt-logo.png b/basicsuite/mediaplayer/images/qt-logo.png
index 242bb28..f3e8f29 100755
--- a/basicsuite/mediaplayer/images/qt-logo.png
+++ b/basicsuite/mediaplayer/images/qt-logo.png
diff --git a/basicsuite/mediaplayer/main.qml b/basicsuite/mediaplayer/main.qml
index 4aa038c..49d692f 100755
--- a/basicsuite/mediaplayer/main.qml
+++ b/basicsuite/mediaplayer/main.qml
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/mediaplayer/preview_l.jpg b/basicsuite/mediaplayer/preview_l.jpg
index 0fff215..c526f33 100644
--- a/basicsuite/mediaplayer/preview_l.jpg
+++ b/basicsuite/mediaplayer/preview_l.jpg
diff --git a/basicsuite/qt5-cinematicdemo/preview_l.jpg b/basicsuite/qt5-cinematicdemo/preview_l.jpg
index 21bb2f9..99ce26a 100644
--- a/basicsuite/qt5-cinematicdemo/preview_l.jpg
+++ b/basicsuite/qt5-cinematicdemo/preview_l.jpg
diff --git a/basicsuite/qt5-everywhere/Button.qml b/basicsuite/qt5-everywhere/Button.qml
deleted file mode 100644
index d3b30a7..0000000
--- a/basicsuite/qt5-everywhere/Button.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: root
-    width: (app.height + app.width) * 0.04
-    height: width
-
-    property string imageSource : ""
-    property double rotation: 0
-    signal clicked()
-
-    Image {
-        id: buttonImage
-        anchors.fill: root
-        anchors.margins: 0
-        source: root.imageSource
-        opacity: 1.0
-        rotation: root.rotation
-    }
-
-    MouseArea {
-        id: buttonMouseArea
-        anchors.fill: root
-        anchors.margins: -20
-        hoverEnabled: true
-        onClicked: root.clicked()
-        onEntered: buttonImage.anchors.margins = -(root.width * 0.1)
-        onExited: buttonImage.anchors.margins = 0
-        onPressed: {buttonImage.opacity = 0.7; buttonImage.anchors.margins = -(root.width * 0.1)}
-        onReleased: { buttonImage.opacity = 1.0; buttonImage.anchors.margins = 0}
-    }
-}
diff --git a/basicsuite/qt5-everywhere/Cloud.qml b/basicsuite/qt5-everywhere/Cloud.qml
deleted file mode 100644
index 00fce39..0000000
--- a/basicsuite/qt5-everywhere/Cloud.qml
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: cloudRoot
-    x: app.width
-    y: randomY+deltaY
-    width: app.width*0.2
-    height: width*0.4
-
-    property int duration: 20000
-    property string sourceImage: ""
-    property real deltaY: 0
-    property real randomY: app.height*0.3
-    property real amplitudeY: app.height*0.2
-
-    function start() {
-        recalculate()
-        cloudXAnimation.restart();
-        cloudYAnimation.restart();
-    }
-
-    function recalculate() {
-        cloudRoot.duration = Math.random()*15000 + 10000
-        cloudRoot.x = app.width
-        cloudRoot.randomY = Math.random()*app.height
-        cloudRoot.width = app.width*0.2
-        cloudRoot.height = cloudRoot.width*0.4
-        cloudRoot.scale = Math.random()*0.6 + 0.7
-    }
-
-    Image {
-        id: cloud
-        anchors.fill: cloudRoot
-        source: cloudRoot.sourceImage
-    }
-
-    SequentialAnimation{
-        id: cloudYAnimation
-        NumberAnimation { target: cloudRoot; property: "deltaY"; duration: cloudRoot.duration*0.3; from: 0; to:cloudRoot.amplitudeY; easing.type: Easing.InOutQuad }
-        NumberAnimation { target: cloudRoot; property: "deltaY"; duration: cloudRoot.duration*0.3; from: cloudRoot.amplitudeY; to:0; easing.type: Easing.InOutQuad }
-        running: true
-        onRunningChanged: {
-            if (!running) {
-                cloudRoot.amplitudeY = Math.random() * (app.height*0.2)
-                restart()
-            }
-        }
-    }
-
-    NumberAnimation {
-        id: cloudXAnimation
-        target: cloudRoot
-        property: "x"
-        duration: cloudRoot.duration
-        to:-cloudRoot.width
-        running: true
-
-        onRunningChanged: {
-            if (!running) {
-                recalculate()
-                restart()
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/DialogButton.qml b/basicsuite/qt5-everywhere/DialogButton.qml
deleted file mode 100644
index ff0e235..0000000
--- a/basicsuite/qt5-everywhere/DialogButton.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: button
-    radius: 10
-    height: 0.3 * dialog.height
-    width: dialog.width * 0.5 - dialog.dialogMargin
-    color: "transparent"
-
-    property string buttonText
-    signal clicked()
-
-    Text {
-        anchors.centerIn: parent
-        text: button.buttonText
-        font.pixelSize: 0.4 * button.height
-        color: "#ffffff"
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onPressed: parent.color = Qt.rgba(0.2, 0.2, 0.2, 0.4)
-        onReleased: parent.color = "transparent"
-        onClicked: button.clicked()
-    }
-}
diff --git a/basicsuite/qt5-everywhere/Element.qml b/basicsuite/qt5-everywhere/Element.qml
deleted file mode 100644
index 8692f76..0000000
--- a/basicsuite/qt5-everywhere/Element.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: root
-    width: 1
-    height: 1
-
-    property int itemId : 1
-
-    Image {
-        id: elementImage
-        anchors.centerIn: root
-        z: 5
-    }
-
-    Component.onCompleted: {
-        elementImage.source = root.itemId === 1 ? "images/tree1.png" :
-                              root.itemId === 2 ? "images/tree2.png" :
-                              root.itemId === 3 ? "images/mountain.png" :
-                              root.itemId === 4 ? "images/stones.png" :
-                              root.itemId === 5 ? "images/box_open.png" :
-                              root.itemId === 6 ? "images/box.png" :
-                              root.itemId === 10 ? "images/character0.png" :
-                              root.itemId === 11 ? "images/character1.png" :
-                              root.itemId === 12 ? "images/character3.png" :
-                              root.itemId === 13 ? "images/character7.png" :
-                              root.itemId === 14 ? "images/character8.png" :
-                              root.itemId === 15 ? "images/character9.png" :
-                              root.itemId === 20 ? "images/character2.png" :
-                              root.itemId === 21 ? "images/character4.png" :
-                              root.itemId === 22 ? "images/character5.png" :
-                              root.itemId === 23 ? "images/character6.png" :
-                              root.itemId === 24 ? "images/character10.png" :
-                              ""
-    }
-}
diff --git a/basicsuite/qt5-everywhere/Group.qml b/basicsuite/qt5-everywhere/Group.qml
deleted file mode 100644
index b3c6aa3..0000000
--- a/basicsuite/qt5-everywhere/Group.qml
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "style.js" as Style
-
-Item {
-    id: group
-    objectName: "group"
-
-    property int uid: 0
-    property real targetScale: 1
-    property int textX: 0
-    property int textY: 0
-    property string name: "Text"
-    property real imageScale: 6.0
-
-    property int fontSize: 160
-    property string uiFont: Style.FONT_FAMILY
-    property bool bold: true
-    property int fontTransition: 6
-
-    Text {
-        text: group.name
-        x: textX
-        y: textY
-        font.pixelSize: group.fontSize
-        font.family: Style.FONT_FAMILY
-        font.bold: group.bold
-        color: "#42200a"
-        smooth: true
-
-        Text {
-            text: group.name
-            color: "#1d6cb0"
-            x:group.fontTransition
-            y:-group.fontTransition
-            font.pixelSize: group.fontSize
-            font.family: Style.FONT_FAMILY
-            font.bold: group.bold
-            smooth: true
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/HelpScreen.qml b/basicsuite/qt5-everywhere/HelpScreen.qml
deleted file mode 100644
index 3f5980f..0000000
--- a/basicsuite/qt5-everywhere/HelpScreen.qml
+++ /dev/null
@@ -1,329 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "style.js" as Style
-
-Item {
-    id: root
-    anchors.fill:parent
-    property int delay: 500
-    property int rotationAngle:0
-
-    SequentialAnimation {
-        id: closeAnimation
-
-        ScriptAction{
-            script: {
-                pointer.visible = false
-                instructionText.text = ""
-                instructionText2.text = ""
-                highlightImage.smooth = false
-                highlight.size = Math.max(root.height, root.width)*2.5
-            }
-        }
-
-        PauseAnimation { duration: root.delay }
-
-        onRunningChanged: if (!running){
-                              stopAnimations()
-                              root.visible=false
-                              highlight.size=0
-                              highlightImage.smooth = true
-                          }
-    }
-
-
-    Item{
-        id: highlight
-        property int size: 0
-        property bool hidden: false
-        width:1
-        height:1
-        Behavior on x {NumberAnimation{duration: root.delay}}
-        Behavior on y {NumberAnimation{duration: root.delay}}
-        Behavior on size {id: sizeBehavior; NumberAnimation{duration: root.delay}}
-    }
-
-    Image{
-        id: highlightImage
-        anchors.centerIn: highlight
-        width: highlight.hidden? 0: highlight.size
-        height: highlight.hidden? 0: highlight.size
-        source: "images/highlight_mask.png"
-        opacity: .8
-        smooth: true
-    }
-
-    Rectangle{
-        id: top
-        anchors {left:parent.left; top: parent.top; right: parent.right; bottom: highlightImage.top}
-        color: "black"
-        opacity: .8
-    }
-
-    Rectangle{
-        id: bottom
-        anchors {left:parent.left; top: highlightImage.bottom; right: parent.right; bottom: parent.bottom}
-        color: "black"
-        opacity: .8
-    }
-
-    Rectangle{
-        id: left
-        anchors {left:parent.left; top: highlightImage.top; right: highlightImage.left; bottom: highlightImage.bottom}
-        color: "black"
-        opacity: .8
-    }
-
-    Rectangle{
-        id: right
-        anchors {left:highlightImage.right; top: highlightImage.top; right: parent.right; bottom: highlightImage.bottom}
-        color: "black"
-        opacity: .8
-    }
-
-    Text{
-        id: instructionText
-        anchors {horizontalCenter: parent.horizontalCenter; top: parent.top; topMargin: parent.height*.05}
-        text: ""
-        font.pixelSize: parent.width*.075
-        font.family: Style.FONT_FAMILY
-        smooth: true
-        color: "white"
-
-        Text{
-            id: instructionText2
-            anchors {horizontalCenter: parent.horizontalCenter; top: parent.bottom; topMargin: -parent.height/2}
-            text: ""
-            font.pixelSize: parent.font.pixelSize
-            font.family: Style.FONT_FAMILY
-            smooth: true
-            color: "white"
-        }
-    }
-
-    Item{
-        id: pointer
-        width: parent.width*.3
-        height: parent.width*.3
-
-        Image{
-            id: handImage
-            width: parent.width*.8
-            height: width
-            source: "images/hand.png"
-            y: parent.height/2-height/2
-            x: parent.width/2-width/2+deltaX
-            property int deltaX:0
-            anchors.verticalCenter: parent.verticalCenter
-            rotation: 90
-
-            SequentialAnimation{
-                id: pointingAnimation
-                PauseAnimation { duration: root.delay}
-                NumberAnimation{
-                    target: handImage
-                    property: "deltaX"
-                    from: -handImage.width*.2
-                    to: handImage.width*.2
-                    duration: 500
-                    easing.type: Easing.InOutCubic
-                }
-                PauseAnimation { duration: 200 }
-                NumberAnimation{
-                    target: handImage
-                    property: "deltaX"
-                    from: handImage.width*.2
-                    to: -handImage.width*.2
-                    duration: 500
-                    easing.type: Easing.InOutCubic
-
-                }
-            }
-
-        }
-    }
-
-    SequentialAnimation {
-        id: helpAnimation
-        loops: Animation.Infinite
-
-        PauseAnimation { duration: 1000 }
-        PropertyAction { target: handImage; property: "mirror"; value: true}
-        PropertyAction { target: instructionText; property: "text"; value: "Tap on the devices to"}
-        PropertyAction { target: instructionText2; property: "text"; value: "open applications"}
-        PropertyAction { target: pointer; property: "visible"; value: true}
-        PropertyAction { target: highlight; property: "hidden"; value: false}
-
-        SequentialAnimation {
-            id: clickAnimation
-            property int index: 0
-            property variant uids: [8,12]
-            loops: 2
-
-            ScriptAction{
-                script: {
-                    clickAnimation.index+=1
-                    if (clickAnimation.index>=clickAnimation.uids.length) clickAnimation.index=0
-                }
-            }
-
-            ScriptAction{
-                script: {
-                    highlight.size= (700+clickAnimation.index*100)*canvas.scalingFactor
-
-                    highlight.x=root.width/2 +getPosition(clickAnimation.uids[clickAnimation.index]).x*canvas.scalingFactor
-                    highlight.y=root.height/2 +getPosition(clickAnimation.uids[clickAnimation.index]).y*canvas.scalingFactor
-
-                    pointer.x= root.width/2 -pointer.width/2 +getPosition(clickAnimation.uids[clickAnimation.index]).x*canvas.scalingFactor*.5
-                    pointer.y= root.height/2 -pointer.height/2 +getPosition(clickAnimation.uids[clickAnimation.index]).y*canvas.scalingFactor*.5
-                    pointer.rotation=Math.atan2(getPosition(clickAnimation.uids[clickAnimation.index]).y*canvas.scalingFactor, getPosition(clickAnimation.uids[clickAnimation.index]).x*canvas.scalingFactor)*180.0/Math.PI
-                    pointingAnimation.restart()
-                }
-            }
-
-            PauseAnimation { duration: 3000 }
-        }
-        PauseAnimation { duration: 1000 }
-
-        SequentialAnimation{
-            id: navigationAnimation
-            PropertyAction { target: handImage; property: "mirror"; value: false}
-            PropertyAction { target: instructionText; property: "text"; value: "Use the Arrow to navigate"}
-            PropertyAction { target: instructionText2; property: "text"; value: "between applications"}
-            ScriptAction{
-                script: {
-                    highlight.size= Math.min(root.width, root.height)*.4
-
-                    var _x=0;
-                    var _y=0;
-
-                    if (root.width > root.height){
-                        _x = navigationPanel.x+navigationPanel.width /2
-                        _y = navigationPanel.y+navigationPanel.height*.33
-                        pointer.x= root.width/2 -pointer.width/2 +root.width*.2
-                        pointer.y= root.height/2 -pointer.height/2
-                        highlight.x=_x
-                        highlight.y=_y
-
-                    }else{
-                        _x=navigationPanel.x+navigationPanel.width*.33
-                        _y=navigationPanel.y + navigationPanel.height /2
-                        pointer.x= root.width/2 -pointer.width/2
-                        pointer.y= root.height/2 -pointer.height/2 +root.height*.2
-                        highlight.x=_x
-                        highlight.y=_y
-                    }
-
-                    pointer.rotation=Math.atan2(_y-(pointer.y+pointer.height/2), _x-(pointer.x+pointer.width/2))*180.0/Math.PI
-
-                    pointingAnimation.restart()
-                }
-            }
-            PauseAnimation { duration: 5000 }
-
-            PropertyAction { target: instructionText; property: "text"; value: "Use the Home button to"}
-            PropertyAction { target: instructionText2; property: "text"; value: "return to the beginning"}
-            ScriptAction{
-                script: {
-                    highlight.size= Math.min(root.width, root.height)*.3
-
-                    var _x=0;
-                    var _y=0;
-
-                    if (root.width > root.height){
-                        _x = navigationPanel.x+navigationPanel.width /2
-                        _y = navigationPanel.y+navigationPanel.height-navigationPanel.width /2
-                        pointer.x= root.width/2 -pointer.width/2 +root.width*.2
-                        pointer.y= root.height/2 -pointer.height/2
-                        highlight.x=_x
-                        highlight.y=_y
-
-                    }else{
-                        _x=navigationPanel.x+navigationPanel.width-navigationPanel.height /2
-                        _y=navigationPanel.y + navigationPanel.height /2
-                        pointer.x= root.width/2 -pointer.width/2
-                        pointer.y= root.height/2 -pointer.height/2 +root.height*.2
-                        highlight.x=_x
-                        highlight.y=_y
-                    }
-                    pointer.rotation=Math.atan2(_y-(pointer.y+pointer.height/2), _x-(pointer.x+pointer.width/2))*180.0/Math.PI
-
-                    pointingAnimation.restart()
-                }
-            }
-            PauseAnimation { duration: 5000 }
-        }
-
-    }
-
-    onWidthChanged: if (visible) show()
-    onHeightChanged: if (visible) show()
-
-    function show(){
-        highlight.hidden = true
-
-        pointer.visible = false
-        rotationAngle = 0
-
-        startAnimations()
-        visible = true
-    }
-
-    function startAnimations(){
-        pointingAnimation.restart()
-        helpAnimation.restart()
-    }
-
-    function stopAnimations(){
-        pointingAnimation.stop()
-        helpAnimation.stop()
-    }
-
-    MouseArea{
-        anchors.fill: root
-        onClicked: {
-            stopAnimations()
-            closeAnimation.restart()
-        }
-    }
-}
-
diff --git a/basicsuite/qt5-everywhere/IslandElementContainer.qml b/basicsuite/qt5-everywhere/IslandElementContainer.qml
deleted file mode 100644
index 66d1e64..0000000
--- a/basicsuite/qt5-everywhere/IslandElementContainer.qml
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: elementContainer
-
-    width: place == 2 ? parent.width : (islandWidth-parent.width)/2
-    height: place == 2 ? 0.1*islandHeight : 0.4*islandHeight
-    x: place == 0 ? -width : place == 1 ? parent.width : 0
-    y: place == 2 ? parent.height : (parent.height - height*0.6)
-
-    property int place : 0
-    property int itemWidth : islandWidth * 0.1
-    property int islandWidth: 100
-    property int islandHeight: 100
-
-    function createElement(xx, yy, itemId) {
-        var component = Qt.createComponent("Element.qml")
-        if (component.status === Component.Ready)
-            component.createObject(elementContainer, {"x": xx, "y": yy, "itemId": itemId});
-    }
-
-    function createElements()
-    {
-        // Left side
-        if (place === 0) {
-            var temp0 = Math.floor(Math.random()*6.9);
-            switch(temp0) {
-            case 0:
-                createElement(elementContainer.width*0.4, elementContainer.height*0.2, 1);
-                createElement(elementContainer.width*0.25, elementContainer.height*0.3, 1);
-                createElement(elementContainer.width*0.15, elementContainer.height*0.5, 1);
-                createElement(elementContainer.width*0.55, elementContainer.height*0.4, 1);
-                break;
-            case 1:
-                createElement(elementContainer.width*0.6, elementContainer.height*0.1, 1);
-                createElement(elementContainer.width*0.4, elementContainer.height*0.2, 1);
-                createElement(elementContainer.width*0.7, elementContainer.height*0.3, 1);
-                createElement(elementContainer.width*0.3, elementContainer.height*0.5, 1);
-                break;
-            case 2:
-                createElement(elementContainer.width*0.6, elementContainer.height*0.1, 3);
-                createElement(elementContainer.width*0.4, elementContainer.height*0.6, 4);
-                createElement(elementContainer.width*0.8, elementContainer.height*0.8, 4);
-                break;
-            case 3:
-                createElement(elementContainer.width*0.6, elementContainer.height*0.1, 3);
-                createElement(elementContainer.width*0.4, elementContainer.height*0.4, 1);
-                createElement(elementContainer.width*0.5, elementContainer.height*0.5, 2);
-                createElement(elementContainer.width*0.7, elementContainer.height*0.6, 2);
-                break;
-            case 4:
-            case 5:
-                var characterId = 10 + Math.floor(Math.random()*5.9);
-                createElement(elementContainer.width*0.7, elementContainer.height*0.3, characterId);
-                break;
-            default: break;
-            }
-        }
-        else if (place === 1) {
-            var temp1 = Math.floor(Math.random()*6.9);
-            switch(temp1) {
-            case 0:
-                createElement(elementContainer.width*0.6, elementContainer.height*0.2, 1);
-                createElement(elementContainer.width*0.75, elementContainer.height*0.3, 1);
-                createElement(elementContainer.width*0.85, elementContainer.height*0.5, 1);
-                createElement(elementContainer.width*0.45, elementContainer.height*0.4, 1);
-                break;
-            case 1:
-                createElement(elementContainer.width*0.4, elementContainer.height*0.1, 1);
-                createElement(elementContainer.width*0.6, elementContainer.height*0.2, 1);
-                createElement(elementContainer.width*0.3, elementContainer.height*0.3, 1);
-                createElement(elementContainer.width*0.7, elementContainer.height*0.5, 1);
-                break;
-            case 2:
-                createElement(elementContainer.width*0.4, elementContainer.height*0.1, 3);
-                createElement(elementContainer.width*0.6, elementContainer.height*0.6, 4);
-                createElement(elementContainer.width*0.2, elementContainer.height*0.8, 4);
-                break;
-            case 3:
-                createElement(elementContainer.width*0.4, elementContainer.height*0.1, 3);
-                createElement(elementContainer.width*0.6, elementContainer.height*0.4, 2);
-                createElement(elementContainer.width*0.5, elementContainer.height*0.5, 1);
-                createElement(elementContainer.width*0.3, elementContainer.height*0.6, 2);
-                break;
-            case 4:
-            case 5:
-                var characterId1 = 20 + Math.floor(Math.random()*4.9);
-                createElement(elementContainer.width*0.3, elementContainer.height*0.3, characterId1);
-                break;
-            default: break;
-            }
-        }
-        else {
-            var temp2 = Math.floor(Math.random()*4.9);
-            switch(temp2) {
-            case 0:
-                createElement(elementContainer.width*0.8, elementContainer.height*0.8, 5);
-                createElement(elementContainer.width*0.4, elementContainer.height*0.5, 5);
-                break;
-            case 1:
-                createElement(elementContainer.width*0.1, elementContainer.height*0.5, 1);
-                createElement(elementContainer.width*0.2, elementContainer.height*0.9, 2);
-                createElement(elementContainer.width*0.6, elementContainer.height*0.8, 4);
-                break;
-            case 2:
-                createElement(elementContainer.width*0.2, elementContainer.height*0.5, 6);
-                createElement(elementContainer.width*0.7, elementContainer.height*0.6, 2);
-                createElement(elementContainer.width*0.6, elementContainer.height*0.7, 1);
-                break;
-            case 3:
-                createElement(elementContainer.width*0.2, elementContainer.height*0.8, 6);
-                createElement(elementContainer.width*0.7, elementContainer.height*0.6, 6);
-                break;
-            default: break;
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/NavigationPanel.qml b/basicsuite/qt5-everywhere/NavigationPanel.qml
deleted file mode 100644
index 62d542b..0000000
--- a/basicsuite/qt5-everywhere/NavigationPanel.qml
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Grid {
-    id: root
-
-    function checkOrientation() {
-        root.spacing = (app.height + app.width) * 0.02
-
-        if (app.width >= app.height) {
-            root.columns = 1
-            root.anchors.bottom = undefined
-            root.anchors.horizontalCenter = undefined
-            root.anchors.right = app.right
-            root.anchors.verticalCenter = app.verticalCenter
-            root.anchors.rightMargin = app.width * 0.02
-            root.anchors.bottomMargin = 0
-        }
-        else {
-            root.columns = 3
-            root.anchors.right = undefined
-            root.anchors.verticalCenter = undefined
-            root.anchors.bottom = app.bottom
-            root.anchors.horizontalCenter = app.horizontalCenter
-            root.anchors.rightMargin = 0
-            root.anchors.bottomMargin = app.width * 0.02
-        }
-    }
-
-    Button {
-        id: nextButton
-        imageSource: "images/btn_next.png"
-        onClicked: canvas.goNext()
-    }
-
-    Button {
-        id: prevButton
-        imageSource: "images/btn_previous.png"
-        onClicked: canvas.goPrevious()
-    }
-
-    Button {
-        id: homeButton
-        imageSource: app.navigationState === 0 && !helpscreen.visible ? "images/btn_help.png" : "images/btn_home.png"
-        onClicked: {
-            if (app.navigationState===0){
-                helpscreen.show()
-                return;
-            }
-            canvas.goBack()
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/QtLogo.png b/basicsuite/qt5-everywhere/QtLogo.png
deleted file mode 100644
index 7b5c533..0000000
--- a/basicsuite/qt5-everywhere/QtLogo.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/QuitDialog.qml b/basicsuite/qt5-everywhere/QuitDialog.qml
deleted file mode 100644
index c246fc7..0000000
--- a/basicsuite/qt5-everywhere/QuitDialog.qml
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    anchors.fill: parent
-    color: Qt.rgba(0.0, 0.0, 0.0, 0.7)
-
-    signal yes()
-    signal no()
-
-    MouseArea {
-        anchors.fill: parent
-    }
-
-    Rectangle {
-        id: dialog
-        anchors.centerIn: parent
-        width: dialogText.paintedWidth * 1.1
-        height: parent.height * 0.3
-        property double dialogMargin: height * 0.05
-
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "#222222" }
-            GradientStop { position: 0.3; color: "#000000" }
-            GradientStop { position: 1.0; color: "#111111" }
-        }
-        radius: 10
-        border { color: "#999999"; width: 1 }
-
-        Item {
-            id: content
-            anchors { left: parent.left; right: parent.right; top: parent.top }
-            height: dialog.height * 0.6
-
-            Text {
-                id: dialogText
-                anchors.centerIn: parent
-                verticalAlignment: Text.AlignVCenter
-                text: qsTr("Are you sure you want to quit?")
-                color: "#ffffff"
-                font.pixelSize: 0.2 *content.height
-            }
-        }
-
-        Rectangle {
-            id: line
-            anchors { left: parent.left; right: parent.right; top: content.bottom }
-            anchors.leftMargin: dialog.dialogMargin
-            anchors.rightMargin: dialog.dialogMargin
-            height: 1
-            color: "#777777"
-        }
-
-        DialogButton {
-            anchors { bottom: dialog.bottom; left:dialog.left; bottomMargin: dialog.dialogMargin; leftMargin: dialog.dialogMargin }
-            buttonText: "Yes"
-            onClicked: root.yes()
-        }
-        DialogButton {
-            anchors { bottom: dialog.bottom; right:dialog.right; bottomMargin: dialog.dialogMargin; rightMargin: dialog.dialogMargin }
-            buttonText: "No"
-            onClicked: root.no()
-        }
-
-    }
-
-}
diff --git a/basicsuite/qt5-everywhere/Slide.qml b/basicsuite/qt5-everywhere/Slide.qml
deleted file mode 100644
index be94aca..0000000
--- a/basicsuite/qt5-everywhere/Slide.qml
+++ /dev/null
@@ -1,252 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "style.js" as Style
-
-Item {
-    id: slide
-    objectName: "slide"
-
-    property int uid: 0
-    property int gid: 0
-    property string url: ""
-    property int device: 0
-    property string imageSource: ""
-    property bool loaded: false
-    property bool loading: false
-    property real targetScale: 1
-    property bool animationRunning: navigationAnimation.running || zoomAnimation.running
-    property int demoWidth: 603
-    property int demoHeight: 378
-    property int maskVerticalOffset: 51
-    property int maskHorizontalOffset: 1
-    property string demoColor: "#4353c3"
-    property string name: ""
-
-    function targetWidth()
-    {
-        return demoWidth*scale;
-    }
-
-    function targetHeight()
-    {
-        return demoHeight*scale;
-    }
-
-    Rectangle {
-        id: demoBackground
-        anchors.centerIn: parent
-        width: demoContainer.width * 1.03
-        height: demoContainer.height * 1.03
-        color: "black"
-        z: slide.loading || slide.loaded ? 1:-1
-
-        Rectangle{
-            id: demoContainer
-            anchors.centerIn: parent
-            width: demoWidth
-            height: demoHeight
-            color: demoColor
-            clip: true
-
-            Text {
-                id: splashScreenText
-                color: 'white'
-                font.pixelSize: parent.width *.2
-                font.family: Style.FONT_FAMILY
-                text: slide.name
-                anchors.centerIn: parent
-                smooth: true
-                visible: true
-            }
-        }
-    }
-
-    ShaderEffectSource{
-        id: demo
-        anchors.centerIn: parent
-        width: demoWidth
-        height: demoHeight
-        sourceItem: demoContainer
-        live: false
-        visible: (hasSnapshot && !slide.loaded) || updating
-        hideSource: visible && !updating && !loading
-        clip: true
-
-        property bool updating: false
-        property bool hasSnapshot: false
-
-        onScheduledUpdateCompleted: {
-            updating = false
-            hasSnapshot = true
-            releaseDemo(true)
-        }
-    }
-
-    Image {
-        id: deviceMaskImage
-        anchors.centerIn: parent
-        anchors.verticalCenterOffset: maskVerticalOffset
-        anchors.horizontalCenterOffset: maskHorizontalOffset
-        smooth: !animationRunning
-        antialiasing: !animationRunning
-        source: slide.imageSource
-        width: slide.width
-        height: slide.height
-        z: 2
-
-        IslandElementContainer { id: leftElementcontainer; place: 0; islandHeight: islandImage.height; islandWidth: islandImage.width }
-        IslandElementContainer { id: rightElementcontainer;place: 1; islandHeight: islandImage.height; islandWidth: islandImage.width }
-        IslandElementContainer { id: bottomElementcontainer;place: 2; islandHeight: islandImage.height; islandWidth: islandImage.width }
-    }
-
-    Image {
-        id: islandImage
-        anchors.top: deviceMaskImage.bottom
-        anchors.topMargin: -height * 0.3
-        anchors.horizontalCenter: deviceMaskImage.horizontalCenter
-        source: "images/island.png"
-        smooth: !animationRunning
-        antialiasing: !animationRunning
-        width: Math.max(deviceMaskImage.width, deviceMaskImage.height) * 1.6
-        height: width/2
-        z: -3
-    }
-
-    // Load timer
-    Timer {
-        id: loadTimer
-        interval: 5
-        running: false
-        repeat: false
-        onTriggered: {
-            loadSplashScreen();
-            load()
-        }
-    }
-
-    function loadDemo(){
-        if (!slide.loaded)
-        {
-            splashScreenText.visible = true
-            loadTimer.start();
-        } else if (slide.url==="demos/radio/radio.qml"){
-            for (var i =0; i<demoContainer.children.length; i++){
-                if (demoContainer.children[i].objectName === "demoApp"){
-                    demoContainer.children[i].focus = true;
-                }
-            }
-        }
-    }
-
-    function load() {
-        if (!slide.url || slide.loaded) return;
-
-        print("CREATING DEMO: "+ slide.url)
-        var component = Qt.createComponent(slide.url);
-        print ("CREATED: "+slide.url)
-        var incubator = component.incubateObject(demoContainer, { x: 0, y: 0, objectName: "demoApp" });
-        if (incubator.status !== Component.Ready) {
-            incubator.onStatusChanged = function(status) {
-                if (status === Component.Ready) {
-                    print ("Object", incubator.object, "is now ready!");
-                    slide.loaded = true
-                    releaseSplashScreen()
-                }
-            }
-        } else {
-            print ("Object", incubator.object, "is ready immediately!");
-            slide.loaded = true
-            releaseSplashScreen()
-        }
-    }
-
-    function loadSplashScreen()
-    {
-        slide.loading = true
-        var splash = Qt.createComponent("SplashScreen.qml");
-        if (splash.status === Component.Ready)
-            splash.createObject(demoContainer, {objectName: "splashScreen", text: slide.name});
-    }
-
-    function releaseSplashScreen()
-    {
-        splashScreenText.visible = false
-        slide.loading = false
-        for (var i =0; i<demoContainer.children.length; i++){
-            if (demoContainer.children[i].objectName === "splashScreen"){
-                demoContainer.children[i].explode();
-            }
-        }
-    }
-
-    function releaseDemo(snapShotCreated){
-        if (!slide.loaded) return;
-        if (!snapShotCreated){
-            demo.updating = true
-            demo.scheduleUpdate()
-            return;
-        }
-
-        if (slide.url === "demos/radio/radio.qml")
-            return; //Always alive
-
-        app.forceActiveFocus();
-
-        if (!slide.loaded)
-            return;
-
-        slide.loaded = false;
-
-        for (var i =0; i<demoContainer.children.length; i++){
-            if (demoContainer.children[i].objectName === "demoApp"){
-                demoContainer.children[i].destroy(500);
-            }
-        }
-    }
-
-    function createElements()
-    {
-        leftElementcontainer.createElements()
-        rightElementcontainer.createElements()
-        bottomElementcontainer.createElements()
-    }
-}
diff --git a/basicsuite/qt5-everywhere/SplashScreen.qml b/basicsuite/qt5-everywhere/SplashScreen.qml
deleted file mode 100644
index 10b99a5..0000000
--- a/basicsuite/qt5-everywhere/SplashScreen.qml
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "style.js" as Style
-//based on the SmokeText component from SameGame
-
-Item {
-    id: root
-    anchors.fill: parent
-    z:1
-
-    property alias text: txt.text
-
-    Rectangle{
-        id: background
-        anchors.fill:parent
-        color: "black"
-    }
-
-    ParticleSystem{
-        id: particleSystem;
-        anchors.fill: parent
-
-        Text {
-            id: txt
-            color: 'white'
-            font.pixelSize: parent.width *.2
-            font.family: Style.FONT_FAMILY
-            anchors.centerIn: parent
-            smooth: true
-        }
-
-        Emitter {
-            id: emitter
-            anchors.fill: txt
-            enabled: false
-            emitRate: 1000
-            lifeSpan: 1500
-            size: parent.height * .2
-            endSize: parent.height * .1
-            velocity: AngleDirection { angleVariation: 360; magnitudeVariation: 160 }
-        }
-
-        ImageParticle {
-            id: smokeParticle
-            source: "images/particle-smoke.png"
-            alpha: 0.1
-            alphaVariation: 0.1
-            color: 'white'
-        }
-    }
-
-    SequentialAnimation {
-        id: anim
-        running: false
-        ScriptAction { script: emitter.pulse(100); }
-        NumberAnimation { target: txt; property: "opacity"; from: 1.0; to: 0.0; duration: 400}
-        NumberAnimation { target: background; property: "opacity"; from: 1.0; to: 0.0; duration: 1000}
-        PauseAnimation { duration: 200 }
-        onRunningChanged: if (!running) root.destroy();
-    }
-
-    function explode(){
-        anim.restart()
-    }
-}
diff --git a/basicsuite/qt5-everywhere/WorldCanvas.qml b/basicsuite/qt5-everywhere/WorldCanvas.qml
deleted file mode 100644
index 0972cf2..0000000
--- a/basicsuite/qt5-everywhere/WorldCanvas.qml
+++ /dev/null
@@ -1,145 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "style.js" as Style
-
-Item{
-    id:canvas
-    width:1
-    height:1
-
-    x: app.width/2+xOffset
-    y: app.height/2+yOffset
-
-    property real xOffset: 0
-    property real yOffset: 0
-    property real angle: 0
-
-    property real zoomInTarget: 5
-    property real scalingFactor: 5
-
-    property real rotationOriginX
-    property real rotationOriginY
-
-    function goHome()
-    {
-        worldMouseArea.panning = false
-        xOffset = 0; //(app.homeCenterX * app.homeScaleFactor);
-        yOffset = 0; //(-app.homeCenterY * app.homeScaleFactor);
-        rotationOriginX = 0;
-        rotationOriginY = 0;
-        angle = 0;
-        zoomInTarget = app.homeScaleFactor;
-        app.navigationState = 0 //home
-        app.forceActiveFocus()
-        zoomAnimation.restart();
-    }
-    function goTo(target, updateScalingFactor)
-    {
-        if (target)
-        {
-            worldMouseArea.panning = false
-            xOffset = -target.x;
-            yOffset = -target.y;
-            rotationOriginX = target.x;
-            rotationOriginY = target.y;
-            angle = 0
-            zoomInTarget = target.targetScale;
-            if (updateScalingFactor)
-                scalingFactor = zoomInTarget
-            app.navigationState = target.navState
-        }
-    }
-
-    function goNext() {
-        goTo(app.getNext(), false);
-        navigationAnimation.restartAnimation()
-    }
-    function goPrevious() {
-        goTo(app.getPrevious(), false);
-        navigationAnimation.restartAnimation()
-    }
-
-    function goBack()
-    {
-        if (app.useGroups && app.navigationState == 2) {
-            goTo(app.getCurrentGroup(), false)
-            zoomAnimation.restart()
-        }
-        else
-            canvas.goHome()
-    }
-
-    Behavior on xOffset {
-        id: xOffsetBehaviour
-        enabled: !worldMouseArea.panning
-        NumberAnimation{duration: Style.APP_ANIMATION_DELAY}
-    }
-
-    Behavior on yOffset {
-        id: yOffsetBehaviour
-        enabled: !worldMouseArea.panning
-        NumberAnimation{duration: Style.APP_ANIMATION_DELAY}
-    }
-
-    Behavior on rotationOriginX {
-        NumberAnimation{
-            duration: Style.APP_ANIMATION_DELAY
-        }
-    }
-    Behavior on rotationOriginY {
-        NumberAnimation{
-            duration: Style.APP_ANIMATION_DELAY
-        }
-    }
-
-    transform: [
-
-        Scale{
-            id: canvasScale
-            origin.x: canvas.rotationOriginX
-            origin.y: canvas.rotationOriginY
-            xScale: canvas.scalingFactor
-            yScale :canvas.scalingFactor
-
-        }
-    ]
-}
diff --git a/basicsuite/qt5-everywhere/WorldMouseArea.qml b/basicsuite/qt5-everywhere/WorldMouseArea.qml
deleted file mode 100644
index f3a6620..0000000
--- a/basicsuite/qt5-everywhere/WorldMouseArea.qml
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-MouseArea{
-    id: worldMouseArea
-    anchors.fill: parent
-
-    property int oldX: 0
-    property int oldY: 0
-    property int startMouseX: 0
-    property int startMouseY: 0
-    property bool panning: false
-
-    onReleased: {
-        var dx = mouse.x - startMouseX;
-        var dy = mouse.y - startMouseY;
-
-        // Check the point only if we didn't move the mouse too much
-        if (!mouse.wasHeld && Math.abs(dx) <= app.tapLimitX && Math.abs(dy) <= app.tapLimitY)
-        {
-            panning = false
-            var target = null;
-            var object = mapToItem(canvas, mouse.x, mouse.y)
-            var item = canvas.childAt(object.x,object.y)
-            if (item) {
-                if (item.objectName === 'slide')
-                    target = app.selectTarget(item.uid)
-                else if (item.objectName === 'group')
-                    target = app.selectGroup(item.uid)
-            }
-
-            // If we found target, go to the target
-            if (target) {
-                canvas.goTo(target, false, item.objectName === 'slide' ? 2 : 1)
-                zoomAnimation.restart()
-            }
-            else // If not target under mouse -> go home
-                canvas.goHome()
-        }
-    }
-
-    onPressed: {
-        // Save mouse state
-        oldX = mouse.x
-        oldY = mouse.y
-        startMouseX = mouse.x
-        startMouseY = mouse.y
-    }
-
-    onPositionChanged: {
-        var dx = mouse.x - oldX;
-        var dy = mouse.y - oldY;
-
-        oldX = mouse.x;
-        oldY = mouse.y;
-
-        if (!zoomAnimation.running && !navigationAnimation.running)
-        {
-            panning = true;
-            canvas.xOffset += dx;
-            canvas.yOffset += dy;
-            app.navigationState = 3 //dirty
-        }
-    }
-    onWheel: {
-        var newScalingFactor = canvas.scalingFactor
-        if (wheel.angleDelta.y > 0){
-            newScalingFactor+=canvas.scalingFactor*.05
-        }else{
-            newScalingFactor-=canvas.scalingFactor*.05
-        }
-        if (newScalingFactor < app.minScaleFactor) newScalingFactor = app.minScaleFactor
-        if (newScalingFactor > app.maxScaleFactor) newScalingFactor = app.maxScaleFactor
-        canvas.scalingFactor = newScalingFactor
-    }
-}
diff --git a/basicsuite/qt5-everywhere/app.pro b/basicsuite/qt5-everywhere/app.pro
deleted file mode 100644
index be46a9c..0000000
--- a/basicsuite/qt5-everywhere/app.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TARGET = qt5-everywhere
-
-include(../shared/shared.pri)
-b2qtdemo_deploy_defaults()
-
-content.files = \
-    *.qml \
-    *.js \
-    fonts \
-    images \
-    demos
-content.path = $$DESTPATH
-
-OTHER_FILES += $${content.files}
-
-INSTALLS += target content
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/Calqlatr.qml b/basicsuite/qt5-everywhere/demos/calqlatr/Calqlatr.qml
deleted file mode 100644
index 39a0834..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/Calqlatr.qml
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "content"
-import "content/calculator.js" as CalcEngine
-
-
-Rectangle {
-    id: window
-    anchors.fill: parent
-    color: "#272822"
-
-    function operatorPressed(operator) { CalcEngine.operatorPressed(operator) }
-    function digitPressed(digit) { CalcEngine.digitPressed(digit) }
-
-    Item {
-        id: pad
-        width: window.width * 0.58
-        height: window.height * 0.98
-        NumberPad { anchors.horizontalCenter: parent.horizontalCenter }
-    }
-
-    AnimationController {
-        id: controller
-        animation: ParallelAnimation {
-            id: anim
-            NumberAnimation { target: display; property: "x"; duration: 400; from: -16; to: window.width - display.width; easing.type: Easing.InOutQuad }
-            NumberAnimation { target: pad; property: "x"; duration: 400; from: window.width - pad.width; to: 0; easing.type: Easing.InOutQuad }
-            SequentialAnimation {
-                NumberAnimation { target: pad; property: "scale"; duration: 200; from: 1; to: 0.97; easing.type: Easing.InOutQuad }
-                NumberAnimation { target: pad; property: "scale"; duration: 200; from: 0.97; to: 1; easing.type: Easing.InOutQuad }
-            }
-        }
-    }
-
-    Display {
-        id: display
-        x: -16
-        width: window.width * 0.42
-        height: parent.height
-
-        MouseArea {
-            property real startX: 0
-            property real oldP: 0
-            property bool rewind: false
-
-            anchors.fill: parent
-            onPositionChanged: {
-                var reverse = startX > window.width / 2
-                var mx = mapToItem(window, mouse.x).x
-                var p = Math.abs((mx - startX) / (window.width - display.width))
-                if (p < oldP)
-                    rewind = reverse ? false : true
-                else
-                    rewind = reverse ? true : false
-                controller.progress = reverse ? 1 - p : p
-                oldP = p
-            }
-            onPressed: startX = mapToItem(window, mouse.x).x
-            onReleased: {
-                if (rewind)
-                    controller.completeToBeginning()
-                else
-                    controller.completeToEnd()
-            }
-        }
-    }
-
-}
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/Button.qml b/basicsuite/qt5-everywhere/demos/calqlatr/content/Button.qml
deleted file mode 100644
index 6165ed3..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/Button.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    property alias text: textItem.text
-    property alias color: textItem.color
-    property bool operator: false
-
-    signal clicked
-
-    width: 0.33*pad.width
-    height: pad.height/7
-
-    Text {
-        id: textItem
-        anchors.centerIn: parent
-        horizontalAlignment: Text.AlignHCenter
-        font.pixelSize: parent.height * 0.6
-        elide: Text.ElideLeft
-        lineHeight: 0.75
-        color: "white"
-    }
-
-    Image {
-        id: touchImage
-        source: "images/touch-green.png"
-        anchors.centerIn: parent
-        width: 2*parent.height
-        height: 2*parent.height
-        visible: false
-    }
-
-    MouseArea {
-        id: mouse
-        anchors.fill: parent
-        anchors.margins: -5
-        onPressed: touchImage.visible = true
-        onReleased: touchImage.visible = false
-        onClicked: {
-            if (operator)
-                window.operatorPressed(parent.text)
-            else
-                window.digitPressed(parent.text)
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/Display.qml b/basicsuite/qt5-everywhere/demos/calqlatr/content/Display.qml
deleted file mode 100644
index df3bfa2..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/Display.qml
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: display
-    function clearAll()
-    {
-        listView.model.clear();
-    }
-
-    function displayOperator(operator)
-    {
-        listView.model.append({ "operator": operator, "operand": "" })
-    }
-
-    function newLine(operator, operand)
-    {
-        listView.model.append({ "operator": operator, "operand": operand })
-    }
-
-    function appendDigit(digit)
-    {
-        if (!listView.model.count)
-            listView.model.append({ "operator": "", "operand": "" })
-        var i = listView.model.count - 1;
-        listView.model.get(i).operand = listView.model.get(i).operand + digit;
-    }
-
-    Item {
-        id: theItem
-        width: parent.width + 32
-        height: parent.height
-
-        Rectangle {
-            id: rect
-            x: 16
-            color: "white"
-            height: parent.height
-            width: display.width - 16
-        }
-        Image {
-            anchors.right: rect.left
-            source: "images/paper-edge-left.png"
-            height: parent.height
-            fillMode: Image.TileVertically
-        }
-        Image {
-            anchors.left: rect.right
-            source: "images/paper-edge-right.png"
-            height: parent.height
-            fillMode: Image.TileVertically
-        }
-
-        Image {
-            source: "images/paper-grip.png"
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 20
-        }
-
-        ListView {
-            id: listView
-            x: 16; y: 30
-            width: display.width
-            height: display.height
-            delegate: Item {
-                height: 20
-                width: parent.width
-                Text {
-                    id: operator
-                    x: 8
-                    font.pixelSize: 18
-                    color: "#6da43d"
-                    text: model.operator
-                }
-                Text {
-                    id: operand
-                    font.pixelSize: 18
-                    anchors.right: parent.right
-                    anchors.rightMargin: 26
-                    text: model.operand
-                }
-            }
-            model: ListModel { }
-        }
-
-    }
-
-}
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/NumberPad.qml b/basicsuite/qt5-everywhere/demos/calqlatr/content/NumberPad.qml
deleted file mode 100644
index 454c50d..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/NumberPad.qml
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Grid {
-    columns: 3
-    columnSpacing: 0
-    rowSpacing: 0
-
-    Button { text: "7" }
-    Button { text: "8" }
-    Button { text: "9" }
-    Button { text: "4" }
-    Button { text: "5" }
-    Button { text: "6" }
-    Button { text: "1" }
-    Button { text: "2" }
-    Button { text: "3" }
-    Button { text: "0" }
-    Button { text: "." }
-    Button { text: " " }
-    Button { text: "±"; color: "#6da43d"; operator: true }
-    Button { text: "−"; color: "#6da43d"; operator: true }
-    Button { text: "+"; color: "#6da43d"; operator: true }
-    Button { text: " "; color: "#6da43d"; operator: true }
-    Button { text: "÷"; color: "#6da43d"; operator: true }
-    Button { text: "×"; color: "#6da43d"; operator: true }
-    Button { text: "C"; color: "#6da43d"; operator: true }
-    Button { text: " "; color: "#6da43d"; operator: true }
-    Button { text: "="; color: "#6da43d"; operator: true }
-}
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/StyleLabel.qml b/basicsuite/qt5-everywhere/demos/calqlatr/content/StyleLabel.qml
deleted file mode 100644
index 3bdea86..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/StyleLabel.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Text {
-    width: 64
-    font.pixelSize: 14
-    font.bold: false
-    wrapMode: Text.WordWrap
-    lineHeight: 0.75
-    color: "#676764"
-}
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/audio/touch.wav b/basicsuite/qt5-everywhere/demos/calqlatr/content/audio/touch.wav
deleted file mode 100644
index 94cccb7..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/audio/touch.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/calculator.js b/basicsuite/qt5-everywhere/demos/calqlatr/content/calculator.js
deleted file mode 100644
index ffc78bf..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/calculator.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-var curVal = 0
-var memory = 0
-var lastOp = ""
-var previousOperator = ""
-var digits = ""
-
-function disabled(op) {
-    if (op == "." && digits.toString().search(/\./) != -1) {
-        return true
-    } else if (op == window.squareRoot &&  digits.toString().search(/-/) != -1) {
-        return true
-    } else {
-        return false
-    }
-}
-
-function digitPressed(op)
-{
-    if (lastOp == "=")
-        display.newLine("", "");
-
-    if (disabled(op))
-        return
-    if (digits.toString().length >= 14)
-        return
-    if (lastOp.toString().length == 1 && ((lastOp >= "0" && lastOp <= "9") || lastOp == ".") ) {
-        digits = digits + op.toString()
-        display.appendDigit(op.toString())
-    } else {
-        digits = op
-        display.appendDigit(op.toString())
-    }
-    lastOp = op
-}
-
-function operatorPressed(op)
-{
-    if (disabled(op))
-        return
-    lastOp = op
-
-    if (previousOperator == "+") {
-        digits = Number(digits.valueOf()) + Number(curVal.valueOf())
-    } else if (previousOperator == "−") {
-        digits = Number(curVal) - Number(digits.valueOf())
-    } else if (previousOperator == "×") {
-        digits = Number(curVal) * Number(digits.valueOf())
-    } else if (previousOperator == "÷") {
-        digits = Number(Number(curVal) / Number(digits.valueOf())).toString()
-    } else if (previousOperator == "=") {
-    }
-
-    if (op == "+" || op == "−" || op == "×" || op == "÷") {
-        previousOperator = op
-        curVal = digits.valueOf()
-        display.displayOperator(previousOperator)
-        return
-    }
-
-    if (op == "=") {
-        display.newLine("=", digits.toString())
-    }
-
-    curVal = 0
-    previousOperator = ""
-
-    if (op == "1/x") {
-        digits = (1 / digits.valueOf()).toString()
-    } else if (op == "x^2") {
-        digits = (digits.valueOf() * digits.valueOf()).toString()
-    } else if (op == "Abs") {
-        digits = (Math.abs(digits.valueOf())).toString()
-    } else if (op == "Int") {
-        digits = (Math.floor(digits.valueOf())).toString()
-    } else if (op == window.plusminus) {
-        digits = (digits.valueOf() * -1).toString()
-    } else if (op == window.squareRoot) {
-        digits = (Math.sqrt(digits.valueOf())).toString()
-    } else if (op == "mc") {
-        memory = 0;
-    } else if (op == "m+") {
-        memory += digits.valueOf()
-    } else if (op == "mr") {
-        digits = memory.toString()
-    } else if (op == "m-") {
-        memory = digits.valueOf()
-    } else if (op == window.leftArrow) {
-        digits = digits.toString().slice(0, -1)
-        if (digits.length == 0) {
-            digits = "0"
-        }
-    } else if (op == "Off") {
-        Qt.quit();
-    } else if (op == "C") {
-        curVal = 0
-        memory = 0
-        lastOp = ""
-        digits = ""
-        display.clearAll()
-    } else if (op == "AC") {
-        curVal = 0
-        memory = 0
-        lastOp = ""
-        digits ="0"
-    }
-
-
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-back.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-back.png
deleted file mode 100644
index 2989ee2..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-back.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-close.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-close.png
deleted file mode 100644
index 3e21248..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-close.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-settings.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-settings.png
deleted file mode 100644
index 98e662f..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/icon-settings.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/logo.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/logo.png
deleted file mode 100644
index 6bc6561..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/logo.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-edge-left.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-edge-left.png
deleted file mode 100644
index ca29a3a..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-edge-left.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-edge-right.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-edge-right.png
deleted file mode 100644
index 7c2da7b..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-edge-right.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-grip.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-grip.png
deleted file mode 100644
index 953c408..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/paper-grip.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/settings-selected-a.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/settings-selected-a.png
deleted file mode 100644
index e08ddfa..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/settings-selected-a.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/settings-selected-b.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/settings-selected-b.png
deleted file mode 100644
index d9aa7e3..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/settings-selected-b.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/touch-green.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/touch-green.png
deleted file mode 100644
index 64dbde6..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/touch-green.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/touch-white.png b/basicsuite/qt5-everywhere/demos/calqlatr/content/images/touch-white.png
deleted file mode 100644
index bb02b00..0000000
--- a/basicsuite/qt5-everywhere/demos/calqlatr/content/images/touch-white.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml b/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml
deleted file mode 100644
index 2a79735..0000000
--- a/basicsuite/qt5-everywhere/demos/canvasclock/canvasClock.qml
+++ /dev/null
@@ -1,404 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    anchors.fill: parent
-    property color rimColor: Qt.rgba(1,0,0,1) //'#ff0000'
-    property color dialColor: Qt.rgba(0.2,0.2,0.2,1) //'#333333'
-    property color bgcolor: Qt.rgba(1,1,1,1)
-    property int dialStyle: 0
-    color: "#333333"
-
-    Text{
-        id: codeText
-        anchors {fill:parent}
-        text: ""
-        rotation: 10
-        color: "#666666"
-        font.pixelSize: root.height*.05
-
-        verticalAlignment:Text.AlignBottom
-
-        property int pos: 0
-
-        property string code: "
-var ctx = clockCanvas.getContext('2d')
-ctx.clearRect(0,0,clockContainer.clockRadius,clockContainer.clockRadius)
-
-var gradient = ctx.createRadialGradient(clockContainer.clockRadius/4, clockContainer.clockRadius/4, 0, clockContainer.clockRadius/4, clockContainer.clockRadius/4, clockContainer.clockRadius)
-gradient.addColorStop(0, '#ffffff')
-gradient.addColorStop(1, '#888888')
-
-ctx.fillStyle = gradient
-ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.475, 0, 360, false)
-ctx.fill()
-
-drawDials(ctx)
-
-var gradient2 = ctx.createLinearGradient(0, 0, clockContainer.clockRadius, clockContainer.clockRadius)
-gradient2.addColorStop(0, Qt.rgba(0,0,0,.5))
-gradient2.addColorStop(.5, Qt.rgba(1,1,1,.5))
-gradient2.addColorStop(1, Qt.rgba(0,0,0,.5))
-
-var gradient3 = ctx.createLinearGradient(0, 0, clockContainer.clockRadius, clockContainer.clockRadius)
-gradient3.addColorStop(0, Qt.rgba(1,1,1,.5))
-gradient3.addColorStop(.5, Qt.rgba(0,0,0,.5))
-gradient3.addColorStop(1, Qt.rgba(1,1,1,.5))
-
-ctx.lineWidth = clockContainer.clockRadius*.05
-ctx.strokeStyle = root.rimColor
-
-ctx.beginPath()
-ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.45, 0, 360, false)
-ctx.stroke()
-
-ctx.strokeStyle = gradient2
-ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.45, 0, 360, false)
-ctx.stroke()
-
-ctx.beginPath()
-ctx.strokeStyle = root.rimColor
-ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.475, 0, 360, false)
-ctx.stroke()
-
-ctx.strokeStyle = gradient3
-ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.475, 0, 360, false)
-ctx.stroke()
-ctx.closePath()
-
-function drawPointer(context, angle, len, thickness, color){
-    context.beginPath()
-    context.lineWidth = thickness
-    context.strokeStyle = color
-    context.moveTo(clockContainer.clockRadius/2, clockContainer.clockRadius/2)
-    var x1=Math.cos(angle*0.01745)*len
-    var y1=Math.sin(angle*0.01745)*len
-    context.lineTo(clockContainer.clockRadius/2+.5+x1,clockContainer.clockRadius/2+.5+y1)
-    context.stroke()
-    context.closePath()
-}"
-
-        Timer{
-            id: textTimer
-            interval: 10
-            onTriggered: {
-                codeText.pos++
-                if (codeText.pos >= codeText.code.length)codeText.pos=0
-                codeText.text+=codeText.code.charAt(codeText.pos)
-                if (codeText.text.length >1000){
-                    codeText.text=codeText.text.substring(codeText.text.length-1000)
-                }
-            }
-            repeat: true
-            running: true
-        }
-    }
-
-    Rectangle {
-        anchors.fill: parent
-        gradient: Gradient {
-            GradientStop {position: .0; color :"black"}
-            GradientStop {position: .5; color :"transparent"}
-            GradientStop {position: 1.0; color :"black"}
-
-        }
-        opacity: .5
-    }
-
-    Item {
-        id: clockContainer
-        width: 2* Math.min(root.width*.8, root.height*.8)
-        height: width
-        scale: 0.5
-        anchors.centerIn: parent
-        property int clockRadius: width
-
-        ShaderEffectSource{
-            id: clockBg
-            anchors.fill: parent
-            sourceItem: clockCanvas
-            hideSource: true
-            live: false
-        }
-
-        Canvas {
-            id: clockCanvas
-            anchors.fill: parent
-            onPaint: {
-                var ctx = clockCanvas.getContext('2d')
-
-                ctx.clearRect(0,0,clockContainer.clockRadius,clockContainer.clockRadius)
-
-                var gradient = ctx.createRadialGradient(clockContainer.clockRadius/4, clockContainer.clockRadius/4, 0, clockContainer.clockRadius/4, clockContainer.clockRadius/4, clockContainer.clockRadius)
-
-                ctx.fillStyle = root.bgcolor
-                ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.475, 0, 360, false)
-                ctx.fill()
-
-                gradient.addColorStop(0, Qt.rgba(0,0,0,0))
-                gradient.addColorStop(1, Qt.rgba(0,0,0,.5))
-
-                ctx.fillStyle = gradient
-                ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.475, 0, 360, false)
-                ctx.fill()
-
-                drawDials(ctx)
-
-                var gradient2 = ctx.createLinearGradient(0, 0, clockContainer.clockRadius, clockContainer.clockRadius)
-                gradient2.addColorStop(0, Qt.rgba(0,0,0,.5))
-                gradient2.addColorStop(.5, Qt.rgba(1,1,1,.5))
-                gradient2.addColorStop(1, Qt.rgba(0,0,0,.5))
-
-                var gradient3 = ctx.createLinearGradient(0, 0, clockContainer.clockRadius, clockContainer.clockRadius)
-                gradient3.addColorStop(0, Qt.rgba(1,1,1,.5))
-                gradient3.addColorStop(.5, Qt.rgba(0,0,0,.5))
-                gradient3.addColorStop(1, Qt.rgba(1,1,1,.5))
-
-                ctx.lineWidth = clockContainer.clockRadius*.05
-
-                ctx.strokeStyle = root.rimColor
-                ctx.beginPath()
-                ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.45, 0, 360, false)
-                ctx.stroke()
-
-                ctx.strokeStyle = gradient2
-                ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.45, 0, 360, false)
-                ctx.stroke()
-
-                ctx.beginPath()
-                ctx.strokeStyle = root.rimColor
-                ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.475, 0, 360, false)
-                ctx.stroke()
-
-                ctx.strokeStyle = gradient3
-
-                ctx.arc(clockContainer.clockRadius/2, clockContainer.clockRadius/2, clockContainer.clockRadius*.475, 0, 360, false)
-                ctx.stroke()
-                ctx.closePath()
-
-
-                clockBg.scheduleUpdate()
-            }
-
-            function drawDials(context){
-
-                context.strokeStyle = "#888888"
-                context.fillStyle = root.dialColor
-                context.lineWidth = 2
-                context.beginPath()
-                for (var i=1; i<=60; i++){
-                    var x1=Math.cos(((i)*6)*0.01745)*clockContainer.clockRadius*.4
-                    var y1=Math.sin(((i)*6)*0.01745)*clockContainer.clockRadius*.4
-
-                    var x2=Math.cos(((i)*6)*0.01745)*clockContainer.clockRadius*.45
-                    var y2=Math.sin(((i)*6)*0.01745)*clockContainer.clockRadius*.45
-
-                    context.moveTo(clockContainer.clockRadius/2+.5+x1,clockContainer.clockRadius/2+.5+y1)
-                    context.lineTo(clockContainer.clockRadius/2+.5+x2,clockContainer.clockRadius/2+.5+y2)
-                    context.stroke()
-                }
-                context.closePath()
-
-                context.beginPath()
-
-                var romans = ['I','II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X', 'XI', 'XII']
-
-                for (i=1; i<=12; i++){
-                    x1=Math.cos((-90+(i)*30)*0.01745)*clockContainer.clockRadius*.35 -clockContainer.width*0.03
-                    y1=Math.sin((-90+(i)*30)*0.01745)*clockContainer.clockRadius*.35 +clockContainer.height*0.04
-
-                    if (root.dialStyle === 1) x1-=clockContainer.width*0.01
-
-                    context.font = 'bold '+Math.floor(clockContainer.width*.1)+'px sans-serif'
-
-
-                    if (i >= 10)
-                        x1 -= clockContainer.width*0.02
-                    context.textAlign = 'center';
-                    context.textBaseline  = 'middle'
-
-                    var dial = i
-
-                    if (root.dialStyle === 1) dial = romans[i-1]
-                    context.text(dial,clockContainer.clockRadius/2+x1,clockContainer.clockRadius/2+y1)
-
-                    context.fill()
-                    context.stroke()
-                }
-                context.closePath()
-            }
-        }
-
-        Canvas {
-            id: clockPointers
-            anchors.fill: parent
-            antialiasing: true
-            renderTarget: Canvas.Image
-            onPaint: {
-                var ctx = clockPointers.getContext('2d')
-                ctx.clearRect(0,0,clockContainer.clockRadius,clockContainer.clockRadius)
-                ctx.lineCap = 'round'
-                drawPointer(ctx, -90+clock.hours*30, clockContainer.clockRadius*.25, clockContainer.clockRadius*.05, "#000000")
-                drawPointer(ctx, -90+clock.minutes*6, clockContainer.clockRadius*.375, clockContainer.clockRadius*.025, "#333333")
-                drawPointer(ctx, -90+clock.seconds*6, clockContainer.clockRadius*.40, 4, "#aa0000")
-
-                // Draw nail
-                ctx.beginPath()
-                ctx.fillStyle = "#535353"
-                ctx.ellipse(clockContainer.clockRadius/2-16,clockContainer.clockRadius/2-16,32,32)
-                ctx.fill()
-                ctx.closePath()
-            }
-
-            function drawPointer(context, angle, len, thickness, color){
-                context.beginPath()
-                context.lineWidth = thickness
-                context.strokeStyle = color
-                context.moveTo(clockContainer.clockRadius/2, clockContainer.clockRadius/2)
-                var x1=Math.cos(angle*0.01745)*len
-                var y1=Math.sin(angle*0.01745)*len
-                context.lineTo(clockContainer.clockRadius/2+.5+x1,clockContainer.clockRadius/2+.5+y1)
-                context.stroke()
-                context.closePath()
-            }
-        }
-
-        Timer{
-            id: clock
-            interval: 1000
-            repeat: true
-            running: !mouseArea.pressed
-
-            property int hours: 0
-            property int minutes: 0
-            property int seconds: 0
-
-            onTriggered: {
-                seconds ++
-                if (seconds == 60) seconds = 0
-
-                if (seconds == 0) minutes++
-                if (minutes == 60) {
-                    hours++
-                    minutes=0
-                }
-
-                if (hours >= 12) hours=0
-
-                clockPointers.requestPaint()
-            }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: clockContainer
-        property bool grabbed: false
-
-        onPressed: {
-
-            var temp = clockContainer.clockRadius/2
-            var ang = (90+Math.atan2((mouseY-temp), (mouseX-temp))*57.2957795)
-            if (ang <0) ang+=360
-
-            if (ang/6 > clock.minutes-2 && ang/6<clock.minutes+2){
-
-                grabbed = true
-                return;
-            } else {
-                var y = mouseY-temp
-                var x = mouseX-temp
-                var dist = Math.sqrt(y*y+x*x)
-
-                if (dist>clockContainer.clockRadius*.42*clockContainer.scale){
-                    root.rimColor = newColor()
-                    clockCanvas.requestPaint()
-                    return;
-                }else if (dist>clockContainer.clockRadius*.32*clockContainer.scale) {
-                    root.dialStyle = Math.round(Math.random())
-                    root.dialColor = newColor()
-                    clockCanvas.requestPaint()
-                }else{
-                    root.bgcolor = newColor()
-                    clockCanvas.requestPaint()
-                }
-            }
-        }
-
-        onPositionChanged: {
-            if (grabbed) {
-                var temp = clockContainer.clockRadius/2
-                var ang = (90+Math.atan2((mouseY-temp), (mouseX-temp))*57.2957795)
-                if (ang <0) ang+=360
-
-                var oldMinutes = clock.minutes
-                clock.minutes=ang/6
-
-                if (oldMinutes>55 && clock.minutes <5) clock.hours++
-                if (oldMinutes<5 && clock.minutes >50) clock.hours--
-                if (clock.hours >12) clock.hours=1
-                if (clock.hours <0) clock.hours=11
-
-
-                clockPointers.requestPaint()
-            }
-        }
-        onReleased: grabbed = false;
-    }
-
-    function newColor(){
-        var r=Math.random()
-        var g=Math.random()
-        var b=Math.random()
-        return Qt.rgba(r,g,b,1)
-    }
-
-    Component.onCompleted: {
-        var d = new Date()
-        clock.hours = d.getHours()
-        if (clock.hours>=12)clock.hours-=12
-        clock.minutes = d.getMinutes()
-        clock.seconds = d.getSeconds()
-        clockCanvas.requestPaint()
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/demos.pro b/basicsuite/qt5-everywhere/demos/demos.pro
deleted file mode 100644
index 439fe35..0000000
--- a/basicsuite/qt5-everywhere/demos/demos.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += \
-     shaders \
diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml
deleted file mode 100644
index e5d042f..0000000
--- a/basicsuite/qt5-everywhere/demos/gridrssnews/RssDelegate.qml
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************

-**

-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).

-** Contact: http://www.qt-project.org/legal

-**

-** This file is part of the examples of the Qt Toolkit.

-**

-** $QT_BEGIN_LICENSE:BSD$

-** You may use this file under the terms of the BSD license as follows:

-**

-** "Redistribution and use in source and binary forms, with or without

-** modification, are permitted provided that the following conditions are

-** met:

-**   * Redistributions of source code must retain the above copyright

-**     notice, this list of conditions and the following disclaimer.

-**   * Redistributions in binary form must reproduce the above copyright

-**     notice, this list of conditions and the following disclaimer in

-**     the documentation and/or other materials provided with the

-**     distribution.

-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names

-**     of its contributors may be used to endorse or promote products derived

-**     from this software without specific prior written permission.

-**

-**

-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."

-**

-** $QT_END_LICENSE$

-**

-****************************************************************************/

-

-import QtQuick 2.0

-

-Rectangle {

-    id: delegate

-    height: grid.cellHeight

-    width: grid.cellWidth

-    color: mainWindow.appBackground

-    property int tileMargin: mainWindow.tileMargin

-

-    Rectangle {

-        anchors.left: parent.left

-        anchors.top: parent.top

-        anchors.topMargin: parent.tileMargin/2

-        width: parent.width - tileMargin

-        height: parent.height - tileMargin

-        color: mainWindow.tileBackground

-

-        MouseArea {

-            anchors.fill: parent

-            onClicked: {

-                grid.currentIndex = index

-                console.log(link)

-                Qt.openUrlExternally(link)

-            }

-        }

-

-        states: [

-            State {

-                name: "selected"

-                when: delegate.GridView.isCurrentItem

-            }

-        ]

-

-

-        Image {

-            id: iconImage

-            source: url

-            width: parent.width

-            height: parent.height

-        }

-

-        Rectangle{

-            width: parent.width

-            height: dateText.height + tileMargin

-            anchors.top: dateText.top

-            anchors.bottom: parent.bottom

-            color: "Black"

-            opacity: 0.5

-        }

-

-        Text {

-            id: dateText

-            anchors.left: parent.left

-            anchors.leftMargin: tileMargin

-            anchors.bottom: parent.bottom

-            anchors.bottomMargin: tileMargin

-            anchors.right: parent.right

-            anchors.rightMargin: tileMargin

-

-            color: mainWindow.textColor

-            text: title

-            width: parent.width;

-            wrapMode: Text.WordWrap;

-            smooth: true

-            font { family: mainWindow.uiFont; pixelSize: mainWindow.tileFontSize }

-        }

-    }

-}

-

diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml
deleted file mode 100644
index 3a8fea9..0000000
--- a/basicsuite/qt5-everywhere/demos/gridrssnews/ScrollBar.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************

-**

-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).

-** Contact: http://www.qt-project.org/legal

-**

-** This file is part of the examples of the Qt Toolkit.

-**

-** $QT_BEGIN_LICENSE:BSD$

-** You may use this file under the terms of the BSD license as follows:

-**

-** "Redistribution and use in source and binary forms, with or without

-** modification, are permitted provided that the following conditions are

-** met:

-**   * Redistributions of source code must retain the above copyright

-**     notice, this list of conditions and the following disclaimer.

-**   * Redistributions in binary form must reproduce the above copyright

-**     notice, this list of conditions and the following disclaimer in

-**     the documentation and/or other materials provided with the

-**     distribution.

-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names

-**     of its contributors may be used to endorse or promote products derived

-**     from this software without specific prior written permission.

-**

-**

-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."

-**

-** $QT_END_LICENSE$

-**

-****************************************************************************/

-

-import QtQuick 2.0

-

-Item {

-    id: scrollBar

-

-    // The properties that define the scrollbar's state.

-    // position and pageSize are in the range 0.0 - 1.0.  They are relative to the

-    // height of the page, i.e. a pageSize of 0.5 means that you can see 50%

-    // of the height of the view.

-    // orientation can be either Qt.Vertical or Qt.Horizontal

-    property real position

-    property real pageSize

-    property variant orientation : Qt.Vertical

-

-    // A light, semi-transparent background

-    Rectangle {

-        id: background

-        anchors.fill: parent

-        radius: width/2 - 1

-        color: mainWindow.appBackground

-    }

-

-    // Size the bar to the required size, depending upon the orientation.

-    Rectangle {

-        x: scrollBar.position * (scrollBar.width-2) + 1

-        y: 1

-        width: scrollBar.pageSize * (scrollBar.width-2)

-        height: parent.height

-        radius: height/2 - 1

-        color: mainWindow.tileBackground

-    }

-}

diff --git a/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml b/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml
deleted file mode 100644
index 2856cfb..0000000
--- a/basicsuite/qt5-everywhere/demos/gridrssnews/main.qml
+++ /dev/null
@@ -1,176 +0,0 @@
-/****************************************************************************

-**

-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).

-** Contact: http://www.qt-project.org/legal

-**

-** This file is part of the examples of the Qt Toolkit.

-**

-** $QT_BEGIN_LICENSE:BSD$

-** You may use this file under the terms of the BSD license as follows:

-**

-** "Redistribution and use in source and binary forms, with or without

-** modification, are permitted provided that the following conditions are

-** met:

-**   * Redistributions of source code must retain the above copyright

-**     notice, this list of conditions and the following disclaimer.

-**   * Redistributions in binary form must reproduce the above copyright

-**     notice, this list of conditions and the following disclaimer in

-**     the documentation and/or other materials provided with the

-**     distribution.

-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names

-**     of its contributors may be used to endorse or promote products derived

-**     from this software without specific prior written permission.

-**

-**

-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."

-**

-** $QT_END_LICENSE$

-**

-****************************************************************************/

-

-import QtQuick 2.0

-import QtQuick.XmlListModel 2.0

-

-Rectangle {

-    id: mainWindow

-    anchors.fill: parent

-    color: appBackground

-

-    property int tileHeight: parseInt(grid.height / 3)

-    property int tileFontSize: tileHeight * 0.08

-    property int horizontalMargin: height * 0.08

-    property int topBarsize: height * 0.2

-    property int bottomBarSize: height * 0.08

-    property int tileMargin: height * 0.01

-    property int appHeaderFontSize: topBarsize * 0.4

-    property string appBackground: "#262626"

-    property string tileBackground: "#86bc24"

-    property string textColor: "white"

-    property string uiFont: "Segoe UI"

-

-    XmlListModel {

-        id: feedModel

-        //source: "http://blog.qt.digia.com/feed/"

-        source: "http://news.yahoo.com/rss/tech"

-        //query: "/rss/channel/item"

-        // Filter out items that don't have images

-        query: "/rss/channel/item[exists(child::media:content)]"

-        namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\";"

-        XmlRole  { name: "url"; query: "media:content/@url/string()" }

-        XmlRole { name: "title"; query: "title/string()" }

-        XmlRole { name: "pubDate"; query: "pubDate/string()" }

-        XmlRole { name: "link"; query: "link/string()" }

-

-        onStatusChanged: {

-            if (status == XmlListModel.Ready) {

-                playbanner.start();

-            } else if (status == XmlListModel.Error) {

-                networkErrorMessage.start();

-            }

-        }

-    }

-

-    // Top bar

-    Item {

-        id: topBar

-        anchors.left: parent.left

-        anchors.right: parent.right

-        anchors.top: parent.top

-        anchors.leftMargin: horizontalMargin

-        opacity: 0

-        height: topBarsize

-        Text {

-            id: title

-            anchors.verticalCenter: parent.verticalCenter

-            anchors.left: parent.left

-            text: qsTr("Yahoo Technology")

-            font.family: uiFont;

-            font.pixelSize: appHeaderFontSize;

-            color: textColor

-            smooth: true

-        }

-    }

-

-    // Grid view

-    GridView {

-        id: grid

-        anchors.fill: parent

-        anchors.topMargin: topBarsize

-        anchors.bottomMargin: bottomBarSize

-        anchors.leftMargin: horizontalMargin

-        anchors.rightMargin: horizontalMargin

-        opacity: 0

-        flow: GridView.TopToBottom

-        cellHeight: tileHeight

-        cellWidth: parseInt(tileHeight * 1.5)

-        cacheBuffer: cellWidth

-        clip: false

-        focus: true

-        model: feedModel

-        delegate: RssDelegate {}

-

-        // Only show the scrollbars when the view is moving.

-        states: State {

-            when: grid.movingHorizontally

-            PropertyChanges { target: horizontalScrollBar; opacity: 1 }

-        }

-

-        transitions: Transition {

-            NumberAnimation { properties: "opacity"; duration: 400 }

-        }

-    }

-

-    ScrollBar {

-        id: horizontalScrollBar

-        width: parent.width; height: 6

-        anchors.bottom: parent.bottom

-        anchors.left: parent.left

-        opacity: 0

-        orientation: Qt.Horizontal

-        position: grid.visibleArea.xPosition

-        pageSize: grid.visibleArea.widthRatio

-    }

-

-    Item {

-        id: networkErrorBox

-        opacity: 0

-        anchors.fill: parent

-

-        Text {

-            anchors.centerIn: parent

-            text: qsTr("Sorry! No network connection")

-            font.family: uiFont;

-            font.pixelSize: appHeaderFontSize;

-            color: textColor

-            smooth: true

-        }

-    }

-

-    SequentialAnimation {

-         id: playbanner

-         running: false

-         NumberAnimation { target: topBar; property: "opacity"; to: 1.0; duration: 300}

-         NumberAnimation { target: grid; property: "opacity"; to: 1.0; duration: 300}

-    }

-

-    NumberAnimation {

-        id: networkErrorMessage

-        running: false

-        target: networkErrorBox

-        property: "opacity"

-        to: 1.0

-        duration: 300

-    }

-

-}

-

diff --git a/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js b/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js
deleted file mode 100644
index d3ad154..0000000
--- a/basicsuite/qt5-everywhere/demos/heartmonitor/HeartData.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************

-**

-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).

-** Contact: http://www.qt-project.org/legal

-**

-** This file is part of the examples of the Qt Toolkit.

-**

-** $QT_BEGIN_LICENSE:BSD$

-** You may use this file under the terms of the BSD license as follows:

-**

-** "Redistribution and use in source and binary forms, with or without

-** modification, are permitted provided that the following conditions are

-** met:

-**   * Redistributions of source code must retain the above copyright

-**     notice, this list of conditions and the following disclaimer.

-**   * Redistributions in binary form must reproduce the above copyright

-**     notice, this list of conditions and the following disclaimer in

-**     the documentation and/or other materials provided with the

-**     distribution.

-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names

-**     of its contributors may be used to endorse or promote products derived

-**     from this software without specific prior written permission.

-**

-**

-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."

-**

-** $QT_END_LICENSE$

-**

-****************************************************************************/

-

-var heartData = [0,0,0,0,0]

-

-function fillHeartData(length) {

-    if (length !== heartData.length) {

-        heartData = new Array(length);

-        for (var i=0; i<length; i++) {

-            heartData[i] = 0;

-        }

-    }

-}

diff --git a/basicsuite/qt5-everywhere/demos/heartmonitor/heart.png b/basicsuite/qt5-everywhere/demos/heartmonitor/heart.png
deleted file mode 100644
index d7a6170..0000000
--- a/basicsuite/qt5-everywhere/demos/heartmonitor/heart.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml b/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml
deleted file mode 100644
index 7594bdd..0000000
--- a/basicsuite/qt5-everywhere/demos/heartmonitor/main.qml
+++ /dev/null
@@ -1,266 +0,0 @@
-/****************************************************************************

-**

-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).

-** Contact: http://www.qt-project.org/legal

-**

-** This file is part of the examples of the Qt Toolkit.

-**

-** $QT_BEGIN_LICENSE:BSD$

-** You may use this file under the terms of the BSD license as follows:

-**

-** "Redistribution and use in source and binary forms, with or without

-** modification, are permitted provided that the following conditions are

-** met:

-**   * Redistributions of source code must retain the above copyright

-**     notice, this list of conditions and the following disclaimer.

-**   * Redistributions in binary form must reproduce the above copyright

-**     notice, this list of conditions and the following disclaimer in

-**     the documentation and/or other materials provided with the

-**     distribution.

-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names

-**     of its contributors may be used to endorse or promote products derived

-**     from this software without specific prior written permission.

-**

-**

-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."

-**

-** $QT_END_LICENSE$

-**

-****************************************************************************/

-

-import QtQuick 2.0

-import "HeartData.js" as Data

-

-Rectangle {

-    id: app

-    anchors.fill: parent

-    color: "black"

-

-    property int frequency: 60

-    property int beatDataIndex: -1

-    property int heartDataIndex: 0

-    property int beatDifference: 1200

-    property var previousTime: 0

-    property string curveColor: "#22ff22"

-    property string alarmColor: "#ff2222"

-    property string textColor: "#22ff22"

-    property string gridColor: "#333333"

-

-    function pulse() {

-        if (!heartAnimation.running) {

-            heartAnimation.restart()

-            heartTimer.restart()

-            calculateFrequency();

-            app.beatDataIndex = 0

-        }

-    }

-

-    function calculateFrequency() {

-        var ms = new Date().getTime();

-        if (app.previousTime > 0)

-            app.beatDifference = 0.8*beatDifference + 0.2*(ms - app.previousTime)

-        app.frequency = Math.round(60000.0 / app.beatDifference)

-        app.previousTime = ms;

-    }

-

-    function updateData() {

-        app.heartDataIndex++;

-        if (app.heartDataIndex >= Data.heartData.length)

-            app.heartDataIndex = 0;

-        else

-            app.heartDataIndex++;

-

-        if (beatDataIndex >= 0)

-            fillBeatData()

-        else

-            fillRandomData()

-

-        heartCanvas.requestPaint()

-    }

-

-    function fillBeatData() {

-        var value = 0;

-        switch (app.beatDataIndex) {

-        case 0: value = Math.random()*0.1+0.1; break;

-        case 1: value = Math.random()*0.1+0.0; break;

-        case 2: value = Math.random()*0.3+0.7; break;

-        case 3: value = Math.random()*0.1-0.05; break;

-        case 4: value = Math.random()*0.3-0.8; break;

-        case 5: value = Math.random()*0.1-0.05; break;

-        case 6: value = Math.random()*0.1-0.05; break;

-        case 7: value = Math.random()*0.1+0.15; break;

-        default: value = 0; break;

-        }

-

-        Data.heartData[app.heartDataIndex] = value;

-        app.beatDataIndex++;

-        if (app.beatDataIndex > 7)

-            app.beatDataIndex = -1

-    }

-

-    function fillRandomData() {

-        Data.heartData[app.heartDataIndex] = Math.random()*0.05-0.025

-    }

-

-    onWidthChanged: {

-        Data.fillHeartData(Math.floor(app.width*0.5))

-        gridCanvas.requestPaint();

-    }

-    onHeightChanged: gridCanvas.requestPaint()

-

-    Item {

-        id: grid

-        anchors.fill: parent

-

-        Canvas {

-            id: gridCanvas

-            anchors.fill: parent

-            antialiasing: true

-            renderTarget: Canvas.Image

-            onPaint: {

-                var ctx = gridCanvas.getContext('2d')

-

-                ctx.clearRect(0,0,grid.width,grid.height)

-                var step = 1000 / updateTimer.interval * (app.width / Data.heartData.length)

-                var xCount = app.width / step

-                var yCount = app.height / step

-                ctx.strokeStyle = app.gridColor;

-

-                var x=0;

-                ctx.beginPath()

-                for (var i=0; i<xCount; i++) {

-                    x = i*step

-                    ctx.moveTo(x,0)

-                    ctx.lineTo(x,app.height)

-                }

-                ctx.stroke()

-                ctx.closePath()

-

-                var y=0;

-                ctx.beginPath()

-                for (var j=0; j<yCount; j++) {

-                    y = j*step

-                    ctx.moveTo(0, y)

-                    ctx.lineTo(app.width,y)

-                }

-                ctx.stroke()

-                ctx.closePath()

-            }

-        }

-    }

-

-    Rectangle {

-        id: canvasBackground

-        anchors { bottom: parent.bottom; left: parent.left; right: parent.right }

-        height: 0.75 * parent.height

-

-        gradient: Gradient {

-            GradientStop {position: .0; color :"black"}

-            GradientStop {position: .5; color :"#00ff00"}

-            GradientStop {position: 1.0; color :"black"}

-        }

-        opacity: .3

-    }

-

-    Item {

-        id: canvasContainer

-        anchors.fill: canvasBackground

-

-        Canvas {

-            id: heartCanvas

-            anchors.fill: parent

-            antialiasing: true

-            renderTarget: Canvas.Image

-            onPaint: {

-                var ctx = heartCanvas.getContext('2d')

-

-                ctx.clearRect(0,0,canvasContainer.width,canvasContainer.height)

-

-                var baseY = heartCanvas.height/2;

-                var length = Data.heartData.length;

-                var step = (heartCanvas.width-5) / length;

-                var yFactor = heartCanvas.height * 0.35;

-                var heartIndex = (heartDataIndex+1) % length;

-                ctx.strokeStyle = app.curveColor;

-

-                ctx.beginPath()

-                ctx.moveTo(0,baseY)

-                var i=0, x=0, y=0;

-                for (i=0; i<length; i++) {

-                    x=i*step;

-                    y=baseY - Data.heartData[heartIndex]*yFactor;

-                    ctx.lineTo(x,y)

-                    heartIndex = (heartIndex+1)%length;

-                }

-                ctx.stroke()

-                ctx.closePath()

-

-                ctx.beginPath()

-                ctx.fillStyle = app.curveColor

-                ctx.ellipse(x-5,y-5,10,10)

-                ctx.fill()

-                ctx.closePath()

-            }

-        }

-    }

-    Image {

-        id: heart

-        anchors { left: parent.left; top: parent.top }

-        anchors.margins: app.width * 0.05

-        height: parent.height * 0.2

-        width: height*1.2

-        source: "heart.png"

-        MouseArea {

-            anchors.fill: parent

-            onPressed: pulse()

-        }

-    }

-

-    Text {

-        id: pulseText

-        anchors { right: parent.right; verticalCenter: heart.verticalCenter }

-        anchors.margins: app.width * 0.05

-        antialiasing: true

-        text: app.frequency

-        color: app.frequency > 100 ? app.alarmColor : app.textColor

-        font { pixelSize: app.width * .1; bold: true }

-    }

-

-    // Pulse timer

-    Timer {

-        id: heartTimer

-        interval: 1200

-        running: true

-        repeat: false

-        onTriggered: pulse()

-    }

-

-    // Update timer

-    Timer {

-        id: updateTimer

-        interval: 30

-        running: true

-        repeat: true

-        onTriggered: updateData()

-    }

-

-    SequentialAnimation{

-        id: heartAnimation

-        NumberAnimation { target: heart; property: "scale"; duration: 100; from: 1.0; to:1.2; easing.type: Easing.Linear }

-        NumberAnimation { target: heart; property: "scale"; duration: 100; from: 1.2; to:1.0; easing.type: Easing.Linear }

-    }

-

-    Component.onCompleted: {

-        Data.fillHeartData(Math.max(100,Math.floor(app.width*0.5)))

-    }

-}

diff --git a/basicsuite/qt5-everywhere/demos/maroon/.DS_Store b/basicsuite/qt5-everywhere/demos/maroon/.DS_Store
deleted file mode 100644
index b5c859b..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/.DS_Store
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/Maroon.qml b/basicsuite/qt5-everywhere/demos/maroon/Maroon.qml
deleted file mode 100644
index d7bfcb6..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/Maroon.qml
+++ /dev/null
@@ -1,233 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "content"
-import "content/logic.js" as Logic
-
-Item {
-    id: root
-    width: 320
-    height: 480
-    property var gameState: Logic.newGameState(canvas);
-    property bool passedSplash: false
-
-    Image {
-        source:"content/gfx/background.png"
-        anchors.bottom: view.bottom
-
-        ParticleSystem {
-            id: particles
-            anchors.fill: parent
-
-            ImageParticle {
-                id: bubble
-                anchors.fill: parent
-                source: "content/gfx/catch.png"
-                opacity: 0.25
-            }
-
-            Wander {
-                xVariance: 25;
-                pace: 25;
-            }
-
-            Emitter {
-                width: parent.width
-                height: 150
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 3
-                startTime: 15000
-
-                emitRate: 2
-                lifeSpan: 15000
-
-                acceleration: PointDirection{ y: -6; xVariation: 2; yVariation: 2 }
-
-                size: 24
-                sizeVariation: 16
-            }
-        }
-    }
-
-    Column {
-        id: view
-        y: -(height - 480)
-        width: 320
-
-        GameOverScreen { gameCanvas: canvas }
-
-        Item {
-            id: canvasArea
-            width: 320
-            height: 480
-
-            Row {
-                height: childrenRect.height
-                Image {
-                    id: wave
-                    y: 30
-                    source:"content/gfx/wave.png"
-                }
-                Image {
-                    y: 30
-                    source:"content/gfx/wave.png"
-                }
-                NumberAnimation on x { from: 0; to: -(wave.width); duration: 16000; loops: Animation.Infinite }
-                SequentialAnimation on y {
-                    loops: Animation.Infinite
-                    NumberAnimation { from: y - 2; to: y + 2; duration: 1600; easing.type: Easing.InOutQuad }
-                    NumberAnimation { from: y + 2; to: y - 2; duration: 1600; easing.type: Easing.InOutQuad }
-                }
-            }
-
-            Row {
-                opacity: 0.5
-                Image {
-                    id: wave2
-                    y: 25
-                    source: "content/gfx/wave.png"
-                }
-                Image {
-                    y: 25
-                    source: "content/gfx/wave.png"
-                }
-                NumberAnimation on x { from: -(wave2.width); to: 0; duration: 32000; loops: Animation.Infinite }
-                SequentialAnimation on y {
-                    loops: Animation.Infinite
-                    NumberAnimation { from: y + 2; to: y - 2; duration: 1600; easing.type: Easing.InOutQuad }
-                    NumberAnimation { from: y - 2; to: y + 2; duration: 1600; easing.type: Easing.InOutQuad }
-                }
-            }
-
-            Image {
-                source: "content/gfx/sunlight.png"
-                opacity: 0.02
-                y: 0
-                anchors.horizontalCenter: parent.horizontalCenter
-                transformOrigin: Item.Top
-                SequentialAnimation on rotation {
-                    loops: Animation.Infinite
-                    NumberAnimation { from: -10; to: 10; duration: 8000; easing.type: Easing.InOutSine }
-                    NumberAnimation { from: 10; to: -10; duration: 8000; easing.type: Easing.InOutSine }
-                }
-            }
-
-            Image {
-                source: "content/gfx/sunlight.png"
-                opacity: 0.04
-                y: 20
-                anchors.horizontalCenter: parent.horizontalCenter
-                transformOrigin: Item.Top
-                SequentialAnimation on rotation {
-                    loops: Animation.Infinite
-                    NumberAnimation { from: 10; to: -10; duration: 8000; easing.type: Easing.InOutSine }
-                    NumberAnimation { from: -10; to: 10; duration: 8000; easing.type: Easing.InOutSine }
-                }
-            }
-
-            Image {
-                source: "content/gfx/grid.png"
-                opacity: 0.5
-            }
-
-            GameCanvas {
-                id: canvas
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 20
-                x: 32
-                focus: true
-            }
-
-            InfoBar { anchors.bottom: canvas.top; anchors.bottomMargin: 6; width: parent.width }
-
-            //3..2..1..go
-            Timer {
-                id: countdownTimer
-                interval: 1000
-                running: root.countdown < 5
-                repeat: true
-                onTriggered: root.countdown++
-            }
-            Repeater {
-                model: ["content/gfx/text-blank.png", "content/gfx/text-3.png", "content/gfx/text-2.png", "content/gfx/text-1.png", "content/gfx/text-go.png"]
-                delegate: Image {
-                    visible: root.countdown <= index
-                    opacity: root.countdown == index ? 0.5 : 0.1
-                    scale: root.countdown >= index ? 1.0 : 0.0
-                    source: modelData
-                    Behavior on opacity { NumberAnimation {} }
-                    Behavior on scale { NumberAnimation {} }
-                }
-            }
-        }
-
-        NewGameScreen {
-            onStartButtonClicked: root.passedSplash = true
-        }
-    }
-
-    property int countdown: 10
-    Timer {
-        id: gameStarter
-        interval: 4000
-        running: false
-        repeat: false
-        onTriggered: Logic.startGame(canvas);
-    }
-
-    states: [
-        State {
-            name: "gameOn"; when: gameState.gameOver == false && passedSplash
-            PropertyChanges { target: view; y: -(height - 960) }
-            StateChangeScript { script: root.countdown = 0; }
-            PropertyChanges { target: gameStarter; running: true }
-        },
-        State {
-            name: "gameOver"; when: gameState.gameOver == true
-            PropertyChanges { target: view; y: 0 }
-        }
-    ]
-
-    transitions: Transition {
-        NumberAnimation { properties: "x,y"; duration: 1200; easing.type: Easing.OutQuad }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/BuildButton.qml b/basicsuite/qt5-everywhere/demos/maroon/content/BuildButton.qml
deleted file mode 100644
index 49641fc..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/BuildButton.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "logic.js" as Logic
-
-Item {
-    id: container
-    width: 64
-    height: 64
-    property alias source: img.source
-    property int index
-    property int row: 0
-    property int col: 0
-    property int towerType
-    property bool canBuild: true
-    property Item gameCanvas: parent.parent.parent
-    signal clicked()
-
-    Image {
-        id: img
-        opacity: (canBuild && gameCanvas.coins >= Logic.towerData[towerType-1].cost) ? 1.0 : 0.4
-    }
-    Text {
-        anchors.right: parent.right
-        font.pointSize: 14
-        font.bold: true
-        color: "#ffffff"
-        text: Logic.towerData[towerType - 1].cost
-    }
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            Logic.buildTower(towerType, col, row)
-            container.clicked()
-        }
-    }
-    Image {
-        visible: col == index && row != 0
-        source: "gfx/dialog-pointer.png"
-        anchors.top: parent.bottom
-        anchors.topMargin: 4
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-    Image {
-        visible: col == index && row == 0
-        source: "gfx/dialog-pointer.png"
-        rotation: 180
-        anchors.bottom: parent.top
-        anchors.bottomMargin: 6
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/GameCanvas.qml b/basicsuite/qt5-everywhere/demos/maroon/content/GameCanvas.qml
deleted file mode 100644
index 5e6e963..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/GameCanvas.qml
+++ /dev/null
@@ -1,240 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "logic.js" as Logic
-import "towers" as Towers
-
-Item {
-    id: grid
-
-    property int squareSize: 64
-    property int rows: 6
-    property int cols: 4
-    property Item canvas: grid
-    property int score: 0
-    property int coins: 100
-    property int lives: 3
-    property int waveNumber: 0
-    property int waveProgress: 0
-    property var towers
-    property var mobs
-    property bool gameRunning: false
-    property bool gameOver: false
-    property bool errored: false
-    property string errorString: ""
-
-    width: cols * squareSize
-    height: rows * squareSize
-
-    function freshState() {
-        lives = 3
-        coins = 100
-        score = 0
-        waveNumber = 0
-        waveProgress = 0
-        gameOver = false
-        gameRunning = false
-        towerMenu.shown = false
-        helpButton.comeBack();
-    }
-
-    Text {
-        id: errorText // Mostly for debug purposes
-        text: errorString
-        visible: errored
-        color: "red"
-        font.pixelSize: 18
-        wrapMode: Text.WordWrap
-        width: parent.width / 1.2
-        height: parent.height / 1.2
-        anchors.centerIn: parent
-        z: 1000
-    }
-
-    Timer {
-        interval: 16
-        running: true
-        repeat: true
-        onTriggered: Logic.tick()
-    }
-
-    MouseArea {
-        id: ma
-        anchors.fill: parent
-        onClicked: {
-            if (towerMenu.visible)
-                towerMenu.finish()
-            else
-                towerMenu.open(mouse.x, mouse.y)
-        }
-    }
-
-    Image {
-        id: towerMenu
-        visible: false
-        z: 1500
-        scale: 0.9
-        opacity: 0.7
-        property int dragDistance: 16
-        property int targetRow: 0
-        property int targetCol: 0
-        property bool shown: false
-        property bool towerExists: false
-
-        function finish() {
-            shown = false
-        }
-
-        function open(xp,yp) {
-            if (!grid.gameRunning)
-                return
-            targetRow = Logic.row(yp)
-            targetCol = Logic.col(xp)
-            if (targetRow == 0)
-                towerMenu.y = (targetRow + 1) * grid.squareSize
-            else
-                towerMenu.y = (targetRow - 1) * grid.squareSize
-            towerExists = (grid.towers[Logic.towerIdx(targetCol, targetRow)] != null)
-            shown = true
-            helpButton.goAway();
-        }
-
-        states: State {
-            name: "shown"; when: towerMenu.shown && !grid.gameOver
-            PropertyChanges { target: towerMenu; visible: true; scale: 1; opacity: 1 }
-        }
-
-        transitions: Transition {
-            PropertyAction { property: "visible" }
-            NumberAnimation { properties: "opacity,scale"; duration: 500; easing.type: Easing.OutElastic }
-        }
-
-        x: -32
-        source: "gfx/dialog.png"
-        Row {
-            id: buttonRow
-            height: 100
-            anchors.centerIn: parent
-            spacing: 8
-            BuildButton {
-                row: towerMenu.targetRow; col: towerMenu.targetCol
-                anchors.verticalCenter: parent.verticalCenter
-                towerType: 1; index: 0
-                canBuild: !towerMenu.towerExists
-                source: "gfx/dialog-melee.png"
-                onClicked: towerMenu.finish()
-            }
-            BuildButton {
-                row: towerMenu.targetRow; col: towerMenu.targetCol
-                anchors.verticalCenter: parent.verticalCenter
-                towerType: 2; index: 1
-                canBuild: !towerMenu.towerExists
-                source: "gfx/dialog-shooter.png"
-                onClicked: towerMenu.finish()
-            }
-            BuildButton {
-                row: towerMenu.targetRow; col: towerMenu.targetCol
-                anchors.verticalCenter: parent.verticalCenter
-                towerType: 3; index: 2
-                canBuild: !towerMenu.towerExists
-                source: "gfx/dialog-bomb.png"
-                onClicked: towerMenu.finish()
-            }
-            BuildButton {
-                row: towerMenu.targetRow; col: towerMenu.targetCol
-                anchors.verticalCenter: parent.verticalCenter
-                towerType: 4; index: 3
-                canBuild: !towerMenu.towerExists
-                source: "gfx/dialog-factory.png"
-                onClicked: towerMenu.finish()
-            }
-        }
-    }
-
-
-    Keys.onPressed: { // Cheat Codes while Testing
-        if (event.key == Qt.Key_Up && (event.modifiers & Qt.ShiftModifier))
-            grid.coins += 10;
-        if (event.key == Qt.Key_Left && (event.modifiers & Qt.ShiftModifier))
-            grid.lives += 1;
-        if (event.key == Qt.Key_Down && (event.modifiers & Qt.ShiftModifier))
-            Logic.gameState.waveProgress += 1000;
-        if (event.key == Qt.Key_Right && (event.modifiers & Qt.ShiftModifier))
-            Logic.endGame();
-    }
-
-    Image {
-        id: helpButton
-        z: 1010
-        source: "gfx/button-help.png"
-        function goAway() {
-            helpMA.enabled = false;
-            helpButton.opacity = 0;
-        }
-        function comeBack() {
-            helpMA.enabled = true;
-            helpButton.opacity = 1;
-        }
-        Behavior on opacity { NumberAnimation {} }
-        MouseArea {
-            id: helpMA
-            anchors.fill: parent
-            onClicked: {helpImage.visible = true; helpButton.visible = false;}
-        }
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 0
-    }
-
-    Image {
-        id: helpImage
-        z: 1010
-        source: "gfx/help.png"
-        anchors.fill: parent
-        visible: false
-        MouseArea {
-            anchors.fill: parent
-            onClicked: helpImage.visible = false;
-        }
-    }
-
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/GameOverScreen.qml b/basicsuite/qt5-everywhere/demos/maroon/content/GameOverScreen.qml
deleted file mode 100644
index dfb439f..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/GameOverScreen.qml
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "logic.js" as Logic
-
-Item {
-    id: gameOverScreen
-    width: 320
-    height: 400
-    property GameCanvas gameCanvas
-
-    Image {
-        id: img
-        source: "gfx/text-gameover.png"
-        anchors.centerIn: parent
-    }
-
-    ParticleSystem {
-        anchors.fill: parent
-        ImageParticle {
-            id: cloud
-            source: "gfx/cloud.png"
-            alphaVariation: 0.25
-            opacity: 0.25
-        }
-
-        Wander {
-            xVariance: 100;
-            pace: 1;
-        }
-
-        Emitter {
-            id: cloudLeft
-            width: 160
-            height: 160
-            anchors.right: parent.left
-            emitRate: 0.5
-            lifeSpan: 12000
-            velocity: PointDirection{ x: 64; xVariation: 2; yVariation: 2 }
-            size: 160
-        }
-
-        Emitter {
-            id: cloudRight
-            width: 160
-            height: 160
-            anchors.left: parent.right
-            emitRate: 0.5
-            lifeSpan: 12000
-            velocity: PointDirection{ x: -64; xVariation: 2; yVariation: 2 }
-            size: 160
-        }
-    }
-
-
-    Text {
-        visible: gameCanvas != undefined
-        text: "You saved " + gameCanvas.score + " fishes!"
-        anchors.top: img.bottom
-        anchors.topMargin: 12
-        anchors.horizontalCenter: parent.horizontalCenter
-        font.bold: true
-        color: "#000000"
-        opacity: 0.5
-    }
-
-    Image {
-        source: "gfx/button-play.png"
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 0
-        MouseArea {
-            anchors.fill: parent
-            onClicked: gameCanvas.gameOver = false//This will actually trigger the state change in main.qml
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/InfoBar.qml b/basicsuite/qt5-everywhere/demos/maroon/content/InfoBar.qml
deleted file mode 100644
index 36303fc..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/InfoBar.qml
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    height: childrenRect.height
-
-    // Display the number of lives
-    Row {
-        anchors.left: parent.left
-        anchors.leftMargin: 10
-        spacing: 5
-        Repeater {
-            id: rep
-            model: Math.min(10, canvas.lives)
-            delegate: Image { source: "gfx/lifes.png" }
-        }
-    }
-
-    // Display the number of fishes saved
-    Row {
-        anchors.right: points.left
-        anchors.rightMargin: 20
-        spacing: 5
-        Image { source: "gfx/scores.png" }
-        Text {
-            text: canvas.score
-            font.bold: true
-        }
-    }
-
-    // Display the number of coins
-    Row {
-        id: points
-        anchors.right: parent.right
-        anchors.rightMargin: 10
-        spacing: 5
-        Image { source: "gfx/points.png" }
-        Text {
-            id: pointsLabel
-            text: canvas.coins
-            font.bold: true
-        }
-    }
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/NewGameScreen.qml b/basicsuite/qt5-everywhere/demos/maroon/content/NewGameScreen.qml
deleted file mode 100644
index 495e3aa..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/NewGameScreen.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-// This is the first screen.
-// It shows the logo and emit a startButtonClicked signal
-// when the user press the "PLAY" button.
-
-Item {
-    id: newGameScreen
-    width: 320
-    height: 480
-
-    signal startButtonClicked
-
-    Image {
-        source: "gfx/logo.png"
-        anchors.top: parent.top
-        anchors.topMargin: 60
-    }
-
-    Image {
-        source: "gfx/logo-fish.png"
-        anchors.top: parent.top
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x + 148; to: x + 25; duration: 2000; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x + 25; to: x + 148; duration: 1600; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on anchors.topMargin {
-            loops: Animation.Infinite
-            NumberAnimation { from: 100; to: 60; duration: 1600; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: 60; to: 100; duration: 2000; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    Image {
-        source: "gfx/logo-bubble.png"
-        anchors.top: parent.top
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x + 140; to: x + 40; duration: 2000; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x + 40; to: x + 140; duration: 1600; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on anchors.topMargin {
-            loops: Animation.Infinite
-            NumberAnimation { from: 100; to: 60; duration: 1600; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: 60; to: 100; duration: 2000; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on width {
-            loops: Animation.Infinite
-            NumberAnimation { from: 140; to: 160; duration: 1000; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: 160; to: 140; duration: 800; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on height {
-            loops: Animation.Infinite
-            NumberAnimation { from: 150; to: 140; duration: 800; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: 140; to: 150; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    Image {
-        source: "gfx/button-play.png"
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 60
-        MouseArea {
-            anchors.fill: parent
-            onClicked: newGameScreen.startButtonClicked()
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/SoundEffect.qml b/basicsuite/qt5-everywhere/demos/maroon/content/SoundEffect.qml
deleted file mode 100644
index 0dccd12..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/SoundEffect.qml
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-//Proxies a SoundEffect if QtMultimedia is installed
-Item {
-    id: container
-    property QtObject effect: Qt.createQmlObject("import QtMultimedia 5.0; SoundEffect{ source: '" + container.source + "' }", container);
-    property url source: ""
-    onSourceChanged: if (effect != null) effect.source = source;
-    function play() {
-        if (effect != null)
-            effect.play();
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/audio/bomb-action.wav b/basicsuite/qt5-everywhere/demos/maroon/content/audio/bomb-action.wav
deleted file mode 100644
index b334dc1..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/audio/bomb-action.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/audio/catch-action.wav b/basicsuite/qt5-everywhere/demos/maroon/content/audio/catch-action.wav
deleted file mode 100644
index 3e22124..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/audio/catch-action.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/audio/catch.wav b/basicsuite/qt5-everywhere/demos/maroon/content/audio/catch.wav
deleted file mode 100644
index d3eade8..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/audio/catch.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/audio/currency.wav b/basicsuite/qt5-everywhere/demos/maroon/content/audio/currency.wav
deleted file mode 100644
index 0d9ef2c..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/audio/currency.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/audio/factory-action.wav b/basicsuite/qt5-everywhere/demos/maroon/content/audio/factory-action.wav
deleted file mode 100644
index a2ace6c..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/audio/factory-action.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/audio/melee-action.wav b/basicsuite/qt5-everywhere/demos/maroon/content/audio/melee-action.wav
deleted file mode 100644
index d325af4..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/audio/melee-action.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/audio/projectile-action.wav b/basicsuite/qt5-everywhere/demos/maroon/content/audio/projectile-action.wav
deleted file mode 100644
index 4e2284f..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/audio/projectile-action.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/audio/shooter-action.wav b/basicsuite/qt5-everywhere/demos/maroon/content/audio/shooter-action.wav
deleted file mode 100644
index 3e12b94..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/audio/shooter-action.wav
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/background.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/background.png
deleted file mode 100644
index d548b93..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/background.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb-action.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb-action.png
deleted file mode 100644
index 42da5d7..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb-action.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb-idle.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb-idle.png
deleted file mode 100644
index 3bd62e2..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb-idle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb.png
deleted file mode 100644
index 380da7d..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/bomb.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/button-help.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/button-help.png
deleted file mode 100644
index aecebc1..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/button-help.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/button-play.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/button-play.png
deleted file mode 100644
index 6cdad6c..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/button-play.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/catch-action.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/catch-action.png
deleted file mode 100644
index 78ca9fe..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/catch-action.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/catch.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/catch.png
deleted file mode 100644
index b7620fe..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/catch.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/cloud.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/cloud.png
deleted file mode 100644
index d7c35f8..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/cloud.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/currency.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/currency.png
deleted file mode 100644
index 1571341..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/currency.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-bomb.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-bomb.png
deleted file mode 100644
index 708d916..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-bomb.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-factory.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-factory.png
deleted file mode 100644
index d2e2a48..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-factory.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-melee.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-melee.png
deleted file mode 100644
index 069d18d..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-melee.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-pointer.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-pointer.png
deleted file mode 100644
index 9b51a09..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-pointer.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-shooter.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-shooter.png
deleted file mode 100644
index af980ca..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog-shooter.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog.png
deleted file mode 100644
index d528ba7..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/dialog.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory-action.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory-action.png
deleted file mode 100644
index 8981678..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory-action.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory-idle.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory-idle.png
deleted file mode 100644
index a145582..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory-idle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory.png
deleted file mode 100644
index bfb9f3f..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/factory.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/grid.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/grid.png
deleted file mode 100644
index b595552..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/grid.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/help.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/help.png
deleted file mode 100644
index 4654e4c..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/help.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/lifes.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/lifes.png
deleted file mode 100644
index 135310b..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/lifes.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo-bubble.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo-bubble.png
deleted file mode 100644
index 136151c..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo-bubble.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo-fish.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo-fish.png
deleted file mode 100644
index c41833a..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo-fish.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo.png
deleted file mode 100644
index 787ac99..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/logo.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee-action.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee-action.png
deleted file mode 100644
index c53873b..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee-action.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee-idle.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee-idle.png
deleted file mode 100644
index 621d9df..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee-idle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee.png
deleted file mode 100644
index ab24015..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/melee.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/mob-idle.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/mob-idle.png
deleted file mode 100644
index dedacc7..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/mob-idle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/mob.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/mob.png
deleted file mode 100644
index 7569c35..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/mob.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/points.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/points.png
deleted file mode 100644
index 1d2386d..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/points.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/projectile-action.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/projectile-action.png
deleted file mode 100644
index aa2e650..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/projectile-action.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/projectile.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/projectile.png
deleted file mode 100644
index c25a0c3..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/projectile.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/scores.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/scores.png
deleted file mode 100644
index af757fe..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/scores.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter-action.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter-action.png
deleted file mode 100644
index 08e7e30..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter-action.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter-idle.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter-idle.png
deleted file mode 100644
index 663098d..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter-idle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter.png
deleted file mode 100644
index d44401e..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/shooter.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/sunlight.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/sunlight.png
deleted file mode 100644
index d1c7042..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/sunlight.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-1.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-1.png
deleted file mode 100644
index 3ea399c..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-2.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-2.png
deleted file mode 100644
index 934a481..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-3.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-3.png
deleted file mode 100644
index 47523f5..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-3.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-blank.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-blank.png
deleted file mode 100644
index 4a687b2..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-blank.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-gameover.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-gameover.png
deleted file mode 100644
index 4f53ef0..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-gameover.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-go.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-go.png
deleted file mode 100644
index bfc26f7..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/text-go.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/wave.png b/basicsuite/qt5-everywhere/demos/maroon/content/gfx/wave.png
deleted file mode 100644
index f97426c..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/gfx/wave.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/logic.js b/basicsuite/qt5-everywhere/demos/maroon/content/logic.js
deleted file mode 100644
index dd76b7e..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/logic.js
+++ /dev/null
@@ -1,264 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-.pragma library // Shared game state
-.import QtQuick 2.0 as QQ
-
-// Game Stuff
-var gameState // Local reference
-function getGameState() { return gameState; }
-
-var towerData = [ // Name and cost, stats are in the delegate per instance
-    { "name": "Melee", "cost": 20 },
-    { "name": "Ranged", "cost": 50 },
-    { "name": "Bomb", "cost": 75 },
-    { "name": "Factory", "cost": 25 }
-]
-
-var waveBaseData = [300, 290, 280, 270, 220, 180, 160, 80, 80, 80, 30, 30, 30, 30];
-var waveData = [];
-
-var towerComponents = new Array(towerData.length);
-var mobComponent = Qt.createComponent("mobs/MobBase.qml");
-
-function endGame()
-{
-    gameState.gameRunning = false;
-    gameState.gameOver = true;
-    for (var i = 0; i < gameState.cols; i++) {
-        for (var j = 0; j < gameState.rows; j++) {
-            if (gameState.towers[towerIdx(i, j)]) {
-                gameState.towers[towerIdx(i, j)].destroy();
-                gameState.towers[towerIdx(i, j)] = null;
-            }
-        }
-        for (var j in gameState.mobs[i])
-            gameState.mobs[i][j].destroy();
-        gameState.mobs[i].splice(0,gameState.mobs[i].length); //Leaves queue reusable
-    }
-}
-
-function startGame(gameCanvas)
-{
-    waveData = new Array();
-    for (var i in waveBaseData)
-        waveData[i] = waveBaseData[i];
-    gameState.freshState();
-    for (var i = 0; i < gameCanvas.cols; i++) {
-        for (var j = 0; j < gameCanvas.rows; j++)
-            gameState.towers[towerIdx(i, j)] = null;
-        gameState.mobs[i] = new Array();
-    }
-    gameState.towers[towerIdx(0, 0)] = newTower(3, 0, 0);//Start with a starfish in the corner
-    gameState.gameRunning = true;
-    gameState.gameOver = false;
-}
-
-function newGameState(gameCanvas)
-{
-    for (var i = 0; i < towerComponents.length; i++) {
-        towerComponents[i] = Qt.createComponent("towers/" + towerData[i].name + ".qml");
-        if (towerComponents[i].status == QQ.Component.Error) {
-            gameCanvas.errored = true;
-            gameCanvas.errorString += "Loading Tower " + towerData[i].name + "\n" + (towerComponents[i].errorString());
-            console.log(towerComponents[i].errorString());
-        }
-    }
-    gameState = gameCanvas;
-    gameState.freshState();
-    gameState.towers = new Array(gameCanvas.rows * gameCanvas.cols);
-    gameState.mobs = new Array(gameCanvas.cols);
-    return gameState;
-}
-
-function row(y)
-{
-    return Math.floor(y / gameState.squareSize);
-}
-
-function col(x)
-{
-    return Math.floor(x / gameState.squareSize);
-}
-
-function towerIdx(x, y)
-{
-    return y + (x * gameState.rows);
-}
-
-function newMob(col)
-{
-    var ret = mobComponent.createObject(gameState.canvas,
-        { "col" : col,
-          "speed" : (Math.min(2.0, 0.10 * (gameState.waveNumber + 1))),
-          "y" : gameState.canvas.height });
-    gameState.mobs[col].push(ret);
-    return ret;
-}
-
-function newTower(type, row, col)
-{
-    var ret = towerComponents[type].createObject(gameState.canvas);
-    ret.row = row;
-    ret.col = col;
-    ret.fireCounter = ret.rof;
-    ret.spawn();
-    return ret;
-}
-
-function buildTower(type, x, y)
-{
-    if (gameState.towers[towerIdx(x,y)] != null) {
-        if (type <= 0) {
-            gameState.towers[towerIdx(x,y)].sell();
-            gameState.towers[towerIdx(x,y)] = null;
-        }
-    } else {
-        if (gameState.coins < towerData[type - 1].cost)
-            return;
-        gameState.towers[towerIdx(x, y)] = newTower(type - 1, y, x);
-        gameState.coins -= towerData[type - 1].cost;
-    }
-}
-
-function killMob(col, mob)
-{
-    if (!mob)
-        return;
-    var idx = gameState.mobs[col].indexOf(mob);
-    if (idx == -1 || !mob.hp)
-        return;
-    mob.hp = 0;
-    mob.die();
-    gameState.mobs[col].splice(idx,1);
-}
-
-function killTower(row, col)
-{
-    var tower = gameState.towers[towerIdx(col, row)];
-    if (!tower)
-        return;
-    tower.hp = 0;
-    tower.die();
-    gameState.towers[towerIdx(col, row)] = null;
-}
-
-function tick()
-{
-    if (!gameState.gameRunning)
-        return;
-
-    // Spawn
-    gameState.waveProgress += 1;
-    var i = gameState.waveProgress;
-    var j = 0;
-    while (i > 0 && j < waveData.length)
-        i -= waveData[j++];
-    if ( i == 0 ) // Spawn a mob
-        newMob(Math.floor(Math.random() * gameState.cols));
-    if ( j == waveData.length ) { // Next Wave
-        gameState.waveNumber += 1;
-        gameState.waveProgress = 0;
-        var waveModifier = 10; // Constant governing how much faster the next wave is to spawn (not fish speed)
-        for (var k in waveData ) // Slightly faster
-            if (waveData[k] > waveModifier)
-                waveData[k] -= waveModifier;
-    }
-
-    // Towers Attack
-    for (var j in gameState.towers) {
-        var tower = gameState.towers[j];
-        if (tower == null)
-            continue;
-        if (tower.fireCounter > 0) {
-            tower.fireCounter -= 1;
-            continue;
-        }
-        var column = tower.col;
-        for (var k in gameState.mobs[column]) {
-            var conflict = gameState.mobs[column][k];
-            if (conflict.y <= gameState.canvas.height && conflict.y + conflict.height > tower.y
-                && conflict.y - ((tower.row + 1) * gameState.squareSize) < gameState.squareSize * tower.range) { // In Range
-                tower.fire();
-                tower.fireCounter = tower.rof;
-                conflict.hit(tower.damage);
-            }
-        }
-
-        // Income
-        if (tower.income) {
-            gameState.coins += tower.income;
-            tower.fire();
-            tower.fireCounter = tower.rof;
-        }
-    }
-
-    // Mobs move
-    for (var i = 0; i < gameState.cols; i++) {
-        for (var j = 0; j < gameState.mobs[i].length; j++) {
-            var mob = gameState.mobs[i][j];
-            var newPos = gameState.mobs[i][j].y - gameState.mobs[i][j].speed;
-            if (newPos < 0) {
-                gameState.lives -= 1;
-                killMob(i, mob);
-                if (gameState.lives <= 0)
-                    endGame();
-                continue;
-            }
-            var conflict = gameState.towers[towerIdx(i, row(newPos))];
-            if (conflict != null) {
-                if (mob.y < conflict.y + gameState.squareSize)
-                    gameState.mobs[i][j].y += gameState.mobs[i][j].speed * 10; // Moved inside tower, now hurry back out
-                if (mob.fireCounter > 0) {
-                    mob.fireCounter--;
-                } else {
-                    gameState.mobs[i][j].fire();
-                    conflict.hp -= mob.damage;
-                    if (conflict.hp <= 0)
-                        killTower(conflict.row, conflict.col);
-                    mob.fireCounter = mob.rof;
-                }
-            } else {
-                gameState.mobs[i][j].y = newPos;
-            }
-        }
-    }
-
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/mobs/MobBase.qml b/basicsuite/qt5-everywhere/demos/maroon/content/mobs/MobBase.qml
deleted file mode 100644
index d4ece66..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/mobs/MobBase.qml
+++ /dev/null
@@ -1,262 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../logic.js" as Logic
-import ".."
-
-Item  {
-    id: container
-    property string name: "Fish"
-    property int col: 0
-    property real hp: 3
-    property real damage: 1
-    property real speed: 0.25
-    property int rof: 30 //In ticks
-    property int fireCounter: 0
-    property bool dying: false
-    width: parent ? parent.squareSize : 0
-    height: parent ? parent.squareSize : 0
-    x: col * width
-    z: 1001
-    function fire() { }
-
-    function die() {
-        if (dying)
-            return;
-        dying = true;
-        bubble.jumpTo("burst");
-        if (fishSprite.currentSprite == "front")
-            fishSprite.jumpTo(Math.random() > 0.5 ? "left" : "right" );
-        fishSwim.start();
-        Logic.gameState.score += 1;
-        killedSound.play();
-        bubble.scale = 0.9
-        destroy(350);
-    }
-
-    function inked() {
-        if (hp > 0)
-            ink.jumpTo("dirty");
-    }
-
-    function hit(dmg) {
-        hp -= dmg;
-
-        if (hp <= 0)
-            Logic.killMob(col, container);
-    }
-
-    Component.onCompleted: spawnSound.play()
-
-    SoundEffect {
-        id: spawnSound
-        source: "../audio/catch.wav"
-    }
-    SoundEffect {
-        id: killedSound
-        source: "../audio/catch-action.wav"
-    }
-
-    SpriteSequence {
-        id: fishSprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "left"
-            source: "../gfx/mob-idle.png"
-            frameWidth: 64
-            frameHeight: 64
-            frameCount: 1
-            frameDuration: 800
-            frameDurationVariation: 400
-            to: { "front" : 1 }
-        }
-
-        Sprite {
-            name: "front"
-            source: "../gfx/mob-idle.png"
-            frameCount: 1
-            frameX: 64
-            frameWidth: 64
-            frameHeight: 64
-            frameDuration: 800
-            frameDurationVariation: 400
-            to: { "left" : 1, "right" : 1 }
-        }
-
-        Sprite {
-            name: "right"
-            source: "../gfx/mob-idle.png"
-            frameCount: 1
-            frameX: 128
-            frameWidth: 64
-            frameHeight: 64
-            frameDuration: 800
-            frameDurationVariation: 400
-            to: { "front" : 1 }
-        }
-
-
-        Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation.
-            name: "dummy"
-            source: "../gfx/melee-idle.png"
-            frameCount: 8
-            frameWidth: 64
-            frameHeight: 64
-            frameX: 0
-            frameDuration: 200
-        }
-
-        NumberAnimation on x {
-            id: fishSwim
-            running: false
-            property bool goingLeft: fishSprite.currentSprite == "right"
-            to: goingLeft ? -360 : 360
-            duration: 300
-        }
-    }
-
-    SpriteSequence {
-        id: bubble
-        width: 64
-        height: 64
-        scale: 0.4 + (0.2  * hp)
-        interpolate: false
-        goalSprite: ""
-
-        Behavior on scale {
-            NumberAnimation { duration: 150; easing.type: Easing.OutBack }
-        }
-
-        Sprite {
-            name: "big"
-            source: "../gfx/catch.png"
-            frameCount: 1
-            to: { "burst" : 0 }
-        }
-
-        Sprite {
-            name: "burst"
-            source: "../gfx/catch-action.png"
-            frameCount: 3
-            frameX: 64
-            frameDuration: 200
-        }
-
-        Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation.
-            name: "dummy"
-            source: "../gfx/melee-idle.png"
-            frameCount: 8
-            frameWidth: 64
-            frameHeight: 64
-            frameX: 0
-            frameDuration: 200
-        }
-        SequentialAnimation on width {
-            loops: Animation.Infinite
-            NumberAnimation { from: width * 1; to: width * 1.1; duration: 800; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: width * 1.1; to: width * 1; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on height {
-            loops: Animation.Infinite
-            NumberAnimation { from: height * 1; to: height * 1.15; duration: 1200; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: height * 1.15; to: height * 1; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    SpriteSequence {
-        id: ink
-        width: 64
-        height: 64
-        scale: bubble.scale
-        goalSprite: ""
-
-        Sprite {
-            name: "clean"
-            source: "../gfx/projectile-action.png"
-            frameCount: 1
-            frameX: 0
-            frameWidth: 64
-            frameHeight: 64
-        }
-        Sprite {
-            name: "dirty"
-            source: "../gfx/projectile-action.png"
-            frameCount: 3
-            frameX: 64
-            frameWidth: 64
-            frameHeight: 64
-            frameDuration: 150
-            to: {"clean":1}
-        }
-
-        Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation.
-            name: "dummy"
-            source: "../gfx/melee-idle.png"
-            frameCount: 8
-            frameWidth: 64
-            frameHeight: 64
-            frameX: 0
-            frameDuration: 200
-        }
-        SequentialAnimation on width {
-            loops: Animation.Infinite
-            NumberAnimation { from: width * 1; to: width * 1.1; duration: 800; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: width * 1.1; to: width * 1; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on height {
-            loops: Animation.Infinite
-            NumberAnimation { from: height * 1; to: height * 1.15; duration: 1200; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: height * 1.15; to: height * 1; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-
-    }
-
-    SequentialAnimation on x {
-        loops: Animation.Infinite
-        NumberAnimation { from: x; to: x - 5; duration: 900; easing.type: Easing.InOutQuad }
-        NumberAnimation { from: x - 5; to: x; duration: 900; easing.type: Easing.InOutQuad }
-    }
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/towers/Bomb.qml b/basicsuite/qt5-everywhere/demos/maroon/content/towers/Bomb.qml
deleted file mode 100644
index 41522ef..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/towers/Bomb.qml
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../logic.js" as Logic
-import ".."
-
-TowerBase {
-    id: container
-    hp: 10
-    range: 0.4
-    rof: 10
-    property real detonationRange: 2.5
-
-    function fire() {
-        sound.play()
-        sprite.jumpTo("shoot")
-        animDelay.start()
-    }
-
-    function finishFire() {
-        var sCol = Math.max(0, col - 1)
-        var eCol = Math.min(Logic.gameState.cols - 1, col + 1)
-        var killList = new Array()
-        for (var i = sCol; i <= eCol; i++) {
-            for (var j = 0; j < Logic.gameState.mobs[i].length; j++)
-                if (Math.abs(Logic.gameState.mobs[i][j].y - container.y) < Logic.gameState.squareSize * detonationRange)
-                    killList.push(Logic.gameState.mobs[i][j])
-            while (killList.length > 0)
-                Logic.killMob(i, killList.pop())
-        }
-        Logic.killTower(row, col);
-    }
-
-    Timer {
-        id: animDelay
-        running: false
-        interval: shootState.frameCount * shootState.frameDuration
-        onTriggered: finishFire()
-    }
-
-    function die()
-    {
-        destroy() // No blink, because we usually meant to die
-    }
-
-    SoundEffect {
-        id: sound
-        source: "../audio/bomb-action.wav"
-    }
-
-    SpriteSequence {
-        id: sprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "idle"
-            source: "../gfx/bomb-idle.png"
-            frameCount: 4
-            frameDuration: 800
-        }
-
-        Sprite {
-            id: shootState
-            name: "shoot"
-            source: "../gfx/bomb-action.png"
-            frameCount: 6
-            frameDuration: 155
-            to: { "dying" : 1 } // So that if it takes a frame to clean up, it is on the last frame of the explosion
-        }
-
-        Sprite {
-            name: "dying"
-            source: "../gfx/bomb-action.png"
-            frameCount: 1
-            frameX: 64 * 5
-            frameWidth: 64
-            frameHeight: 64
-            frameDuration: 155
-        }
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x; to: x + 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x + 4; to: x; duration: 900; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on y {
-            loops: Animation.Infinite
-            NumberAnimation { from: y; to: y - 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: y - 4; to: y; duration: 900; easing.type: Easing.InOutQuad }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/towers/Factory.qml b/basicsuite/qt5-everywhere/demos/maroon/content/towers/Factory.qml
deleted file mode 100644
index b34a184..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/towers/Factory.qml
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../logic.js" as Logic
-import ".."
-
-TowerBase {
-    id: container
-    rof: 160
-    income: 5
-    SpriteSequence {
-        id: sprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "idle"
-            source: "../gfx/factory-idle.png"
-            frameCount: 4
-            frameDuration: 200
-        }
-
-        Sprite {
-            name: "action"
-            source: "../gfx/factory-action.png"
-            frameCount: 4
-            frameDuration: 90
-            to: { "idle" : 1 }
-        }
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x; to: x + 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x + 4; to: x; duration: 900; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on y {
-            loops: Animation.Infinite
-            NumberAnimation { from: y; to: y - 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: y - 4; to: y; duration: 900; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    SoundEffect {
-        id: actionSound
-        source: "../audio/factory-action.wav"
-    }
-
-    function fire() {
-        actionSound.play()
-        sprite.jumpTo("action")
-        coinLaunch.start()
-    }
-
-    function spawn() {
-        coin.target = Logic.gameState.mapToItem(container, 240, -32)
-    }
-
-    Image {
-        id: coin
-        property var target: { "x" : 0, "y" : 0 }
-        source: "../gfx/currency.png"
-        visible: false
-    }
-
-    SequentialAnimation {
-        id: coinLaunch
-        PropertyAction { target: coin; property: "visible"; value: true }
-        ParallelAnimation {
-            NumberAnimation { target: coin; property: "x"; from: 16; to: coin.target.x }
-            NumberAnimation { target: coin; property: "y"; from: 16; to: coin.target.y }
-        }
-        PropertyAction { target: coin; property: "visible"; value: false }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/towers/Melee.qml b/basicsuite/qt5-everywhere/demos/maroon/content/towers/Melee.qml
deleted file mode 100644
index 1b49a45..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/towers/Melee.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import ".."
-
-TowerBase {
-    hp: 4
-    range: 0.1
-    damage: 1
-    rof: 40
-    income: 0
-
-    SpriteSequence {
-        id: sprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "idle"
-            source: "../gfx/melee-idle.png"
-            frameCount: 8
-            frameDuration: 250
-        }
-
-        Sprite {
-            name: "shoot"
-            source: "../gfx/melee-action.png"
-            frameCount: 2
-            frameDuration: 200
-            to: { "idle" : 1 }
-        }
-    }
-
-    function fire() {
-        shootSound.play()
-        sprite.jumpTo("shoot")
-    }
-
-    SoundEffect {
-        id: shootSound
-        source: "../audio/melee-action.wav"
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/towers/Ranged.qml b/basicsuite/qt5-everywhere/demos/maroon/content/towers/Ranged.qml
deleted file mode 100644
index 33f3354..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/towers/Ranged.qml
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../logic.js" as Logic
-import ".."
-
-TowerBase {
-    id: container
-    hp: 2
-    range: 6
-    damage: 0 // By projectile
-    rof: 40
-    income: 0
-    property var targetMob
-    property real realDamage: 1
-    function fire() {
-        proj.x = 32 - proj.width / 2
-        proj.y = 0
-        targetMob = Logic.gameState.mobs[col][0]
-        projAnim.to = targetMob.y - container.y -10
-        projAnim.start()
-        shootSound.play()
-        sprite.jumpTo("shoot")
-    }
-
-    Image {
-        id: proj
-        y: 1000
-        SequentialAnimation on y {
-            id: projAnim
-            running: false
-            property real to: 1000
-            SmoothedAnimation {
-                to: projAnim.to
-                velocity: 400
-            }
-            ScriptAction {
-                script: {
-                    if (targetMob && targetMob.hit) {
-                        targetMob.hit(realDamage)
-                        targetMob.inked()
-                        projSound.play()
-                    }
-                }
-            }
-            PropertyAction {
-                value: 1000;
-            }
-        }
-        source: "../gfx/projectile.png"
-    }
-
-    SoundEffect {
-        id: shootSound
-        source: "../audio/shooter-action.wav"
-    }
-    SoundEffect {
-        id: projSound
-        source: "../audio/projectile-action.wav"
-    }
-
-    SpriteSequence {
-        id: sprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "idle"
-            source: "../gfx/shooter-idle.png"
-            frameCount: 4
-            frameDuration: 250
-        }
-
-        Sprite {
-            name: "shoot"
-            source: "../gfx/shooter-action.png"
-            frameCount: 5
-            frameDuration: 90
-            to: { "idle" : 1 }
-        }
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x; to: x - 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x - 4; to: x; duration: 900; easing.type: Easing.InOutQuad }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/maroon/content/towers/TowerBase.qml b/basicsuite/qt5-everywhere/demos/maroon/content/towers/TowerBase.qml
deleted file mode 100644
index 5c71cb0..0000000
--- a/basicsuite/qt5-everywhere/demos/maroon/content/towers/TowerBase.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    property real hp: 1
-    property real range: 0
-    property real damage: 0
-    property int rof: 100
-    property int fireCounter: 0
-    property int income: 0
-    property int row: 0
-    property int col: 0
-
-    width: parent ? parent.squareSize : 0
-    height: parent ? parent.squareSize : 0
-    //This is how it is placed on the gameboard, do not modify/animate the X/Y/Z of a TowerBase please
-    x: col * width
-    y: row * height
-    z: 1000
-
-    function fire() { }
-    function spawn() { } //After all game properties are set
-    function die() { stdDeath.start(); destroy(1000); }
-    function sell() { destroy(); }
-
-    SequentialAnimation on opacity {
-        id: stdDeath
-        running: false
-        loops: 2
-        NumberAnimation { from: 1; to: 0; }
-        NumberAnimation { from: 0; to: 1; }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml b/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml
deleted file mode 100644
index ca1e55e..0000000
--- a/basicsuite/qt5-everywhere/demos/particledemo/BootScreenDemo.qml
+++ /dev/null
@@ -1,181 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: root
-    property real size: Math.min(root.width, root.height);
-    signal finished()
-
-    SequentialAnimation {
-        id: entryAnimation
-        running: true
-        PropertyAction { target: sphereEmitter; property: "emitRate"; value: 150 }
-        PropertyAction { target: starEmitter; property: "emitRate"; value: 100 }
-        PropertyAction { target: starEmitter; property: "enabled"; value: true }
-        PropertyAction { target: sphereEmitter; property: "enabled"; value: true }
-        PropertyAction { target: sphereSystem; property: "running"; value: true }
-        PropertyAction { target: starSystem; property: "running"; value: true }
-        PauseAnimation { duration: 5000 }
-
-        onRunningChanged: if (!running) explodeAnimation.restart()
-    }
-
-    SequentialAnimation{
-        id: explodeAnimation
-        ScriptAction { script: {
-                starAccel.x = 5
-                starAccel.xVariation = 20;
-                starAccel.yVariation = 20;
-                sphereAccel.x = -5
-                sphereAccel.xVariation = 20
-                sphereAccel.yVariation = 20
-                sphereParticle.alpha = 0;
-            }
-        }
-        PropertyAction { target: sphereEmitter; property: "emitRate"; value: 200 }
-        PropertyAction { target: starEmitter; property: "emitRate"; value: 200 }
-        PauseAnimation { duration: 2000 }
-        PropertyAction { target: starEmitter; property: "enabled"; value: false }
-        PropertyAction { target: sphereEmitter; property: "enabled"; value: false }
-        PauseAnimation { duration: 5000 }
-
-        onRunningChanged: {
-            if (!running) {
-                root.finished()
-                root.destroy()
-            }
-        }
-    }
-
-    Item {
-        id: logo;
-        width: root.size  / 2;
-        height: root.size  / 2;
-        anchors.centerIn: parent
-    }
-
-    ParticleSystem {
-        id: sphereSystem;
-        anchors.fill: logo
-        running: false
-
-        ImageParticle {
-            id: sphereParticle
-            source: "images/particle.png"
-            color: "#80c342"
-            alpha: 1
-            colorVariation: 0.0
-        }
-
-        Emitter {
-            id: sphereEmitter
-            anchors.fill: parent
-            emitRate: 100
-            lifeSpan: 4000
-            size: root.width*.15
-            sizeVariation: size *.2
-            velocity: PointDirection { xVariation: 2; yVariation: 2; }
-
-            acceleration: PointDirection {
-                id: sphereAccel
-                xVariation: 1;
-                yVariation: 1;
-            }
-
-            shape: MaskShape {
-                source: "images/qt-logo-green-mask.png"
-            }
-        }
-    }
-
-    ParticleSystem {
-        id: starSystem;
-        anchors.fill: logo
-        running: false
-
-        ImageParticle {
-            id: starParticle
-            source: "images/particle_star.png"
-            color: "#ffffff"
-            alpha: 0
-            colorVariation: 0
-        }
-
-        Emitter {
-            id: starEmitter
-            anchors.fill: parent
-            emitRate: 50
-            lifeSpan: 5000
-            size: root.width*.1
-            sizeVariation: size *.2
-            velocity: PointDirection { xVariation: 1; yVariation: 1; }
-
-            acceleration: PointDirection {
-                id: starAccel
-                xVariation: 0;
-                yVariation: 0;
-            }
-
-            shape: MaskShape {
-                source: "images/qt-logo-white-mask.png"
-            }
-        }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-
-            if (entryAnimation.running) {
-                entryAnimation.complete()
-                return;
-            }
-
-            if (explodeAnimation.running) {
-                root.finished()
-                root.destroy()
-            }
-
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml b/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml
deleted file mode 100644
index 531b7c3..0000000
--- a/basicsuite/qt5-everywhere/demos/particledemo/ParticleSysComponent.qml
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-/**
- * ParticleSystem component draw particles with the given color.
- */
-
-ParticleSystem {
-    id: root
-    anchors.fill: parent
-    running: true
-
-    property color particleColor: "#ff0000"
-    property real angle: particleRoot.angle;
-    property int pointCount: particleRoot.pointCount;
-    property real radius: particleRoot.distance;
-    property real movement: particleRoot.movement;
-    property bool emitting: particleRoot.running;
-    property int touchX: 0
-    property int touchY: 0
-    property int startAngle: 0
-    property bool pressed: false
-    property real targetX: pressed ? touchX : width/2+radius * Math.cos(targetAngle*(Math.PI/180))
-    property real targetY: pressed ? touchY : height/2+radius * Math.sin(targetAngle*(Math.PI/180))
-    property real targetAngle: angle+startAngle
-
-    Emitter {
-        id: emitter
-        lifeSpan: 1000
-        emitRate: 80
-        x: targetX
-        y: targetY
-        enabled: root.emitting
-        size: root.height*.05
-        endSize: root.height*.1
-        sizeVariation: .5
-        velocity: AngleDirection{angle:0; angleVariation: 360; magnitude: 10}
-        acceleration: AngleDirection{angle:0; angleVariation: 360; magnitude: 10}
-        velocityFromMovement: root.movement
-    }
-
-    ImageParticle {
-        id: imageParticle
-        source: "images/particle.png"
-        color: root.pointCount >0 && root.pressed ? root.particleColor: "#444444"
-        alpha: .0
-        colorVariation: root.pointCount >0 && root.pressed ? 0.3: .0
-
-        Behavior on color{
-            enabled: root.pointCount != 0
-            ColorAnimation { duration: 500 }
-        }
-
-        SequentialAnimation on color {
-            id: colorAnimation
-            loops: Animation.Infinite
-            running: root.pointCount === 0
-            ColorAnimation {from: root.particleColor; to: "magenta";  duration: 2000}
-            ColorAnimation {from: "magenta"; to: "blue"; duration: 1000}
-            ColorAnimation {from: "blue"; to: "violet";  duration: 1000}
-            ColorAnimation {from: "violet"; to: "red";  duration: 1000}
-            ColorAnimation {from: "red"; to: "orange";  duration: 1000}
-            ColorAnimation {from: "orange"; to: "yellow";  duration: 1000}
-            ColorAnimation {from: "yellow"; to: "green";  duration: 1000}
-            ColorAnimation {from: "green"; to: root.particleColor; duration: 2000}
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/images/particle.png b/basicsuite/qt5-everywhere/demos/particledemo/images/particle.png
deleted file mode 100644
index 7520c9b..0000000
--- a/basicsuite/qt5-everywhere/demos/particledemo/images/particle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/images/particle_star.png b/basicsuite/qt5-everywhere/demos/particledemo/images/particle_star.png
deleted file mode 100644
index 5660d27..0000000
--- a/basicsuite/qt5-everywhere/demos/particledemo/images/particle_star.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/images/qt-logo-green-mask.png b/basicsuite/qt5-everywhere/demos/particledemo/images/qt-logo-green-mask.png
deleted file mode 100644
index 84be10d..0000000
--- a/basicsuite/qt5-everywhere/demos/particledemo/images/qt-logo-green-mask.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/images/qt-logo-white-mask.png b/basicsuite/qt5-everywhere/demos/particledemo/images/qt-logo-white-mask.png
deleted file mode 100644
index 920eeee..0000000
--- a/basicsuite/qt5-everywhere/demos/particledemo/images/qt-logo-white-mask.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/particle.png b/basicsuite/qt5-everywhere/demos/particledemo/particle.png
deleted file mode 100644
index 5c83896..0000000
--- a/basicsuite/qt5-everywhere/demos/particledemo/particle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml b/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml
deleted file mode 100644
index 235a2cd..0000000
--- a/basicsuite/qt5-everywhere/demos/particledemo/particledemo.qml
+++ /dev/null
@@ -1,213 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Rectangle {
-    id: particleRoot
-    color: "#000000"
-    anchors.fill: parent
-
-    property real distance: parent.height*.4
-    property real angle: 0
-    property real movement: 0
-    property alias running: angleAnimation.running
-    property int pointCount: mouseArea.pointCount + multiPointTouchArea.pointCount
-
-    BootScreenDemo {
-        width: Math.min(parent.width,parent.height)
-        height: width
-        anchors.centerIn: parent
-        z: 1
-        onFinished: {
-            distanceAnimation.restart()
-            angleAnimation.restart()
-        }
-    }
-
-    RotationAnimation on angle {
-        id: angleAnimation
-        from: 0
-        to: 360
-        running: false
-        duration: distanceAnimation.delay
-        direction: RotationAnimation.Shortest
-        loops: Animation.Infinite
-    }
-
-    SequentialAnimation on distance {
-        id: distanceAnimation
-        property int easingType:0
-        property int delay: 1000
-        running: false
-
-        NumberAnimation {
-            from: 0
-            to: parent.height*.4
-            duration: distanceAnimation.delay/2
-            easing.type: distanceAnimation.easingType
-        }
-
-        NumberAnimation {
-            from: parent.height*.4
-            to: 0
-            duration: distanceAnimation.delay/2
-            easing.type: distanceAnimation.easingType
-        }
-
-        onRunningChanged: {
-            if (!running){
-                var type = Math.floor(Math.random()*10)
-                switch (type){
-                case 0:
-                    distanceAnimation.easingType=Easing.InOutBack
-                    break;
-                case 1:
-                    distanceAnimation.easingType=Easing.InOutBounce
-                    break;
-                case 2:
-                    distanceAnimation.easingType=Easing.InOutCirc
-                    break;
-                case 3:
-                    distanceAnimation.easingType=Easing.InOutElastic
-                    break;
-                case 4:
-                    distanceAnimation.easingType=Easing.InOutSine
-                    break;
-                case 5:
-                    distanceAnimation.easingType=Easing.OutInQuad
-                    break;
-                case 6:
-                    distanceAnimation.easingType=Easing.OutInCubic
-                    break;
-                case 7:
-                    distanceAnimation.easingType=Easing.OutExpo
-                    break;
-                case 8:
-                    distanceAnimation.easingType=Easing.OutCurve
-                    break;
-                default:
-                    distanceAnimation.easingType=Easing.Linear
-                    break;
-                }
-
-                distanceAnimation.delay = 500 + Math.floor(Math.random()*1500)
-                angleAnimation.from = 180 + Math.random()*90 - 45
-                particleRoot.movement = Math.random()*2
-                angleAnimation.restart()
-                distanceAnimation.restart()
-            }
-        }
-    }
-
-    /**
-     * Create five ParticleSysComponents for drawing particles
-     * in the place of multitouch points with the given color.
-     */
-    ParticleSysComponent{ id: p1; particleColor: "#ff0000"; startAngle: 1*360/(5-particleRoot.pointCount); }
-    ParticleSysComponent{ id: p2; particleColor: "#00ff00"; startAngle: 2*360/(5-particleRoot.pointCount); }
-    ParticleSysComponent{ id: p3; particleColor: "#0000ff"; startAngle: 3*360/(5-particleRoot.pointCount); }
-    ParticleSysComponent{ id: p4; particleColor: "#ffff00"; startAngle: 4*360/(5-particleRoot.pointCount); }
-    ParticleSysComponent{ id: p5; particleColor: "#ff00ff"; startAngle: 5*360/(5-particleRoot.pointCount); }
-
-    /**
-     * In this demo we only support five touch point at the same time.
-     * One from mouseArea (because of Desktop-support) and four from MultiPointTouchArea.
-     */
-    MultiPointTouchArea {
-        id: multiPointTouchArea
-        anchors.fill: parent
-        minimumTouchPoints: 1
-        maximumTouchPoints: 6
-
-        property int pointCount:0
-
-        touchPoints: [
-            TouchPoint { id: point1 },
-            TouchPoint { id: point2 },
-            TouchPoint { id: point3 },
-            TouchPoint { id: point4 }
-        ]
-
-        onPressed: updatePointCount()
-        onReleased: updatePointCount()
-        onTouchUpdated: {
-            p2.touchX = point1.x; p2.touchY = point1.y; p2.pressed = point1.pressed;
-            p3.touchX = point2.x; p3.touchY = point2.y; p3.pressed = point2.pressed;
-            p4.touchX = point3.x; p4.touchY = point3.y; p4.pressed = point3.pressed;
-            p5.touchX = point4.x; p5.touchY = point4.y; p5.pressed = point4.pressed;
-        }
-
-        function updatePointCount(){
-            var tmp = 0
-            for (var i=0; i<4; i++) {
-                if (touchPoints[i].pressed)
-                    tmp++
-            }
-            pointCount = tmp
-        }
-    }
-
-    /**
-     * For desktop.
-     */
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-
-        property int pointCount:0
-
-        onPressed: {
-            pointCount = 1;
-            p1.touchX = mouse.x;
-            p1.touchY = mouse.y;
-            p1.pressed = true;
-        }
-        onReleased: {
-            pointCount = 0;
-            p1.pressed = false;
-        }
-        onPositionChanged: {
-            p1.touchX = mouse.x;
-            p1.touchY = mouse.y;
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/photosurface/images/image0.png b/basicsuite/qt5-everywhere/demos/photosurface/images/image0.png
deleted file mode 100644
index 711b788..0000000
--- a/basicsuite/qt5-everywhere/demos/photosurface/images/image0.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/photosurface/images/image1.png b/basicsuite/qt5-everywhere/demos/photosurface/images/image1.png
deleted file mode 100644
index e9bfcdf..0000000
--- a/basicsuite/qt5-everywhere/demos/photosurface/images/image1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/photosurface/images/image2.png b/basicsuite/qt5-everywhere/demos/photosurface/images/image2.png
deleted file mode 100644
index b37453c..0000000
--- a/basicsuite/qt5-everywhere/demos/photosurface/images/image2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/photosurface/images/image3.png b/basicsuite/qt5-everywhere/demos/photosurface/images/image3.png
deleted file mode 100644
index 63d82e7..0000000
--- a/basicsuite/qt5-everywhere/demos/photosurface/images/image3.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/photosurface/images/image4.png b/basicsuite/qt5-everywhere/demos/photosurface/images/image4.png
deleted file mode 100644
index a499231..0000000
--- a/basicsuite/qt5-everywhere/demos/photosurface/images/image4.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/photosurface/images/qml-photosurface-example-small.png b/basicsuite/qt5-everywhere/demos/photosurface/images/qml-photosurface-example-small.png
deleted file mode 100644
index a0cd823..0000000
--- a/basicsuite/qt5-everywhere/demos/photosurface/images/qml-photosurface-example-small.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml b/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml
deleted file mode 100644
index d96a9bd..0000000
--- a/basicsuite/qt5-everywhere/demos/photosurface/photosurface.qml
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    visible: true
-    anchors.fill: parent
-    property int highestZ: 0
-    property real defaultSize: 200
-
-    gradient: Gradient{
-        GradientStop{position: 0.0; color: "#333333"}
-        GradientStop{position: 1.0; color: "#111111"}
-    }
-
-    Repeater {
-//        model: FolderListModel {
-//            id: folderModel
-//            objectName: "folderModel"
-//            showDirs: false
-//            nameFilters: ["*.png", "*.jpg", "*.gif"]
-//        }
-        id: repeater
-        model: 5
-        anchors.fill: parent
-
-        clip: true
-        Rectangle {
-            id: photoFrame
-            width: image.width * image.scale + 20
-            height: image.height * image.scale + 20
-            border.color: "black"
-            border.width: 2
-            smooth: true
-            antialiasing: true
-            x: Math.random() * root.width - defaultSize / 2
-            y: Math.random() * root.height - defaultSize / 2
-            rotation: Math.random() * 13 - 6
-            Image {
-                id: image
-                anchors.centerIn: parent
-                fillMode: Image.PreserveAspectFit
-                source: "images/image"+index+".png"
-                scale: defaultSize / Math.max(sourceSize.width, sourceSize.height)
-                antialiasing: true
-            }
-            PinchArea {
-                anchors.fill: parent
-                pinch.target: photoFrame
-                pinch.minimumRotation: -360
-                pinch.maximumRotation: 360
-                pinch.minimumScale: 0.1
-                pinch.maximumScale: 10
-                onPinchFinished: photoFrame.border.color = "black";
-                MouseArea {
-                    id: dragArea
-                    hoverEnabled: true
-                    anchors.fill: parent
-                    drag.target: photoFrame
-                    onPressed: photoFrame.z = ++root.highestZ;
-                    onEntered: photoFrame.border.color = "red";
-                    onExited: photoFrame.border.color = "black";
-                    onWheel: {
-                        if (wheel.modifiers & Qt.ControlModifier) {
-                            photoFrame.rotation += wheel.angleDelta.y / 120 * 5;
-                            if (Math.abs(photoFrame.rotation) < 4)
-                                photoFrame.rotation = 0;
-                        } else {
-                            photoFrame.rotation += wheel.angleDelta.x / 120;
-                            if (Math.abs(photoFrame.rotation) < 0.6)
-                                photoFrame.rotation = 0;
-                            var scaleBefore = image.scale;
-                            image.scale += image.scale * wheel.angleDelta.y / 120 / 10;
-                            photoFrame.x -= image.width * (image.scale - scaleBefore) / 2.0;
-                            photoFrame.y -= image.height * (image.scale - scaleBefore) / 2.0;
-                        }
-                    }
-                }
-            }
-        }
-    }
-//    Text {
-//        anchors.bottom: parent.bottom
-//        anchors.left: parent.left
-//        anchors.margins: 10
-//        color: "darkgrey"
-//        text: "On a touchscreen: use two fingers to zoom and rotate, one finger to drag\n" +
-//              "With a mouse: drag normally, use the vertical wheel to zoom, horizontal wheel to rotate, or hold Ctrl while using the vertical wheel to rotate"
-//        wrapMode: Text.Wrap
-//    }
-
-    //Component.onCompleted: fileDialog.open()
-}
diff --git a/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml b/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml
deleted file mode 100644
index 11b687e..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/VolumeButton.qml
+++ /dev/null
@@ -1,185 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: root
-    width: size
-    height: size
-
-    property int steps: 10
-    property int size: 0
-    property real volume: .5
-    property bool playing: false
-    signal clicked();
-
-    Item {
-        id: bg
-        anchors.fill: parent
-
-        Rectangle {
-            id: bgRect
-
-            gradient: Gradient {
-                GradientStop {position: .0; color: "lightgray"}
-                GradientStop {position: 1.0; color: "white"}
-            }
-
-            border {width:1; color: "#888888"}
-            radius: root.size/2
-            anchors.centerIn: parent
-            width: parent.width
-            height: parent.height
-        }
-
-        Rectangle {
-            gradient: Gradient {
-                GradientStop {position: .0; color: playButtonMouseArea.pressed ? "#052e41": "#095477"}
-                GradientStop {position: 1.0; color: playButtonMouseArea.pressed ? "#095477": "#052e41"}
-            }
-
-            border {width:1; color: "#888888"}
-            radius: width/2
-            anchors.centerIn: parent
-            width: parent.width*.6
-            height: parent.height*.6
-
-            Image {
-                anchors {fill: parent; margins: parent.height*.3}
-                source: !root.playing ? "images/radio_btn_play.png" : "images/radio_btn_pause.png"
-            }
-
-            MouseArea {
-                id: playButtonMouseArea
-                anchors.fill: parent
-                anchors.margins: parent.width*.2
-                onClicked:{
-                    root.clicked()
-                }
-            }
-        }
-    }
-
-    Item {
-        id: volumeIndicator
-        anchors.centerIn: root
-        width: root.size
-        height: root.size
-        z:2
-
-        Rectangle{
-            id: volumeCircle
-            objectName: "volumeCircle"
-            anchors {horizontalCenter: parent.horizontalCenter; top: parent.top}
-
-            gradient: Gradient {
-                GradientStop {position: .1; color: "#095477"}
-                GradientStop {position: 1.0; color: "#0e82b8"}
-            }
-
-            width: root.size * .2
-            height: width
-            radius: width/2
-            border {width:1; color: "#888888"}
-
-            Image {
-                anchors {fill: parent; margins: parent.height*.2}
-                source: "images/radio_sound_icon.png"
-                rotation: -volumeRotation.angle
-            }
-        }
-
-        transform: Rotation {
-            id: volumeRotation
-            origin.x: volumeIndicator.width/2
-            origin.y: volumeIndicator.height/2
-            angle: 270.0*root.volume+225
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: volumeIndicator
-        property bool grabbed: false
-        anchors.margins: -root.size*.2
-        z: -1
-
-        onPressed: {
-            var object = mapToItem(volumeIndicator, mouse.x, mouse.y)
-            var item = volumeIndicator.childAt(object.x,object.y)
-            if (item && item.objectName === 'volumeCircle') {
-                grabbed = true
-                return;
-            } else {
-                grabbed = false
-            }
-
-            object = mapToItem(root, mouse.x, mouse.y)
-            item = root.childAt(object.x,object.y)
-            if (item && item.objectName === 'volumePoint') {
-                root.volume = item.level
-            }
-        }
-
-        onPositionChanged: {
-            if (!grabbed) return;
-            var ang = (225+Math.atan2((mouse.y-mouseArea.height/2.0), (mouse.x-mouseArea.width/2.0))*180.0/Math.PI)
-            if (ang >360) ang-=360
-            if (ang > 270) return;
-            root.volume = (ang)/270.0
-        }
-    }
-
-    function init(){
-        for (var i=0; i<=root.steps; i++){
-            var x=Math.cos(((i)*270/root.steps+135)*0.01745)*root.size*.40
-            var y=Math.sin(((i)*270/root.steps+135)*0.01745)*root.size*.40
-            var component = Qt.createComponent("VolumePoint.qml")
-            if (component.status === Component.Ready) {
-                var object = component.createObject(root);
-                object.size = root.size*.05
-                object.x = root.size/2+x-object.size/2
-                object.y = root.size/2+y-object.size/2
-                object.level = i/root.steps
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml b/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml
deleted file mode 100644
index a491860..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/VolumePoint.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    objectName: "volumePoint"
-    width: size
-    height: size
-    radius: size/2
-    color: volume >= level ? "#0e82b8": "#095477"
-    border {width:1; color: "#888888"}
-    property int size: 10
-    property real level: 0
-    property real volume: parent.volume
-
-    Behavior on color{ColorAnimation { duration: 500 }}
-
-    Item {
-        id: pointClickArea
-        objectName: "pointClickArea"
-        property alias value: root.level
-        anchors.fill: parent
-        anchors.margins: -root.size*2
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/radio/channels.xml b/basicsuite/qt5-everywhere/demos/radio/channels.xml
deleted file mode 100644
index 0ba2bb7..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/channels.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-    <radio>
-        <channel>
-            <title>BBC World Service</title>
-            <url>http://vpr.streamguys.net/vpr24.mp3</url>
-        </channel>
-        <channel>
-            <title>"JPR Classics"</title>
-            <url>http://jpr.streamguys.org:80/jpr-classics</url>
-        </channel>
-        <channel>
-            <title>VPR Classical</title>
-            <url>http://vprclassical.streamguys.net/vprclassical24.mp3</url>
-        </channel>
-        <channel>
-            <title>VPR Jazz24</title>
-            <url>http://vprjazz.streamguys.net/vprjazz24.mp3</url>
-        </channel>
-        <channel>
-            <title>Radio Paradise</title>
-            <url>http://stream-tx1.radioparadise.com/mp3-128</url>
-        </channel>
-    </radio>
diff --git a/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_pause.png b/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_pause.png
deleted file mode 100644
index 5204834..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_pause.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_play.png b/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_play.png
deleted file mode 100644
index 92ee858..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_play.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_stop.png b/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_stop.png
deleted file mode 100644
index 187158a..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/images/radio_btn_stop.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/radio/images/radio_sound_icon.png b/basicsuite/qt5-everywhere/demos/radio/images/radio_sound_icon.png
deleted file mode 100644
index ac0b61e..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/images/radio_sound_icon.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/radio/images/volume.png b/basicsuite/qt5-everywhere/demos/radio/images/volume.png
deleted file mode 100644
index a098d82..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/images/volume.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/radio/radio.qml b/basicsuite/qt5-everywhere/demos/radio/radio.qml
deleted file mode 100644
index e81c567..0000000
--- a/basicsuite/qt5-everywhere/demos/radio/radio.qml
+++ /dev/null
@@ -1,285 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtMultimedia 5.0
-import QtQuick.XmlListModel 2.0
-
-FocusScope {
-    id: scope
-    x: parent.x; y: parent.y
-    width: parent.width; height: parent.height
-    focus: true
-    property bool active: false
-
-    Rectangle {
-        id: root
-        width:parent.width
-        height: parent.height
-        anchors.centerIn: parent
-        focus: true
-        color: "#262626"
-
-        Audio {
-            id: playMusic
-            source: ""
-            volume: volumeButton.volume
-            onSourceChanged: {
-                if (volumeButton.playing) playMusic.play()
-            }
-            onAvailabilityChanged: {
-                if (availability === Audio.Available) {
-                    if (volumeButton.playing) playMusic.play()
-                }
-            }
-            Component.onDestruction: {
-                volumeButton.playing = false
-                playMusic.stop()
-                playMusic.source = ""
-            }
-        }
-
-        Rectangle {
-            id: playerRect
-            anchors.top: volumeButton.top
-            anchors.left: volumeButton.left
-            anchors.bottom: volumeButton.bottom
-            anchors.right: parent.right
-            anchors.rightMargin: parent.height*.05
-            gradient: Gradient {
-                GradientStop {position: .1; color: "lightgrey"}
-                GradientStop {position: 1.0; color: "white"}
-            }
-            border {width:1; color: "#888888"}
-            radius: height/2
-
-            Rectangle {
-                id: displayRect
-                anchors.fill: parent
-                anchors.margins: parent.height*.1
-                gradient: Gradient {
-                    GradientStop {position: .0; color: "#095477"}
-                    GradientStop {position: 1.0; color: "#052e41"}
-                }
-                border {width:1; color: "#888888"}
-                radius: height/2
-
-
-                Item {
-                    id: networkErrorBox
-                    opacity: 0
-                    anchors.fill: parent
-
-                    Text {
-                        anchors.verticalCenter: parent.verticalCenter
-                        anchors.right: parent.right
-                        anchors.rightMargin: parent.width * 0.1
-                        text: qsTr("Sorry! No network connection")
-                        font.pixelSize: stationList.height*.1;
-                        color: "white"
-                        smooth: true
-                    }
-                }
-
-                PathView {
-                    enabled: root.activeFocus
-                    id: stationList
-                    anchors.fill:parent
-                    anchors.leftMargin: parent.height*.9
-                    model: stationModel
-                    pathItemCount: 6
-                    clip: true
-                    property int openedIndex: -1
-
-                    onMovementStarted: {
-                        idleTimer.stop()
-                        openedIndex = -1
-                        pathItemCount = 5
-                    }
-                    onMovementEnded: idleTimer.restart()
-
-                    onOpenedIndexChanged: {
-                        if (openedIndex === -1) return
-                        idleTimer.lastIndex=openedIndex
-                        positionViewAtIndex(openedIndex, PathView.Center)
-                    }
-
-                    Timer {
-                        id: idleTimer
-                        interval: 5000
-                        property int lastIndex: -1
-                        onTriggered: {
-                            stationList.openedIndex = idleTimer.lastIndex
-                        }
-                    }
-
-                    Timer {
-                        id: browseTimer
-                        interval: 500
-                        property string source:""
-                        onTriggered: playMusic.source = source
-                    }
-
-                    path: Path {
-                        startX: stationList.x; startY: 0
-                        PathArc {
-                            id: pathArc
-                            x: stationList.x; relativeY: stationList.height*1.1
-                            radiusX: volumeButton.height/2
-                            radiusY: volumeButton.height/2
-                            useLargeArc: false
-                        }
-                    }
-
-                    delegate:  Item {
-                        id: stationDelegate
-                        property bool opened: stationList.openedIndex === index
-                        width: stationList.width*.7
-                        height: opened? stationList.height*.4: stationList.height*.2
-
-                        Behavior on height {NumberAnimation{duration:200}}
-
-                        Text {
-                            id: delegateText
-                            anchors.left: parent.left
-                            anchors.top: parent.top
-                            text: (index+1) +". " +title
-                            font.pixelSize: stationDelegate.opened? stationList.height*.15 : stationList.height*.1
-                            font.weight: stationDelegate.opened? Font.Bold: Font.Normal
-                            color: stationList.openedIndex ===-1 || opened? "white": "#0e82b8"
-                            Behavior on font.pixelSize {NumberAnimation{duration:200}}
-                        }
-
-                        Text {
-                            id: statustextText
-                            anchors.left: parent.left
-                            anchors.top: delegateText.bottom
-
-                            text: playMusic.playbackState=== Audio.PlayingState ? "Playing...":
-                                                                                  playMusic.status=== Audio.Buffering ? "Buffering...":
-                                                                                                                        playMusic.status=== Audio.Loading ? "Loading...":
-                                                                                                                                                            playMusic.playbackState=== Audio.StoppedState ? "Stopped":"Error"
-
-                            font.pixelSize: stationList.height*.1
-                            color: delegateText.color
-                            opacity: opened? 1.0: .0
-                            Behavior on opacity {NumberAnimation{duration:200}}
-                        }
-
-
-                        MouseArea {
-                            anchors.fill: parent
-                            visible: root.activeFocus
-
-                            onClicked: {
-                                if (opened){
-                                    idleTimer.lastIndex=-1
-                                    stationList.openedIndex=-1
-                                }else {
-                                    stationList.openedIndex= index
-                                    browseTimer.source = url
-                                    browseTimer.restart()
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        XmlListModel {
-            id: stationModel
-            source: "http://qt-project.org/uploads/videos/qt5_radio_channels.xml"
-            query: "/radio/channel"
-            XmlRole {name: "title"; query: "title/string()"}
-            XmlRole {name: "url"; query: "url/string()"}
-
-            onStatusChanged: {
-                if (status == XmlListModel.Ready) {
-                    networkErrorBox.opacity = 0;
-                } else if (status == XmlListModel.Error) {
-                    networkErrorBox.opacity = 1;
-                }
-            }
-        }
-
-        VolumeButton {
-            id: volumeButton
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.left: parent.left
-            anchors.leftMargin: size*.1
-            size:parent.height*.5
-            playing: playMusic.playbackState === Audio.PlayingState
-            onClicked: {
-                if (!playMusic.source) return;
-                if (!playing) {
-                    playMusic.play()
-                }else {
-                    playMusic.stop()
-                }
-            }
-        }
-
-        Component.onCompleted: {
-            volumeButton.init()
-            scope.focus = true
-        }
-
-        Keys.onPressed: {
-            if (event.key === Qt.Key_Down || event.key === Qt.Key_VolumeDown) {
-                event.accepted = true
-                if (volumeButton.volume > .1){
-                    volumeButton.volume-=.1
-                }else{
-                    volumeButton.volume = 0.0
-                }
-            }
-
-            if (event.key === Qt.Key_Up || event.key === Qt.Key_VolumeUp) {
-                event.accepted = true
-                if (volumeButton.volume < .9){
-                    volumeButton.volume+=.1
-                }else{
-                    volumeButton.volume = 1.0
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml
deleted file mode 100644
index 97065b2..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/content/BusyIndicator.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Image {
-    id: container
-    property bool on: false
-
-    source: "images/busy.png"; visible: container.on
-
-    NumberAnimation on rotation {
-        running: container.on; from: 0; to: 360; loops: Animation.Infinite; duration: 1200
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml
deleted file mode 100644
index ae70e44..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/content/CategoryDelegate.qml
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: delegate
-    property double margin: delegate.height * 0.2;
-    width: delegate.ListView.view.width;
-    height: 60
-
-    Text {
-        text: name
-        color: delegate.ListView.isCurrentItem ? "white" : "black"
-        font { family: "Helvetica"; pixelSize: delegate.height * 0.25; bold: true }
-        anchors {
-            left: parent.left;
-            leftMargin: margin
-            verticalCenter: parent.verticalCenter
-        }
-    }
-
-    BusyIndicator {
-        scale: 0.6
-        on: delegate.ListView.isCurrentItem && window.loading
-        anchors { right: parent.right; rightMargin: margin; verticalCenter: parent.verticalCenter }
-    }
-
-    Rectangle {
-        width: delegate.width; height: 1; color: "#cccccc"
-        anchors.bottom: delegate.bottom
-        visible: delegate.ListView.isCurrentItem ? false : true
-    }
-    Rectangle {
-        width: delegate.width; height: 1; color: "white"
-        visible: delegate.ListView.isCurrentItem ? false : true
-    }
-
-    MouseArea {
-        anchors.fill: delegate
-        onClicked: {
-            delegate.ListView.view.currentIndex = index
-            window.currentFeed = feed
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml
deleted file mode 100644
index 7080312..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/content/NewsDelegate.qml
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: delegate
-    height: column.height + 2*margin
-    width: delegate.ListView.view.width
-
-    property double margin: width * 0.03
-
-    Column {
-        id: column
-        x: margin; y: margin
-        width: parent.width - 2*margin
-
-        Text {
-            id: titleText
-            text: title; width: parent.width; wrapMode: Text.WordWrap
-            font { bold: true; family: "Helvetica"; pixelSize: 20}
-        }
-
-        Text {
-            id: descriptionText
-            width: parent.width; text: description
-            wrapMode: Text.WordWrap
-            font.family: "Helvetica"
-            font.pixelSize: 12
-        }
-    }
-
-    Rectangle {
-        width: parent.width; height: 1; color: "#cccccc"
-        anchors.bottom: parent.bottom
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml
deleted file mode 100644
index 2f0591b..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/content/RssFeeds.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-ListModel {
-    id: rssFeeds
-
-    ListElement { name: "Top Stories"; feed: "feeds.bbci.co.uk/news/rss.xml" }
-    ListElement { name: "Popular Stories"; feed: "finance.yahoo.com/rss/popularstories" }
-    ListElement { name: "Qt Blog"; feed: "blog.qt.digia.com/feed/" }
-    ListElement { name: "Planet Qt"; feed: "planet.qt-project.org/rss20.xml" }
-    ListElement { name: "World"; feed: "rss.news.yahoo.com/rss/world" }
-    ListElement { name: "Oceania"; feed: "rss.news.yahoo.com/rss/oceania" }
-    ListElement { name: "U.S. National"; feed: "rss.news.yahoo.com/rss/us" }
-    ListElement { name: "Business"; feed: "rss.news.yahoo.com/rss/business" }
-    ListElement { name: "Technology"; feed: "rss.news.yahoo.com/rss/tech" }
-    ListElement { name: "Entertainment"; feed: "rss.news.yahoo.com/rss/entertainment" }
-    ListElement { name: "Sports"; feed: "sports.yahoo.com/mlb/teams/bos/rss.xml" }
-}
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml
deleted file mode 100644
index 02ad7ea..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/content/ScrollBar.qml
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: container
-
-    property variant scrollArea
-    property variant orientation: Qt.Vertical
-
-    opacity: 0
-
-    function position()
-    {
-        var ny = 0;
-        if (container.orientation == Qt.Vertical)
-            ny = scrollArea.visibleArea.yPosition * container.height;
-        else
-            ny = scrollArea.visibleArea.xPosition * container.width;
-        if (ny > 2) return ny; else return 2;
-    }
-
-    function size()
-    {
-        var nh, ny;
-
-        if (container.orientation == Qt.Vertical)
-            nh = scrollArea.visibleArea.heightRatio * container.height;
-        else
-            nh = scrollArea.visibleArea.widthRatio * container.width;
-
-        if (container.orientation == Qt.Vertical)
-            ny = scrollArea.visibleArea.yPosition * container.height;
-        else
-            ny = scrollArea.visibleArea.xPosition * container.width;
-
-        if (ny > 3) {
-            var t;
-            if (container.orientation == Qt.Vertical)
-                t = Math.ceil(container.height - 3 - ny);
-            else
-                t = Math.ceil(container.width - 3 - ny);
-            if (nh > t) return t; else return nh;
-        } else return nh + ny;
-    }
-
-    Rectangle { anchors.fill: parent; color: "Black"; opacity: 0.3 }
-
-    BorderImage {
-        source: "images/scrollbar.png"
-        border { left: 1; right: 1; top: 1; bottom: 1 }
-        x: container.orientation == Qt.Vertical ? 2 : position()
-        width: container.orientation == Qt.Vertical ? container.width - 4 : size()
-        y: container.orientation == Qt.Vertical ? position() : 2
-        height: container.orientation == Qt.Vertical ? size() : container.height - 4
-    }
-
-    states: State {
-        name: "visible"
-        when: container.orientation == Qt.Vertical ? scrollArea.movingVertically : scrollArea.movingHorizontally
-        PropertyChanges { target: container; opacity: 1.0 }
-    }
-
-    transitions: Transition {
-        from: "visible"; to: ""
-        NumberAnimation { properties: "opacity"; duration: 600 }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/images/busy.png b/basicsuite/qt5-everywhere/demos/rssnews/content/images/busy.png
deleted file mode 100644
index 664c2b1..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/content/images/busy.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/content/images/scrollbar.png b/basicsuite/qt5-everywhere/demos/rssnews/content/images/scrollbar.png
deleted file mode 100644
index 0228dcf..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/content/images/scrollbar.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml b/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml
deleted file mode 100644
index 213d9e8..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qml
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.XmlListModel 2.0
-import "content"
-
-Rectangle {
-    id: window
-    anchors.fill: parent
-    gradient: Gradient {
-        GradientStop { position: 0.0; color: "#eeeeee" }
-        GradientStop { position: 0.1; color: "#ffffff" }
-        GradientStop { position: 0.9; color: "#ffffff" }
-        GradientStop { position: 1.0; color: "#bbbbbb" }
-    }
-
-    property int listWidth: window.width*0.35
-    property string currentFeed: "feeds.bbci.co.uk/news/rss.xml"
-    property bool loading: feedModel.status == XmlListModel.Loading
-
-    RssFeeds { id: rssFeeds }
-
-    XmlListModel {
-        id: feedModel
-        source: "http://" + window.currentFeed
-        query: "/rss/channel/item"
-
-        XmlRole { name: "title"; query: "title/string()" }
-        XmlRole { name: "link"; query: "link/string()" }
-        XmlRole { name: "description"; query: "description/string()" }
-
-        onStatusChanged: {
-            if (status == XmlListModel.Error) {
-                networkErrorBox.opacity = 1.0
-            } else if (status == XmlListModel.Ready) {
-                networkErrorBox.opacity = 0.0
-            }
-        }
-    }
-
-    Row {
-        Rectangle {
-            id: categoryContent
-            width: window.listWidth; height: window.height
-            color: "#efefef"
-
-            ListView {
-                id: categories
-                anchors.fill: parent
-                model: rssFeeds
-                delegate: CategoryDelegate {}
-                highlight: Rectangle { color: "steelblue" }
-                highlightMoveVelocity: 9999999
-            }
-            ScrollBar {
-                scrollArea: categories; height: categories.height; width: 8
-                anchors.right: categories.right
-            }
-        }
-        ListView {
-            id: list
-            width: window.width - window.listWidth; height: window.height
-            model: feedModel
-            delegate: NewsDelegate {}
-
-            Item {
-                id: networkErrorBox
-                opacity: 0
-                anchors.fill: parent
-
-                Text {
-                    anchors.centerIn: parent
-                    text: qsTr("Sorry! No network connection")
-                }
-            }
-        }
-    }
-
-
-    ScrollBar { scrollArea: list; height: list.height; width: 8; anchors.right: window.right }
-    Rectangle { x: window.listWidth; height: window.height; width: 1; color: "#cccccc" }
-}
diff --git a/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qmlproject b/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qmlproject
deleted file mode 100644
index 5becbda..0000000
--- a/basicsuite/qt5-everywhere/demos/rssnews/rssnews.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.1
-
-Project {
-    mainFile: "rssnews.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml b/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml
deleted file mode 100644
index b643f4e..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/Block.qml
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: block
-    property bool dying: false
-    property bool spawned: false
-    property int type: 0
-    property ParticleSystem particleSystem
-
-    Behavior on x {
-        enabled: spawned;
-        SpringAnimation{ spring: 2; damping: 0.2 }
-    }
-    Behavior on y {
-        SpringAnimation{ spring: 2; damping: 0.2 }
-    }
-
-    Image {
-        id: img
-        source: {
-            if (type == 0){
-                "gfx/red.png";
-            } else if (type == 1) {
-                "gfx/blue.png";
-            } else if (type == 2) {
-                "gfx/green.png";
-            } else {
-                "gfx/yellow.png";
-            }
-        }
-        opacity: 0
-        Behavior on opacity { NumberAnimation { duration: 200 } }
-        anchors.fill: parent
-    }
-
-    //Foreground particles
-    BlockEmitter {
-        id: particles
-        system: particleSystem
-        group: {
-            if (type == 0){
-                "red";
-            } else if (type == 1) {
-                "blue";
-            } else if (type == 2) {
-                "green";
-            } else {
-                "yellow";
-            }
-        }
-        anchors.fill: parent
-    }
-
-    //Paint particles on the background
-    PaintEmitter {
-        id: particles2
-        system: particleSystem
-    }
-
-    states: [
-        State {
-            name: "AliveState"; when: spawned == true && dying == false
-            PropertyChanges { target: img; opacity: 1 }
-        },
-
-        State {
-            name: "DeathState"; when: dying == true
-            StateChangeScript { script: {particleSystem.paused = false; particles.pulse(100); particles2.pulse(100);} }
-            PropertyChanges { target: img; opacity: 0 }
-            StateChangeScript { script: block.destroy(1000); }
-        }
-    ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml
deleted file mode 100644
index f2c975f..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/BlockEmitter.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-import "../settings.js" as Settings
-
-Emitter {
-    property Item block: parent
-    velocity: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -40; magnitudeVariation: 40}
-    acceleration: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -100;}
-    shape: EllipseShape{fill:true}
-    enabled: false;
-    lifeSpan: 700; lifeSpanVariation: 100
-    emitRate: 1000
-    maximumEmitted: 100 //only fires 0.1s bursts (still 2x old number)
-    size: Settings.blockSize * 0.85
-    endSize: Settings.blockSize * 0.85 /2
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml b/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml
deleted file mode 100644
index 5fcc578..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/Button.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    property alias imgSrc: image.source
-    property alias system: emitter.system
-    property alias group: emitter.group
-    signal clicked
-    property bool rotatedButton: false
-
-    width: image.width
-    height: image.sourceSize.height
-    Image {
-        id: image
-        height: parent.height
-        width: height/sourceSize.height * sourceSize.width
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        rotation: rotatedButton ? ((Math.random() * 3 + 2) * (Math.random() <= 0.5 ? -1 : 1)) : 0
-        MenuEmitter {
-            id: emitter
-            anchors.fill: parent
-            //shape: MaskShape {source: image.source}
-        }
-    }
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {parent.clicked(); emitter.burst(400);}
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml b/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml
deleted file mode 100644
index 3a9e59b..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/GameArea.qml
+++ /dev/null
@@ -1,226 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "samegame.js" as Logic
-
-Item {
-    id: gameCanvas
-    property bool gameOver: true
-    property int score: 0
-    property int highScore: 0
-    property int moves: 0
-    property string mode: ""
-    property ParticleSystem ps: particleSystem
-    //For easy theming
-    property alias backgroundVisible: bg.visible
-    property string background: "gfx/background.png"
-    property string blockFile: "Block.qml"
-    onBlockFileChanged: Logic.changeBlock(blockFile);
-    property alias particlePack: auxLoader.source
-    //For multiplayer
-    property int score2: 0
-    property int curTurn: 1
-    property bool autoTurnChange: false
-    signal swapPlayers
-    property bool swapping: false
-    //onSwapPlayers: if (autoTurnChange) Logic.turnChange();//Now implemented below
-    //For puzzle
-    property url level
-    property bool puzzleWon: false
-    signal puzzleLost //Since root is tracking the puzzle progress
-    function showPuzzleEnd (won) {
-        if (won) {
-            smokeParticle.color = Qt.rgba(0,1,0,0);
-            puzzleWin.play();
-        } else {
-            smokeParticle.color = Qt.rgba(1,0,0,0);
-            puzzleFail.play();
-            puzzleLost();
-        }
-    }
-    function showPuzzleGoal (str) {
-        puzzleTextBubble.opacity = 1;
-        puzzleTextLabel.text = str;
-    }
-    Image {
-        id: bg
-        z: -1
-        anchors.fill: parent
-        source: background;
-        fillMode: Image.PreserveAspectCrop
-    }
-
-    MouseArea {
-        anchors.fill: parent; onClicked: {
-            if (puzzleTextBubble.opacity == 1) {
-                puzzleTextBubble.opacity = 0;
-                Logic.finishLoadingMap();
-            } else if (!swapping) {
-                Logic.handleClick(mouse.x,mouse.y);
-            }
-        }
-    }
-
-    Image {
-        id: highScoreTextBubble
-        opacity: mode == "arcade" && gameOver && gameCanvas.score == gameCanvas.highScore ? 1 : 0
-        Behavior on opacity { NumberAnimation {} }
-        anchors.centerIn: parent
-        z: 10
-        source: "gfx/bubble-highscore.png"
-        Image {
-            anchors.centerIn: parent
-            source: "gfx/text-highscore-new.png"
-            rotation: -10
-        }
-    }
-
-    Image {
-        id: puzzleTextBubble
-        anchors.centerIn: parent
-        opacity: 0
-        Behavior on opacity { NumberAnimation {} }
-        z: 10
-        source: "gfx/bubble-puzzle.png"
-        Connections {
-            target: gameCanvas
-            onModeChanged: if (mode != "puzzle" && puzzleTextBubble.opacity > 0) puzzleTextBubble.opacity = 0;
-        }
-        Text {
-            id: puzzleTextLabel
-            width: parent.width - 24
-            anchors.centerIn: parent
-            horizontalAlignment: Text.AlignHCenter
-            color: "white"
-            font.pixelSize: 24
-            font.bold: true
-            wrapMode: Text.WordWrap
-        }
-    }
-    onModeChanged: {
-        p1WonImg.opacity = 0;
-        p2WonImg.opacity = 0;
-    }
-    SmokeText { id: puzzleWin; source: "gfx/icon-ok.png"; system: particleSystem }
-    SmokeText { id: puzzleFail; source: "gfx/icon-fail.png"; system: particleSystem }
-
-    onSwapPlayers: {
-        smokeParticle.color = "yellow"
-        Logic.turnChange();
-        if (curTurn == 1) {
-            p1Text.play();
-        } else {
-            p2Text.play();
-        }
-        clickDelay.running = true;
-    }
-    SequentialAnimation {
-        id: clickDelay
-        ScriptAction { script: gameCanvas.swapping = true; }
-        PauseAnimation { duration: 750 }
-        ScriptAction { script: gameCanvas.swapping = false; }
-    }
-
-    SmokeText {
-        id: p1Text; source: "gfx/text-p1-go.png";
-        system: particleSystem; playerNum: 1
-        opacity: p1WonImg.opacity + p2WonImg.opacity > 0 ? 0 : 1
-    }
-
-    SmokeText {
-        id: p2Text; source: "gfx/text-p2-go.png";
-        system: particleSystem; playerNum: 2
-        opacity: p1WonImg.opacity + p2WonImg.opacity > 0 ? 0 : 1
-    }
-
-    onGameOverChanged: {
-        if (gameCanvas.mode == "multiplayer") {
-            if (gameCanvas.score >= gameCanvas.score2) {
-                p1WonImg.opacity = 1;
-            } else {
-                p2WonImg.opacity = 1;
-            }
-        }
-    }
-    Image {
-        id: p1WonImg
-        source: "gfx/text-p1-won.png"
-        anchors.centerIn: parent
-        opacity: 0
-        Behavior on opacity { NumberAnimation {} }
-        z: 10
-    }
-    Image {
-        id: p2WonImg
-        source: "gfx/text-p2-won.png"
-        anchors.centerIn: parent
-        opacity: 0
-        Behavior on opacity { NumberAnimation {} }
-        z: 10
-    }
-
-    ParticleSystem{
-        id: particleSystem;
-        anchors.fill: parent
-        z: 5
-        ImageParticle {
-            id: smokeParticle
-            groups: ["smoke"]
-            source: "gfx/particle-smoke.png"
-            alpha: 0.1
-            alphaVariation: 0.1
-            color: "yellow"
-        }
-        Loader {
-            id: auxLoader
-            anchors.fill: parent
-            source: "PrimaryPack.qml"
-            onItemChanged: {
-                if (item && "particleSystem" in item)
-                    item.particleSystem = particleSystem
-                if (item && "gameArea" in item)
-                    item.gameArea = gameCanvas
-            }
-        }
-    }
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml b/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml
deleted file mode 100644
index 0322c67..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/LogoAnimation.qml
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: container //Positioned where the 48x48 S/G should be
-    property alias running: mainAnim.running
-    property ParticleSystem particleSystem
-    property int dur: 500
-    signal boomTime
-    Image {
-        id: s1
-        source: "gfx/logo-s.png"
-        y: 0
-    }
-    Image {
-        id: g1
-        source: "gfx/logo-g.png"
-        y: -128
-    }
-    Column {
-        Repeater {
-            model: 2
-            Item {
-                width: 48
-                height: 48
-                BlockEmitter {
-                    id: emitter
-                    anchors.fill: parent
-                    group: "red"
-                    system: particleSystem
-                    Connections {
-                        target: container
-                        onBoomTime: emitter.pulse(100);
-                    }
-                }
-            }
-        }
-    }
-    SequentialAnimation {
-        id: mainAnim
-        running: true
-        loops: -1
-        PropertyAction { target: g1; property: "y"; value: -128}
-        PropertyAction { target: g1; property: "opacity"; value: 1}
-        PropertyAction { target: s1; property: "y"; value: 0}
-        PropertyAction { target: s1; property: "opacity"; value: 1}
-        NumberAnimation { target: g1; property: "y"; from: -96; to: -48; duration: dur}
-        ParallelAnimation {
-            NumberAnimation { target: g1; property: "y"; from: -48; to: 0; duration: dur}
-            NumberAnimation { target: s1; property: "y"; from: 0; to: 48; duration: dur }
-        }
-        PauseAnimation { duration: dur }
-        ScriptAction { script: container.boomTime(); }
-        ParallelAnimation {
-            NumberAnimation { target: g1; property: "opacity"; to: 0; duration: dur }
-            NumberAnimation { target: s1; property: "opacity"; to: 0; duration: dur }
-        }
-        PropertyAction { target: s1; property: "y"; value: -128}
-        PropertyAction { target: s1; property: "opacity"; value: 1}
-        NumberAnimation { target: s1; property: "y"; from: -96; to: 0; duration: dur * 2}
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml
deleted file mode 100644
index c74b7a3..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/MenuEmitter.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Emitter {
-    anchors.fill: parent
-    velocity: AngleDirection{angleVariation: 360; magnitude: 140; magnitudeVariation: 40}
-    enabled: false;
-    lifeSpan: 500;
-    emitRate: 1
-    size: 28
-    endSize: 14
-    group: "yellow"
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml
deleted file mode 100644
index c448cba..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/PaintEmitter.qml
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "../settings.js" as Settings
-
-Emitter {
-    property Item block: parent
-    anchors.fill: parent
-    shape: EllipseShape { fill: true }
-    group: {
-        if (block.type == 0){
-            "redspots";
-        } else if (block.type == 1) {
-            "bluespots";
-        } else if (block.type == 2) {
-            "greenspots";
-        } else {
-            "yellowspots";
-        }
-    }
-    size: Settings.blockSize * 2
-    endSize: Settings.blockSize/2
-    lifeSpan: 30000
-    enabled: false
-    emitRate: 60
-    maximumEmitted: 60
-    velocity: PointDirection{ y: 4; yVariation: 4 }
-    /* Possibly better, but dependent on gerrit change,28212
-    property real mainIntensity: 0.8
-    property real subIntensity: 0.1
-    property real colorVariation: 0.005
-    onEmitParticles: {//One group, many colors, for better stacking
-        for (var i=0; i<particles.length; i++) {
-            var particle = particles[i];
-            if (block.type == 0) {
-                particle.red = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            } else if (block.type == 1) {
-                particle.red = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            } else if (block.type == 2) {
-                particle.red = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            } else if (block.type == 3) {
-                particle.red = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            } else {
-                particle.red = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            }
-        }
-    }
-    */
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml
deleted file mode 100644
index 166fcb8..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/PrimaryPack.qml
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: container
-    property ParticleSystem particleSystem
-    property GameArea gameArea
-    onGameAreaChanged: bgstacker.parent = gameArea;//Move to direct child of game canvas
-    Item {
-        id: bgstacker
-        z: 0
-        ImageParticle {
-            groups: ["yellowspots"]
-            color: Qt.darker("yellow");//Actually want desaturated...
-            system: particleSystem
-            source: "gfx/particle-paint.png"
-            colorVariation: 0.2
-            alpha: 0.2
-            entryEffect: ImageParticle.None
-        }
-        ImageParticle {
-            groups: ["redspots"]
-            system: particleSystem
-            color: Qt.darker("red");//Actually want desaturated...
-            source: "gfx/particle-paint.png"
-            colorVariation: 0.2
-            alpha: 0.2
-            entryEffect: ImageParticle.None
-        }
-        ImageParticle {
-            groups: ["greenspots"]
-            system: particleSystem
-            color: Qt.darker("green");//Actually want desaturated...
-            source: "gfx/particle-paint.png"
-            colorVariation: 0.2
-            alpha: 0.2
-            entryEffect: ImageParticle.None
-        }
-        ImageParticle {
-            groups: ["bluespots"]
-            system: particleSystem
-            color: Qt.darker("blue");//Actually want desaturated...
-            source: "gfx/particle-paint.png"
-            colorVariation: 0.2
-            alpha: 0.2
-            entryEffect: ImageParticle.None
-        }
-    }
-    ImageParticle {
-        groups: ["yellow"]
-        system: particleSystem
-        color: Qt.darker("yellow");//Actually want desaturated...
-        source: "gfx/particle-brick.png"
-        colorVariation: 0.4
-        alpha: 0.1
-    }
-    ImageParticle {
-        groups: ["red"]
-        system: particleSystem
-        color: Qt.darker("red");//Actually want desaturated...
-        source: "gfx/particle-brick.png"
-        colorVariation: 0.4
-        alpha: 0.1
-    }
-    ImageParticle {
-        groups: ["green"]
-        system: particleSystem
-        color: Qt.darker("green");//Actually want desaturated...
-        source: "gfx/particle-brick.png"
-        colorVariation: 0.4
-        alpha: 0.1
-    }
-    ImageParticle {
-        groups: ["blue"]
-        system: particleSystem
-        color: Qt.darker("blue");//Actually want desaturated...
-        source: "gfx/particle-brick.png"
-        colorVariation: 0.4
-        alpha: 0.1
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml b/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml
deleted file mode 100644
index 963565a..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/PuzzleBlock.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: block
-    property bool dying: false
-    property bool spawned: false
-    property int type: 0
-    property ParticleSystem particleSystem
-
-    Behavior on x {
-        enabled: spawned;
-        NumberAnimation{ easing.type: Easing.OutBounce }
-    }
-    Behavior on y {
-        NumberAnimation{ easing.type: Easing.InQuad }
-    }
-
-    Image {
-        id: img
-        source: {
-            if (type == 0){
-                "gfx/red-puzzle.png";
-            } else if (type == 1) {
-                "gfx/blue-puzzle.png";
-            } else if (type == 2) {
-                "gfx/green-puzzle.png";
-            } else {
-                "gfx/yellow-puzzle.png";
-            }
-        }
-        opacity: 0
-        Behavior on opacity { NumberAnimation { duration: 200 } }
-        anchors.centerIn: parent
-        anchors.verticalCenterOffset: -4
-        anchors.horizontalCenterOffset: 4
-    }
-
-    //Foreground particles
-    BlockEmitter {
-        id: particles
-        system: particleSystem
-        group: {
-            if (type == 0){
-                "red";
-            } else if (type == 1) {
-                "blue";
-            } else if (type == 2) {
-                "green";
-            } else {
-                "yellow";
-            }
-        }
-        anchors.fill: parent
-    }
-
-    states: [
-        State {
-            name: "AliveState"; when: spawned == true && dying == false
-            PropertyChanges { target: img; opacity: 1 }
-        },
-
-        State {
-            name: "DeathState"; when: dying == true
-            PropertyChanges { target: img; scale: 2 }
-            StateChangeScript { script: particles.pulse(200); }
-            PropertyChanges { target: img; opacity: 0 }
-            StateChangeScript { script: block.destroy(1000); }
-        }
-    ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/SamegameText.qml b/basicsuite/qt5-everywhere/demos/samegame/content/SamegameText.qml
deleted file mode 100644
index 28c85f9..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/SamegameText.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../settings.js" as Settings
-
-Text {
-    font.pixelSize: Settings.fontPixelSize;
-    color: "white";
-    textFormat: Text.StyledText;
-    Behavior on opacity { NumberAnimation {} }
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml b/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml
deleted file mode 100644
index e389abd..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/SimpleBlock.qml
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: block
-    property bool dying: false
-    property bool spawned: false
-    property int type: 0
-    property ParticleSystem particleSystem
-
-    Behavior on x {
-        enabled: spawned;
-        SpringAnimation{ spring: 2; damping: 0.2 }
-    }
-    Behavior on y {
-        SpringAnimation{ spring: 2; damping: 0.2 }
-    }
-
-    Image {
-        id: img
-        source: {
-            if (type == 0){
-                "gfx/red.png";
-            } else if (type == 1) {
-                "gfx/blue.png";
-            } else if (type == 2) {
-                "gfx/green.png";
-            } else {
-                "gfx/yellow.png";
-            }
-        }
-        opacity: 0
-        Behavior on opacity { NumberAnimation { duration: 200 } }
-        anchors.fill: parent
-    }
-
-    //Foreground particles
-    BlockEmitter {
-        id: particles
-        system: particleSystem
-        group: {
-            if (type == 0){
-                "red";
-            } else if (type == 1) {
-                "blue";
-            } else if (type == 2) {
-                "green";
-            } else {
-                "yellow";
-            }
-        }
-        anchors.fill: parent
-    }
-
-    states: [
-        State {
-            name: "AliveState"; when: spawned == true && dying == false
-            PropertyChanges { target: img; opacity: 1 }
-        },
-
-        State {
-            name: "DeathState"; when: dying == true
-            StateChangeScript { script: {particleSystem.paused = false; particles.pulse(100); } }
-            PropertyChanges { target: img; opacity: 0 }
-            StateChangeScript { script: block.destroy(1000); }
-        }
-    ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml b/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml
deleted file mode 100644
index d4c4365..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/SmokeText.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    z: 10
-    property alias source: img.source
-    property alias system: emitter.system
-    property int playerNum: 1
-    function play() {
-        anim.running = true;
-    }
-    anchors.centerIn: parent
-    Image {
-        opacity: 0
-        id: img
-        anchors.centerIn: parent
-        rotation: playerNum == 1 ? -8 : -5
-        Emitter {
-            id: emitter
-            group: "smoke"
-            anchors.fill: parent
-            shape: MaskShape { source: img.source }
-            enabled: false
-            emitRate: 1000
-            lifeSpan: 600
-            size: 64
-            endSize: 32
-            velocity: AngleDirection { angleVariation: 360; magnitudeVariation: 160 }
-        }
-    }
-    SequentialAnimation {
-        id: anim
-        running: false
-        PauseAnimation { duration: 500}
-        ParallelAnimation {
-            NumberAnimation { target: img; property: "opacity"; from: 0.1; to: 1.0 }
-            NumberAnimation { target: img; property: "scale"; from: 0.1; to: 1.0 }
-        }
-        PauseAnimation { duration: 250}
-        ScriptAction { script: emitter.pulse(100); }
-        NumberAnimation { target: img; property: "opacity"; from: 1.0; to: 0.0 }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/background-puzzle.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/background-puzzle.png
deleted file mode 100644
index c2eca5f..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/background-puzzle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/background.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/background.png
deleted file mode 100644
index 60f57b6..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/background.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bar.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bar.png
deleted file mode 100644
index 4953cd6..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bar.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/blue-puzzle.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/blue-puzzle.png
deleted file mode 100644
index e550d59..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/blue-puzzle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/blue.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/blue.png
deleted file mode 100644
index b8161c0..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/blue.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bubble-highscore.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bubble-highscore.png
deleted file mode 100644
index c4e38df..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bubble-highscore.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bubble-puzzle.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bubble-puzzle.png
deleted file mode 100644
index 278556b..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/bubble-puzzle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-1.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-1.png
deleted file mode 100644
index 3343b7f..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-2.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-2.png
deleted file mode 100644
index afba106..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-3.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-3.png
deleted file mode 100644
index adea77a..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-3.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-4.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-4.png
deleted file mode 100644
index 18c922b..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-4.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-new.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-new.png
deleted file mode 100644
index 257e182..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-game-new.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-menu.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-menu.png
deleted file mode 100644
index 8440e87..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-menu.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-puzzle-next.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-puzzle-next.png
deleted file mode 100644
index 7e3ed41..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-puzzle-next.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-quit.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-quit.png
deleted file mode 100644
index 95c77ce..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/but-quit.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/green-puzzle.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/green-puzzle.png
deleted file mode 100644
index 581f76f..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/green-puzzle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/green.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/green.png
deleted file mode 100644
index da4cca5..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/green.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-fail.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-fail.png
deleted file mode 100644
index 4072611..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-fail.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-ok.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-ok.png
deleted file mode 100644
index 15a8442..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-ok.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-time.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-time.png
deleted file mode 100644
index 9490e49..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/icon-time.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-a.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-a.png
deleted file mode 100644
index 20c20ba..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-a.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-e.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-e.png
deleted file mode 100644
index dd663f1..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-e.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-g.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-g.png
deleted file mode 100644
index a319bf9..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-g.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-m.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-m.png
deleted file mode 100644
index 6a029b3..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-m.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-s.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-s.png
deleted file mode 100644
index 963b175..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo-s.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo.png
deleted file mode 100644
index e900edd..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/logo.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-brick.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-brick.png
deleted file mode 100644
index 5c83896..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-brick.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-paint.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-paint.png
deleted file mode 100644
index 9bd0a2a..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-paint.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-smoke.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-smoke.png
deleted file mode 100644
index b27f954..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/particle-smoke.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/red-puzzle.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/red-puzzle.png
deleted file mode 100644
index 9ceb17e..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/red-puzzle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/red.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/red.png
deleted file mode 100644
index 681810f..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/red.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-highscore-new.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-highscore-new.png
deleted file mode 100644
index 50f7fcd..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-highscore-new.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-highscore.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-highscore.png
deleted file mode 100644
index 7198c27..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-highscore.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-no-winner.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-no-winner.png
deleted file mode 100644
index b4a6685..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-no-winner.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1-go.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1-go.png
deleted file mode 100644
index c7bd2a5..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1-go.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1-won.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1-won.png
deleted file mode 100644
index 41c2eb7..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1-won.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1.png
deleted file mode 100644
index b59c87b..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2-go.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2-go.png
deleted file mode 100644
index f03cd93..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2-go.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2-won.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2-won.png
deleted file mode 100644
index 116b7f2..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2-won.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2.png
deleted file mode 100644
index d4f2bc7..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/text-p2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/yellow-puzzle.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/yellow-puzzle.png
deleted file mode 100644
index 66044c8..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/yellow-puzzle.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/yellow.png b/basicsuite/qt5-everywhere/demos/samegame/content/gfx/yellow.png
deleted file mode 100644
index 6bc5d38..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/gfx/yellow.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml
deleted file mode 100644
index d02f26d..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/TemplateBase.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle{
-    id: control
-    property int scoreTarget: -1
-    property int timeTarget: -1
-    property int moveTarget: -1
-    property bool mustClear: true
-    property string goalText: "Clear the level..."
-
-    property var startingGrid //If this isn't an array of ints, we will refuse to load the level.
-    /*  Ints are 0-4. If not enough ints are there it will be prepadded with 0s to fill the grid
-        (which ruins everything if you have the wrong number of rows).
-        0 - No block
-        1 - Red
-        2 - Blue
-        3 - Green
-        4 - Yellow
-        Ideas for future colors, but not supported in this version:
-        5 - Purple
-        6 - Cyan
-        7 - Gray
-        8 - Black
-        9 - White
-    */
-
-    width: 320
-    height: 416
-    color: "white" //TODO: Theme support for both setting themes per level, and seeing it in the control!
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml
deleted file mode 100644
index 0e6e0a8..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level0.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    moveTarget: 3
-    goalText: "1 of 10<br><br>Clear in three moves..."
-    startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 ,
-                    0 , 0 , 0 , 0 , 0 , 1 , 1 , 2 , 1 , 1 ,
-                    0 , 0 , 0 , 1 , 1 , 3 , 3 , 3 , 3 , 3 ,
-                    0 , 1 , 1 , 3 , 3 , 3 , 1 , 3 , 1 , 1 ,
-                    1 , 2 , 3 , 3 , 1 , 1 , 3 , 3 , 3 , 3 ,
-                    1 , 3 , 3 , 2 , 3 , 3 , 3 , 3 , 1 , 1 ,
-                    1 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml
deleted file mode 100644
index 0467c5b..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level1.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    timeTarget: 10
-    goalText: "2 of 10<br><br>Clear in 10 seconds..."
-    startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    1 , 3 , 3 , 3 , 1 , 1 , 1 , 1 , 2 , 2 ,
-                    1 , 2 , 3 , 3 , 3 , 1 , 1 , 1 , 1 , 2 ,
-                    2 , 2 , 1 , 3 , 3 , 3 , 1 , 1 , 1 , 2 ,
-                    2 , 1 , 1 , 1 , 3 , 3 , 3 , 1 , 2 , 2 ,
-                    1 , 1 , 1 , 1 , 1 , 3 , 3 , 3 , 2 , 1 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml
deleted file mode 100644
index 332af0f..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level2.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    scoreTarget: 1200
-    timeTarget: 60
-    goalText: "3 of 10<br><br>Score over 1200 points in one minute..."
-    mustClear: false
-    startingGrid: [ 3 , 1 , 2 , 1 , 1 , 2 , 1 , 1 , 3 , 3 ,
-                    1 , 3 , 3 , 2 , 3 , 3 , 1 , 1 , 3 , 1 ,
-                    3 , 1 , 3 , 3 , 2 , 3 , 3 , 3 , 1 , 2 ,
-                    3 , 2 , 2 , 1 , 3 , 3 , 2 , 1 , 1 , 2 ,
-                    3 , 1 , 2 , 2 , 2 , 2 , 2 , 1 , 3 , 1 ,
-                    2 , 3 , 1 , 2 , 2 , 3 , 3 , 1 , 3 , 2 ,
-                    3 , 2 , 1 , 1 , 3 , 3 , 3 , 2 , 2 , 1 ,
-                    1 , 2 , 2 , 3 , 2 , 3 , 3 , 3 , 1 , 1 ,
-                    1 , 3 , 3 , 3 , 1 , 2 , 2 , 3 , 3 , 1 ,
-                    3 , 3 , 2 , 1 , 2 , 2 , 1 , 1 , 1 , 3 ,
-                    2 , 1 , 3 , 2 , 3 , 2 , 3 , 2 , 2 , 1 ,
-                    1 , 3 , 1 , 2 , 1 , 2 , 3 , 1 , 2 , 2 ,
-                    1 , 2 , 2 , 2 , 1 , 1 , 2 , 3 , 1 , 2 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml
deleted file mode 100644
index 9504baf..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level3.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    scoreTarget: 3000
-    timeTarget: 60
-    goalText: "4 of 10<br>Clear the board with over 3000 points in under a minute..."
-    startingGrid: [ 3 , 3 , 1 , 1 , 1 , 2 , 2 , 4 , 3 , 3 ,
-                    4 , 3 , 1 , 4 , 2 , 2 , 2 , 4 , 3 , 4 ,
-                    4 , 3 , 3 , 4 , 1 , 1 , 3 , 3 , 4 , 4 ,
-                    3 , 3 , 3 , 3 , 3 , 1 , 3 , 2 , 2 , 4 ,
-                    4 , 4 , 3 , 4 , 3 , 1 , 4 , 4 , 4 , 4 ,
-                    4 , 4 , 3 , 4 , 1 , 1 , 4 , 4 , 3 , 3 ,
-                    4 , 2 , 2 , 2 , 2 , 2 , 4 , 4 , 4 , 1 ,
-                    4 , 4 , 2 , 4 , 2 , 2 , 1 , 1 , 1 , 1 ,
-                    4 , 4 , 2 , 4 , 2 , 2 , 1 , 4 , 4 , 1 ,
-                    4 , 1 , 1 , 4 , 3 , 3 , 4 , 2 , 4 , 1 ,
-                    4 , 1 , 1 , 2 , 3 , 3 , 4 , 2 , 2 , 1 ,
-                    1 , 1 , 2 , 2 , 2 , 3 , 3 , 3 , 2 , 1 ,
-                    4 , 1 , 1 , 2 , 2 , 3 , 4 , 3 , 4 , 4 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml
deleted file mode 100644
index d5d01f0..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level4.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    goalText: "5 of 10<br><br>Clear the level..."
-    startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    1 , 3 , 2 , 1 , 1 , 1 , 1 , 3 , 2 , 3 ,
-                    1 , 2 , 3 , 1 , 3 , 2 , 2 , 1 , 1 , 2 ,
-                    3 , 2 , 2 , 2 , 1 , 1 , 1 , 1 , 3 , 3 ,
-                    2 , 1 , 1 , 3 , 2 , 1 , 1 , 2 , 1 , 3 ,
-                    1 , 3 , 3 , 1 , 2 , 1 , 2 , 1 , 3 , 3 ,
-                    1 , 3 , 2 , 2 , 2 , 1 , 1 , 3 , 2 , 3 ,
-                    1 , 1 , 3 , 2 , 3 , 3 , 2 , 1 , 1 , 1 ,
-                    1 , 2 , 2 , 3 , 2 , 2 , 1 , 3 , 1 , 3 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml
deleted file mode 100644
index d602567..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level5.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    moveTarget: 4
-    goalText: "6 of 10<br><br>Clear in four or less moves..."
-    startingGrid: [ 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 ,
-                    4 , 2 , 2 , 2 , 4 , 3 , 3 , 3 , 4 , 4 ,
-                    4 , 2 , 4 , 4 , 4 , 3 , 2 , 3 , 4 , 4 ,
-                    4 , 2 , 2 , 2 , 4 , 3 , 3 , 3 , 4 , 4 ,
-                    4 , 4 , 4 , 2 , 4 , 3 , 4 , 3 , 4 , 4 ,
-                    4 , 2 , 2 , 2 , 4 , 3 , 4 , 3 , 4 , 4 ,
-                    4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 ,
-                    4 , 3 , 4 , 3 , 4 , 2 , 2 , 2 , 4 , 3 ,
-                    4 , 3 , 3 , 3 , 4 , 2 , 4 , 4 , 4 , 3 ,
-                    4 , 3 , 3 , 3 , 4 , 2 , 2 , 2 , 4 , 3 ,
-                    4 , 3 , 4 , 3 , 4 , 2 , 4 , 4 , 4 , 4 ,
-                    4 , 3 , 4 , 3 , 4 , 2 , 2 , 2 , 4 , 3 ,
-                    4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml
deleted file mode 100644
index 5dd42f8..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level6.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    moveTarget: 20
-    timeTarget: 40
-    goalText: "7 of 10<br><br>Clear with 20 moves in 40 seconds (or better)."
-    startingGrid: [ 1 , 3 , 1 , 1 , 1 , 1 , 2 , 1 , 2 , 2 ,
-                    2 , 1 , 2 , 3 , 3 , 1 , 3 , 1 , 1 , 3 ,
-                    3 , 1 , 1 , 1 , 2 , 2 , 3 , 2 , 3 , 1 ,
-                    1 , 3 , 1 , 1 , 3 , 1 , 1 , 1 , 2 , 3 ,
-                    2 , 1 , 1 , 1 , 3 , 2 , 3 , 3 , 2 , 3 ,
-                    3 , 3 , 3 , 3 , 2 , 2 , 3 , 1 , 3 , 2 ,
-                    2 , 2 , 3 , 2 , 2 , 3 , 2 , 2 , 2 , 2 ,
-                    1 , 2 , 1 , 2 , 1 , 3 , 2 , 3 , 2 , 3 ,
-                    1 , 1 , 2 , 3 , 3 , 3 , 3 , 1 , 1 , 2 ,
-                    3 , 3 , 2 , 2 , 2 , 2 , 3 , 1 , 3 , 1 ,
-                    1 , 2 , 3 , 3 , 3 , 1 , 3 , 2 , 1 , 2 ,
-                    1 , 2 , 1 , 1 , 2 , 3 , 1 , 2 , 1 , 3 ,
-                    3 , 1 , 2 , 2 , 1 , 3 , 3 , 1 , 3 , 2 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml
deleted file mode 100644
index 87633b4..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level7.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    goalText: "8 of 10<br><br>Clear the grid."
-    startingGrid: [ 2 , 4 , 3 , 2 , 3 , 2 , 3 , 3 , 4 , 3 ,
-                    2 , 2 , 3 , 3 , 1 , 4 , 3 , 3 , 3 , 2 ,
-                    1 , 4 , 2 , 3 , 4 , 3 , 3 , 1 , 1 , 1 ,
-                    2 , 1 , 2 , 4 , 4 , 2 , 2 , 3 , 2 , 1 ,
-                    3 , 4 , 4 , 1 , 3 , 2 , 4 , 2 , 1 , 1 ,
-                    2 , 2 , 3 , 1 , 2 , 4 , 1 , 2 , 1 , 2 ,
-                    1 , 2 , 3 , 2 , 4 , 4 , 3 , 1 , 1 , 2 ,
-                    4 , 4 , 2 , 1 , 2 , 4 , 2 , 2 , 4 , 3 ,
-                    4 , 2 , 4 , 1 , 3 , 4 , 1 , 4 , 2 , 4 ,
-                    4 , 3 , 4 , 1 , 4 , 3 , 1 , 3 , 1 , 1 ,
-                    3 , 3 , 2 , 3 , 2 , 4 , 1 , 2 , 4 , 4 ,
-                    3 , 4 , 2 , 2 , 4 , 3 , 4 , 1 , 3 , 2 ,
-                    4 , 3 , 3 , 4 , 2 , 4 , 1 , 2 , 3 , 2 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml
deleted file mode 100644
index 9d25e31..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level8.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    scoreTarget: 1000
-    goalText: "9 of 10<br><br>Score over 1000 points"
-    startingGrid: [ 1 , 4 , 4 , 3 , 2 , 1 , 4 , 2 , 4 , 2 ,
-                    2 , 3 , 4 , 4 , 1 , 1 , 1 , 4 , 4 , 4 ,
-                    1 , 3 , 1 , 2 , 2 , 1 , 2 , 1 , 4 , 2 ,
-                    4 , 3 , 4 , 2 , 1 , 4 , 1 , 2 , 2 , 3 ,
-                    3 , 4 , 2 , 4 , 4 , 3 , 2 , 2 , 2 , 1 ,
-                    4 , 4 , 3 , 2 , 4 , 4 , 2 , 1 , 1 , 1 ,
-                    1 , 2 , 1 , 3 , 4 , 1 , 1 , 3 , 2 , 3 ,
-                    3 , 4 , 2 , 2 , 1 , 3 , 2 , 2 , 4 , 2 ,
-                    2 , 4 , 1 , 2 , 2 , 4 , 3 , 3 , 3 , 1 ,
-                    1 , 2 , 2 , 4 , 1 , 2 , 2 , 3 , 3 , 3 ,
-                    4 , 4 , 1 , 4 , 3 , 1 , 3 , 3 , 3 , 4 ,
-                    1 , 2 , 4 , 1 , 2 , 1 , 1 , 4 , 2 , 1 ,
-                    1 , 2 , 3 , 4 , 2 , 4 , 4 , 2 , 1 , 3 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml b/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml
deleted file mode 100644
index 755268d..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/levels/level9.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    scoreTarget: 2000
-    timeTarget: 60
-    moveTarget: 20
-    mustClear: false
-    goalText: "10 of 10<br><br>Score 2000 in one minute with less than 20 moves!"
-    startingGrid: [ 3 , 2 , 3 , 1 , 3 , 3 , 4 , 1 , 3 , 3 ,
-                    2 , 3 , 2 , 1 , 1 , 2 , 2 , 2 , 4 , 1 ,
-                    2 , 4 , 4 , 4 , 3 , 1 , 4 , 4 , 4 , 1 ,
-                    3 , 1 , 3 , 4 , 4 , 2 , 2 , 2 , 2 , 3 ,
-                    2 , 1 , 4 , 4 , 3 , 3 , 1 , 1 , 3 , 2 ,
-                    3 , 2 , 1 , 4 , 3 , 4 , 1 , 3 , 4 , 2 ,
-                    3 , 3 , 1 , 4 , 4 , 4 , 2 , 1 , 2 , 3 ,
-                    2 , 3 , 4 , 3 , 4 , 1 , 1 , 3 , 2 , 4 ,
-                    4 , 4 , 1 , 2 , 4 , 3 , 2 , 2 , 2 , 4 ,
-                    1 , 4 , 2 , 2 , 1 , 1 , 2 , 1 , 1 , 4 ,
-                    1 , 4 , 3 , 3 , 3 , 1 , 3 , 4 , 4 , 2 ,
-                    3 , 4 , 1 , 1 , 2 , 2 , 2 , 3 , 2 , 1 ,
-                    3 , 3 , 4 , 3 , 1 , 1 , 1 , 4 , 4 , 3 ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js b/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js
deleted file mode 100644
index 9035b12..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/content/samegame.js
+++ /dev/null
@@ -1,581 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/* This script file handles the game logic */
-.pragma library
-.import QtQuick.LocalStorage 2.0 as Sql
-.import "../settings.js" as Settings
-
-var maxColumn = 10;
-var maxRow = 13;
-var types = 3;
-var maxIndex = maxColumn*maxRow;
-var board = new Array(maxIndex);
-var blockSrc = "Block.qml";
-var gameDuration;
-var component = Qt.createComponent(blockSrc);
-var gameCanvas;
-var betweenTurns = false;
-
-var puzzleLevel = null;
-var puzzlePath = "";
-
-var gameMode = "arcade"; //Set in new game, then tweaks behavior of other functions
-var gameOver = false;
-
-function changeBlock(src)
-{
-    blockSrc = src;
-    component = Qt.createComponent(blockSrc);
-}
-
-// Index function used instead of a 2D array
-function index(column, row)
-{
-    return column + row * maxColumn;
-}
-
-function timeStr(msecs)
-{
-    var secs = Math.floor(msecs/1000);
-    var m = Math.floor(secs/60);
-    var ret = "" + m + "m " + (secs%60) + "s";
-    return ret;
-}
-
-function cleanUp()
-{
-    if (gameCanvas == undefined)
-        return;
-    // Delete blocks from previous game
-    for (var i = 0; i < maxIndex; i++) {
-        if (board[i] != null)
-            board[i].destroy();
-        board[i] = null;
-    }
-    if (puzzleLevel != null){
-        puzzleLevel.destroy();
-        puzzleLevel = null;
-    }
-    gameCanvas.mode = ""
-}
-
-function startNewGame(gc, mode, map)
-{
-    gameCanvas = gc;
-    if (mode == undefined)
-        gameMode = "arcade";
-    else
-        gameMode = mode;
-    gameOver = false;
-
-    cleanUp();
-
-    gc.gameOver = false;
-    gc.mode = gameMode;
-    // Calculate board size
-    maxColumn = Math.floor(gameCanvas.width/Settings.blockSize);
-    maxRow = Math.floor(gameCanvas.height/Settings.blockSize);
-    maxIndex = maxRow * maxColumn;
-    if (gameMode == "arcade") //Needs to be after board sizing
-        getHighScore();
-
-
-    // Initialize Board
-    board = new Array(maxIndex);
-    gameCanvas.score = 0;
-    gameCanvas.score2 = 0;
-    gameCanvas.moves = 0;
-    gameCanvas.curTurn = 1;
-    if (gameMode == "puzzle")
-        loadMap(map);
-    else//Note that we load them in reverse order for correct visual stacking
-        for (var column = maxColumn - 1; column >= 0; column--)
-            for (var row = maxRow - 1; row >= 0; row--)
-                createBlock(column, row);
-    if (gameMode == "puzzle")
-        getLevelHistory();//Needs to be after map load
-    gameDuration = new Date();
-}
-
-var fillFound;  // Set after a floodFill call to the number of blocks found
-var floodBoard; // Set to 1 if the floodFill reaches off that node
-
-// NOTE: Be careful with vars named x,y, as the calling object's x,y are still in scope
-function handleClick(x,y)
-{
-    if (betweenTurns || gameOver || gameCanvas == undefined)
-        return;
-    var column = Math.floor(x/Settings.blockSize);
-    var row = Math.floor(y/Settings.blockSize);
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return;
-    if (board[index(column, row)] == null)
-        return;
-    // If it's a valid block, remove it and all connected (does nothing if it's not connected)
-    floodFill(column,row, -1);
-    if (fillFound <= 0)
-        return;
-    if (gameMode == "multiplayer" && gameCanvas.curTurn == 2)
-        gameCanvas.score2 += (fillFound - 1) * (fillFound - 1);
-    else
-        gameCanvas.score += (fillFound - 1) * (fillFound - 1);
-    if (gameMode == "multiplayer" && gameCanvas.curTurn == 2)
-        shuffleUp();
-    else
-        shuffleDown();
-    gameCanvas.moves += 1;
-    if (gameMode == "endless")
-        refill();
-    else if (gameMode != "multiplayer")
-        victoryCheck();
-    if (gameMode == "multiplayer" && !gc.gameOver){
-        betweenTurns = true;
-        gameCanvas.swapPlayers();//signal, animate and call turnChange() when ready
-    }
-}
-
-function floodFill(column,row,type)
-{
-    if (board[index(column, row)] == null)
-        return;
-    var first = false;
-    if (type == -1) {
-        first = true;
-        type = board[index(column,row)].type;
-
-        // Flood fill initialization
-        fillFound = 0;
-        floodBoard = new Array(maxIndex);
-    }
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return;
-    if (floodBoard[index(column, row)] == 1 || (!first && type != board[index(column, row)].type))
-        return;
-    floodBoard[index(column, row)] = 1;
-    floodFill(column + 1, row, type);
-    floodFill(column - 1, row, type);
-    floodFill(column, row + 1, type);
-    floodFill(column, row - 1, type);
-    if (first == true && fillFound == 0)
-        return; // Can't remove single blocks
-    board[index(column, row)].dying = true;
-    board[index(column, row)] = null;
-    fillFound += 1;
-}
-
-function shuffleDown()
-{
-    // Fall down
-    for (var column = 0; column < maxColumn; column++) {
-        var fallDist = 0;
-        for (var row = maxRow - 1; row >= 0; row--) {
-            if (board[index(column,row)] == null) {
-                fallDist += 1;
-            } else {
-                if (fallDist > 0) {
-                    var obj = board[index(column, row)];
-                    obj.y = (row + fallDist) * Settings.blockSize;
-                    board[index(column, row + fallDist)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-    // Fall to the left
-    fallDist = 0;
-    for (column = 0; column < maxColumn; column++) {
-        if (board[index(column, maxRow - 1)] == null) {
-            fallDist += 1;
-        } else {
-            if (fallDist > 0) {
-                for (row = 0; row < maxRow; row++) {
-                    obj = board[index(column, row)];
-                    if (obj == null)
-                        continue;
-                    obj.x = (column - fallDist) * Settings.blockSize;
-                    board[index(column - fallDist,row)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-}
-
-
-function shuffleUp()
-{
-    // Fall up
-    for (var column = 0; column < maxColumn; column++) {
-        var fallDist = 0;
-        for (var row = 0; row < maxRow; row++) {
-            if (board[index(column,row)] == null) {
-                fallDist += 1;
-            } else {
-                if (fallDist > 0) {
-                    var obj = board[index(column, row)];
-                    obj.y = (row - fallDist) * Settings.blockSize;
-                    board[index(column, row - fallDist)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-    // Fall to the left (or should it be right, so as to be left for P2?)
-    fallDist = 0;
-    for (column = 0; column < maxColumn; column++) {
-        if (board[index(column, 0)] == null) {
-            fallDist += 1;
-        } else {
-            if (fallDist > 0) {
-                for (row = 0; row < maxRow; row++) {
-                    obj = board[index(column, row)];
-                    if (obj == null)
-                        continue;
-                    obj.x = (column - fallDist) * Settings.blockSize;
-                    board[index(column - fallDist,row)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-}
-
-function turnChange()//called by ui outside
-{
-    betweenTurns = false;
-    if (gameCanvas.curTurn == 1){
-        shuffleUp();
-        gameCanvas.curTurn = 2;
-        victoryCheck();
-    }else{
-        shuffleDown();
-        gameCanvas.curTurn = 1;
-        victoryCheck();
-    }
-}
-
-function refill()
-{
-    for (var column = 0; column < maxColumn; column++) {
-        for (var row = 0; row < maxRow; row++) {
-            if (board[index(column, row)] == null)
-                createBlock(column, row);
-        }
-    }
-}
-
-function victoryCheck()
-{
-    // Awards bonuses for no blocks left
-    var deservesBonus = true;
-    if (board[index(0,maxRow - 1)] != null || board[index(0,0)] != null)
-        deservesBonus = false;
-    // Checks for game over
-    if (deservesBonus){
-        if (gameCanvas.curTurn = 1)
-            gameCanvas.score += 1000;
-        else
-            gameCanvas.score2 += 1000;
-    }
-    gameOver = deservesBonus;
-    if (gameCanvas.curTurn == 1){
-        if (!(floodMoveCheck(0, maxRow - 1, -1)))
-            gameOver = true;
-    }else{
-        if (!(floodMoveCheck(0, 0, -1, true)))
-            gameOver = true;
-    }
-    if (gameMode == "puzzle"){
-        puzzleVictoryCheck(deservesBonus);//Takes it from here
-        return;
-    }
-    if (gameOver) {
-        var winnerScore = Math.max(gameCanvas.score, gameCanvas.score2);
-        if (gameMode == "multiplayer"){
-            gameCanvas.score = winnerScore;
-            saveHighScore(gameCanvas.score2);
-        }
-        saveHighScore(gameCanvas.score);
-        gameDuration = new Date() - gameDuration;
-        gameCanvas.gameOver = true;
-    }
-}
-
-// Only floods up and right, to see if it can find adjacent same-typed blocks
-function floodMoveCheck(column, row, type, goDownInstead)
-{
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return false;
-    if (board[index(column, row)] == null)
-        return false;
-    var myType = board[index(column, row)].type;
-    if (type == myType)
-        return true;
-    if (goDownInstead)
-        return floodMoveCheck(column + 1, row, myType, goDownInstead) ||
-               floodMoveCheck(column, row + 1, myType, goDownInstead);
-    else
-        return floodMoveCheck(column + 1, row, myType) ||
-               floodMoveCheck(column, row - 1, myType);
-}
-
-function createBlock(column,row,type)
-{
-    // Note that we don't wait for the component to become ready. This will
-    // only work if the block QML is a local file. Otherwise the component will
-    // not be ready immediately. There is a statusChanged signal on the
-    // component you could use if you want to wait to load remote files.
-    if (component.status == 1){
-        if (type == undefined)
-            type = Math.floor(Math.random() * types);
-        if (type < 0 || type > 4) {
-            console.log("Invalid type requested");//TODO: Is this triggered by custom levels much?
-            return;
-        }
-        var dynamicObject = component.createObject(gameCanvas,
-                {"type": type,
-                "x": column*Settings.blockSize,
-                "y": -1*Settings.blockSize,
-                "width": Settings.blockSize,
-                "height": Settings.blockSize,
-                "particleSystem": gameCanvas.ps});
-        if (dynamicObject == null){
-            console.log("error creating block");
-            console.log(component.errorString());
-            return false;
-        }
-        dynamicObject.y = row*Settings.blockSize;
-        dynamicObject.spawned = true;
-
-        board[index(column,row)] = dynamicObject;
-    }else{
-        console.log("error loading block component");
-        console.log(component.errorString());
-        return false;
-    }
-    return true;
-}
-
-function showPuzzleError(str)
-{
-    //TODO: Nice user visible UI?
-    console.log(str);
-}
-
-function loadMap(map)
-{
-    puzzlePath = map;
-    var levelComp = Qt.createComponent(puzzlePath);
-    if (levelComp.status != 1){
-        console.log("Error loading level");
-        showPuzzleError(levelComp.errorString());
-        return;
-    }
-    puzzleLevel = levelComp.createObject();
-    if (puzzleLevel == null || !puzzleLevel.startingGrid instanceof Array) {
-        showPuzzleError("Bugger!");
-        return;
-    }
-    gameCanvas.showPuzzleGoal(puzzleLevel.goalText);
-    //showPuzzleGoal should call finishLoadingMap as the next thing it does, before handling more events
-}
-
-function finishLoadingMap()
-{
-    for (var i in puzzleLevel.startingGrid)
-        if (! (puzzleLevel.startingGrid[i] >= 0 && puzzleLevel.startingGrid[i] <= 9) )
-            puzzleLevel.startingGrid[i] = 0;
-    //TODO: Don't allow loading larger levels, leads to cheating
-    while (puzzleLevel.startingGrid.length > maxIndex) puzzleLevel.startingGrid.shift();
-    while (puzzleLevel.startingGrid.length < maxIndex) puzzleLevel.startingGrid.unshift(0);
-    for (var i in puzzleLevel.startingGrid)
-        if (puzzleLevel.startingGrid[i] > 0)
-            createBlock(i % maxColumn, Math.floor(i / maxColumn), puzzleLevel.startingGrid[i] - 1);
-
-    //### Experimental feature - allow levels to contain arbitrary QML scenes as well!
-    //while (puzzleLevel.children.length)
-    //    puzzleLevel.children[0].parent = gameCanvas;
-    gameDuration = new Date(); //Don't start until we finish loading
-}
-
-function puzzleVictoryCheck(clearedAll)//gameOver has also been set if no more moves
-{
-    var won = true;
-    var soFar = new Date() - gameDuration;
-    if (puzzleLevel.scoreTarget != -1 && gameCanvas.score < puzzleLevel.scoreTarget){
-        won = false;
-    } if (puzzleLevel.scoreTarget != -1 && gameCanvas.score >= puzzleLevel.scoreTarget && !puzzleLevel.mustClear){
-        gameOver = true;
-    } if (puzzleLevel.timeTarget != -1 && soFar/1000.0 > puzzleLevel.timeTarget){
-        gameOver = true;
-    } if (puzzleLevel.moveTarget != -1 && gameCanvas.moves >= puzzleLevel.moveTarget){
-        gameOver = true;
-    } if (puzzleLevel.mustClear && gameOver && !clearedAll) {
-        won = false;
-    }
-
-    if (gameOver) {
-        gameCanvas.gameOver = true;
-        gameCanvas.showPuzzleEnd(won);
-
-        if (won) {
-            // Store progress
-            saveLevelHistory();
-        }
-    }
-}
-
-function getHighScore()
-{
-    var db = Sql.LocalStorage.openDatabaseSync(
-        "SameGame",
-        "2.0",
-        "SameGame Local Data",
-        100
-    );
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(game TEXT, score NUMBER, gridSize TEXT, time NUMBER)');
-            // Only show results for the current grid size
-            var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "'
-                + maxColumn + "x" + maxRow + '" AND game = "' + gameMode + '" ORDER BY score desc');
-            if (rs.rows.length > 0)
-                gameCanvas.highScore = rs.rows.item(0).score;
-            else
-                gameCanvas.highScore = 0;
-        }
-    );
-}
-
-function saveHighScore(score)
-{
-    // Offline storage
-    var db = Sql.LocalStorage.openDatabaseSync(
-        "SameGame",
-        "2.0",
-        "SameGame Local Data",
-        100
-    );
-    var dataStr = "INSERT INTO Scores VALUES(?, ?, ?, ?)";
-    var data = [
-        gameMode,
-        score,
-        maxColumn + "x" + maxRow,
-        Math.floor(gameDuration / 1000)
-    ];
-    if (score >= gameCanvas.highScore)//Update UI field
-        gameCanvas.highScore = score;
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(game TEXT, score NUMBER, gridSize TEXT, time NUMBER)');
-            tx.executeSql(dataStr, data);
-        }
-    );
-}
-
-function getLevelHistory()
-{
-    var db = Sql.LocalStorage.openDatabaseSync(
-        "SameGame",
-        "2.0",
-        "SameGame Local Data",
-        100
-    );
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Puzzle(level TEXT, score NUMBER, moves NUMBER, time NUMBER)');
-            var rs = tx.executeSql('SELECT * FROM Puzzle WHERE level = "' + puzzlePath + '" ORDER BY score desc');
-            if (rs.rows.length > 0) {
-                gameCanvas.puzzleWon = true;
-                gameCanvas.highScore = rs.rows.item(0).score;
-            } else {
-                gameCanvas.puzzleWon = false;
-                gameCanvas.highScore = 0;
-            }
-        }
-    );
-}
-
-function saveLevelHistory()
-{
-    var db = Sql.LocalStorage.openDatabaseSync(
-        "SameGame",
-        "2.0",
-        "SameGame Local Data",
-        100
-    );
-    var dataStr = "INSERT INTO Puzzle VALUES(?, ?, ?, ?)";
-    var data = [
-        puzzlePath,
-        gameCanvas.score,
-        gameCanvas.moves,
-        Math.floor(gameDuration / 1000)
-    ];
-    gameCanvas.puzzleWon = true;
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Puzzle(level TEXT, score NUMBER, moves NUMBER, time NUMBER)');
-            tx.executeSql(dataStr, data);
-        }
-    );
-}
-
-function nuke() //For "Debug mode"
-{
-    for (var row = 1; row <= 5; row++) {
-        for (var col = 0; col < 5; col++) {
-            if (board[index(col, maxRow - row)] != null) {
-                board[index(col, maxRow - row)].dying = true;
-                board[index(col, maxRow - row)] = null;
-            }
-        }
-    }
-    if (gameMode == "multiplayer" && gameCanvas.curTurn == 2)
-        shuffleUp();
-    else
-        shuffleDown();
-    if (gameMode == "endless")
-        refill();
-    else
-        victoryCheck();
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/samegame.qml b/basicsuite/qt5-everywhere/demos/samegame/samegame.qml
deleted file mode 100644
index e81a8bf..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/samegame.qml
+++ /dev/null
@@ -1,371 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "content/samegame.js" as Logic
-import "settings.js" as Settings
-import "content"
-
-Rectangle {
-    id: root
-    anchors.fill: parent
-    property int acc: 0
-
-
-    function loadPuzzle() {
-        if (gameCanvas.mode != "")
-            Logic.cleanUp();
-        Logic.startNewGame(gameCanvas,"puzzle","levels/level"+acc+".qml")
-    }
-    function nextPuzzle() {
-        acc = (acc + 1) % 10;
-        loadPuzzle();
-    }
-    Timer {
-        id: gameOverTimer
-        interval: 1500
-        running : gameCanvas.gameOver && gameCanvas.mode == "puzzle" //mode will be reset by cleanUp();
-        repeat  : false
-        onTriggered: {
-            Logic.cleanUp();
-            nextPuzzle();
-        }
-    }
-
-    Image {
-        source: "content/gfx/background.png"
-        anchors.fill: parent
-    }
-
-    GameArea {
-        id: gameCanvas
-        z: 1
-        y: Settings.headerHeight
-
-        width: parent.width
-        height: parent.height - Settings.headerHeight - Settings.footerHeight
-
-        backgroundVisible: root.state == "in-game"
-        onModeChanged: if (gameCanvas.mode != "puzzle") puzzleWon = false; //UI has stricter constraints on this variable than the game does
-        Age {
-            groups: ["redspots", "greenspots", "bluespots", "yellowspots"]
-            enabled: root.state == ""
-            system: gameCanvas.ps
-        }
-
-        onPuzzleLost: acc--;//So that nextPuzzle() reloads the current one
-
-    }
-
-    Item {
-        id: menu
-        z: 2
-        width: parent.width;
-        anchors.top: parent.top
-        anchors.bottom: bottomBar.top
-
-        LogoAnimation {
-            x: 64
-            y: Settings.headerHeight
-            particleSystem: gameCanvas.ps
-            running: root.state == ""
-        }
-        Row {
-            x: 112
-            y: 20
-            Image { source: "content/gfx/logo-a.png" }
-            Image { source: "content/gfx/logo-m.png" }
-            Image { source: "content/gfx/logo-e.png" }
-        }
-
-        Column {
-            y: 100 + 40
-            spacing: Settings.menuButtonSpacing
-
-            Button {
-                width: root.width
-                rotatedButton: true
-                imgSrc: "content/gfx/but-game-1.png"
-                onClicked: {
-                    if (root.state == "in-game")
-                        return //Prevent double clicking
-                    root.state = "in-game"
-                    gameCanvas.blockFile = "Block.qml"
-                    gameCanvas.background = "gfx/background.png"
-                    arcadeTimer.start();
-                }
-                //Emitted particles don't fade out, because ImageParticle is on the GameArea
-                system: gameCanvas.ps
-                group: "green"
-                Timer {
-                    id: arcadeTimer
-                    interval: Settings.menuDelay
-                    running : false
-                    repeat  : false
-                    onTriggered: Logic.startNewGame(gameCanvas)
-                }
-            }
-
-            Button {
-                width: root.width
-                rotatedButton: true
-                imgSrc: "content/gfx/but-game-2.png"
-                onClicked: {
-                    if (root.state == "in-game")
-                        return
-                    root.state = "in-game"
-                    gameCanvas.blockFile = "Block.qml"
-                    gameCanvas.background = "gfx/background.png"
-                    twopTimer.start();
-                }
-                system: gameCanvas.ps
-                group: "green"
-                Timer {
-                    id: twopTimer
-                    interval: Settings.menuDelay
-                    running : false
-                    repeat  : false
-                    onTriggered: Logic.startNewGame(gameCanvas, "multiplayer")
-                }
-            }
-
-            Button {
-                width: root.width
-                rotatedButton: true
-                imgSrc: "content/gfx/but-game-3.png"
-                onClicked: {
-                    if (root.state == "in-game")
-                        return
-                    root.state = "in-game"
-                    gameCanvas.blockFile = "SimpleBlock.qml"
-                    gameCanvas.background = "gfx/background.png"
-                    endlessTimer.start();
-                }
-                system: gameCanvas.ps
-                group: "blue"
-                Timer {
-                    id: endlessTimer
-                    interval: Settings.menuDelay
-                    running : false
-                    repeat  : false
-                    onTriggered: Logic.startNewGame(gameCanvas, "endless")
-                }
-            }
-
-            Button {
-                width: root.width
-                rotatedButton: true
-                imgSrc: "content/gfx/but-game-4.png"
-                group: "yellow"
-                onClicked: {
-                    if (root.state == "in-game")
-                        return
-                    root.state = "in-game"
-                    gameCanvas.blockFile = "PuzzleBlock.qml"
-                    gameCanvas.background = "gfx/background.png"
-                    puzzleTimer.start();
-                }
-                Timer {
-                    id: puzzleTimer
-                    interval: Settings.menuDelay
-                    running : false
-                    repeat  : false
-                    onTriggered: loadPuzzle();
-                }
-                system: gameCanvas.ps
-            }
-        }
-    }
-
-    Image {
-        id: scoreBar
-        source: "content/gfx/bar.png"
-        width: parent.width
-        z: 6
-        y: -Settings.headerHeight
-        height: Settings.headerHeight
-        Behavior on opacity { NumberAnimation {} }
-        SamegameText {
-            id: arcadeScore
-            anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">P1:</font> ' + gameCanvas.score
-            font.pixelSize: Settings.fontPixelSize
-            textFormat: Text.StyledText
-            color: "white"
-            opacity: gameCanvas.mode == "arcade" ? 1 : 0
-            Behavior on opacity { NumberAnimation {} }
-        }
-        SamegameText {
-            id: arcadeHighScore
-            anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">Highscore:</font> ' + gameCanvas.highScore
-            opacity: gameCanvas.mode == "arcade" ? 1 : 0
-        }
-        SamegameText {
-            id: p1Score
-            anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">P1:</font> ' + gameCanvas.score
-            opacity: gameCanvas.mode == "multiplayer" ? 1 : 0
-        }
-        SamegameText {
-            id: p2Score
-            anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">P2:</font> ' + gameCanvas.score2
-            opacity: gameCanvas.mode == "multiplayer" ? 1 : 0
-            rotation: 180
-        }
-        SamegameText {
-            id: puzzleMoves
-            anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">Moves:</font> ' + gameCanvas.moves
-            opacity: gameCanvas.mode == "puzzle" ? 1 : 0
-        }
-        SamegameText {
-            Image {
-                source: "content/gfx/icon-time.png"
-                x: -20
-            }
-            id: puzzleTime
-            anchors { topMargin: 3; top: parent.top; horizontalCenter: parent.horizontalCenter; horizontalCenterOffset: 20}
-            text: "00:00"
-            opacity: gameCanvas.mode == "puzzle" ? 1 : 0
-            Timer {
-                interval: 1000
-                repeat: true
-                running: gameCanvas.mode == "puzzle" && !gameCanvas.gameOver
-                onTriggered: {
-                    var elapsed = Math.floor((new Date() - Logic.gameDuration)/ 1000.0);
-                    var mins = Math.floor(elapsed/60.0);
-                    var secs = (elapsed % 60);
-                    puzzleTime.text =  (mins < 10 ? "0" : "") + mins + ":" + (secs < 10 ? "0" : "") + secs;
-                }
-            }
-        }
-        SamegameText {
-            id: puzzleScore
-            anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">Score:</font> ' + gameCanvas.score
-            opacity: gameCanvas.mode == "puzzle" ? 1 : 0
-        }
-    }
-
-    Image {
-        id: bottomBar
-        width: parent.width
-        height: Settings.footerHeight
-        source: "content/gfx/bar.png"
-        y: parent.height - Settings.footerHeight;
-        z: 2
-        /*Button {
-            id: quitButton
-            height: Settings.toolButtonHeight
-            imgSrc: "content/gfx/but-quit.png"
-            onClicked: {Qt.quit(); }
-            anchors { left: parent.left; verticalCenter: parent.verticalCenter; leftMargin: 11 }
-        }*/
-        Button {
-            id: menuButton
-            height: Settings.toolButtonHeight
-            imgSrc: "content/gfx/but-menu.png"
-            visible: (root.state == "in-game");
-            onClicked: {root.state = ""; Logic.cleanUp(); gameCanvas.mode = ""}
-            anchors { left: parent.left; verticalCenter: parent.verticalCenter; leftMargin: 0 }
-        }
-        Button {
-            id: againButton
-            height: Settings.toolButtonHeight
-            imgSrc: "content/gfx/but-game-new.png"
-            visible: (root.state == "in-game");
-            opacity: gameCanvas.gameOver && (gameCanvas.mode == "arcade" || gameCanvas.mode == "multiplayer")
-            Behavior on opacity{ NumberAnimation {} }
-            onClicked: {if (gameCanvas.gameOver) { Logic.startNewGame(gameCanvas, gameCanvas.mode);}}
-            anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 11 }
-        }
-        Button {
-            id: nextButton
-            height: Settings.toolButtonHeight
-            imgSrc: "content/gfx/but-puzzle-next.png"
-            visible: (root.state == "in-game") && gameCanvas.mode == "puzzle" && gameCanvas.puzzleWon
-            opacity: gameCanvas.puzzleWon ? 1 : 0
-            Behavior on opacity{ NumberAnimation {} }
-            onClicked: {if (gameCanvas.puzzleWon) nextPuzzle();}
-            anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 11 }
-        }
-    }
-
-    Connections {
-        target: root
-        onStateChanged: stateChangeAnim.running = true
-    }
-    SequentialAnimation {
-        id: stateChangeAnim
-        ParallelAnimation {
-            NumberAnimation { target: bottomBar; property: "y"; to: root.height; duration: Settings.menuDelay/2; easing.type: Easing.OutQuad }
-            NumberAnimation { target: scoreBar; property: "y"; to: -Settings.headerHeight; duration: Settings.menuDelay/2; easing.type: Easing.OutQuad }
-        }
-        ParallelAnimation {
-            NumberAnimation { target: bottomBar; property: "y"; to: root.height - Settings.footerHeight; duration: Settings.menuDelay/2; easing.type: Easing.OutBounce}
-            NumberAnimation { target: scoreBar; property: "y"; to: root.state == "" ? -Settings.headerHeight : 0; duration: Settings.menuDelay/2; easing.type: Easing.OutBounce}
-        }
-    }
-
-    states: [
-        State {
-            name: "in-game"
-            PropertyChanges {
-                target: menu
-                opacity: 0
-                visible: false
-            }
-        }
-    ]
-
-    transitions: [
-        Transition {
-            NumberAnimation {properties: "x,y,opacity"}
-        }
-    ]
-
-    //"Debug mode"
-    focus: true
-    Keys.onAsteriskPressed: Logic.nuke();
-    Keys.onSpacePressed: gameCanvas.puzzleWon = true;
-}
diff --git a/basicsuite/qt5-everywhere/demos/samegame/samegame.qrc b/basicsuite/qt5-everywhere/demos/samegame/samegame.qrc
deleted file mode 100644
index 951b9d1..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/samegame.qrc
+++ /dev/null
@@ -1,72 +0,0 @@
-<RCC>
-    <qresource prefix="/demos/samegame">
-        <file>samegame.qml</file>
-        <file>settings.js</file>
-        <file>content/gfx/text-p1-won.png</file>
-        <file>content/gfx/background-puzzle.png</file>
-        <file>content/gfx/background.png</file>
-        <file>content/gfx/bar.png</file>
-        <file>content/gfx/blue-puzzle.png</file>
-        <file>content/gfx/blue.png</file>
-        <file>content/gfx/bubble-highscore.png</file>
-        <file>content/gfx/bubble-puzzle.png</file>
-        <file>content/gfx/but-game-1.png</file>
-        <file>content/gfx/but-game-2.png</file>
-        <file>content/gfx/but-game-3.png</file>
-        <file>content/gfx/but-game-4.png</file>
-        <file>content/gfx/but-game-new.png</file>
-        <file>content/gfx/but-menu.png</file>
-        <file>content/gfx/but-puzzle-next.png</file>
-        <file>content/gfx/but-quit.png</file>
-        <file>content/gfx/green-puzzle.png</file>
-        <file>content/gfx/green.png</file>
-        <file>content/gfx/icon-fail.png</file>
-        <file>content/gfx/icon-ok.png</file>
-        <file>content/gfx/icon-time.png</file>
-        <file>content/gfx/logo-a.png</file>
-        <file>content/gfx/logo-e.png</file>
-        <file>content/gfx/logo-g.png</file>
-        <file>content/gfx/logo-m.png</file>
-        <file>content/gfx/logo-s.png</file>
-        <file>content/gfx/logo.png</file>
-        <file>content/gfx/particle-brick.png</file>
-        <file>content/gfx/particle-paint.png</file>
-        <file>content/gfx/particle-smoke.png</file>
-        <file>content/gfx/red-puzzle.png</file>
-        <file>content/gfx/red.png</file>
-        <file>content/gfx/text-highscore-new.png</file>
-        <file>content/gfx/text-highscore.png</file>
-        <file>content/gfx/text-no-winner.png</file>
-        <file>content/gfx/text-p1-go.png</file>
-        <file>content/gfx/text-p1.png</file>
-        <file>content/gfx/text-p2-go.png</file>
-        <file>content/gfx/text-p2-won.png</file>
-        <file>content/gfx/text-p2.png</file>
-        <file>content/gfx/yellow-puzzle.png</file>
-        <file>content/gfx/yellow.png</file>
-        <file>content/levels/level0.qml</file>
-        <file>content/levels/level1.qml</file>
-        <file>content/levels/level2.qml</file>
-        <file>content/levels/level3.qml</file>
-        <file>content/levels/level4.qml</file>
-        <file>content/levels/level5.qml</file>
-        <file>content/levels/level6.qml</file>
-        <file>content/levels/level7.qml</file>
-        <file>content/levels/level8.qml</file>
-        <file>content/levels/level9.qml</file>
-        <file>content/levels/TemplateBase.qml</file>
-        <file>content/SamegameText.qml</file>
-        <file>content/SimpleBlock.qml</file>
-        <file>content/Block.qml</file>
-        <file>content/BlockEmitter.qml</file>
-        <file>content/Button.qml</file>
-        <file>content/GameArea.qml</file>
-        <file>content/LogoAnimation.qml</file>
-        <file>content/MenuEmitter.qml</file>
-        <file>content/PaintEmitter.qml</file>
-        <file>content/PrimaryPack.qml</file>
-        <file>content/PuzzleBlock.qml</file>
-        <file>content/samegame.js</file>
-        <file>content/SmokeText.qml</file>
-    </qresource>
-</RCC>
diff --git a/basicsuite/qt5-everywhere/demos/samegame/settings.js b/basicsuite/qt5-everywhere/demos/samegame/settings.js
deleted file mode 100644
index e09dee9..0000000
--- a/basicsuite/qt5-everywhere/demos/samegame/settings.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-.pragma library
-
-//This should be switched over once a proper QML settings API exists
-
-var menuDelay = 500
-
-var headerHeight = 20 // 70 on BB10
-var footerHeight = 44 // 100 on BB10
-
-var fontPixelSize = 14 // 55 on BB10
-
-var blockSize = 32 // 64 on BB10
-
-var toolButtonHeight = 32 // 64 on BB10
-
-var menuButtonSpacing = 0 // 15 on BB10
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Content.qml b/basicsuite/qt5-everywhere/demos/shaders/Content.qml
deleted file mode 100755
index aae2337..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Content.qml
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    property alias effect: effectLoader.item
-    property string effectSource: "Effects/EffectPassThrough.qml"
-    signal contentSizeChanged(size contentSize)
-
-    color: "black"
-
-    ShaderEffectSource {
-        id: theSource
-        smooth: true
-        hideSource: true
-    }
-
-    LogoContainer {
-        id: logoContainer
-        anchors.fill: root
-    }
-
-    Loader {
-        id: effectLoader
-        source: effectSource
-    }
-
-    onWidthChanged: {
-        if (effectLoader.item)
-            effectLoader.item.targetWidth = root.width
-    }
-
-    onHeightChanged: {
-        if (effectLoader.item)
-            effectLoader.item.targetHeight = root.height
-    }
-
-    onEffectSourceChanged: {
-        effectLoader.source = effectSource
-        updateSource()
-    }
-
-    function updateSource() {
-        if (effectLoader.item) {
-            effectLoader.item.parent = root
-            effectLoader.item.targetWidth = root.width
-            effectLoader.item.targetHeight = root.height
-            effectLoader.item.anchors.fill = logoContainer
-            effectLoader.item.source = theSource
-        }
-    }
-
-    function init() {
-        theSource.sourceItem = logoContainer
-        root.effectSource = "Effects/EffectPassThrough.qml"
-        effectLoader.source = root.effectSource
-        updateSource()
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/EffectSelectionPanel.qml b/basicsuite/qt5-everywhere/demos/shaders/EffectSelectionPanel.qml
deleted file mode 100755
index 93cdb5f..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/EffectSelectionPanel.qml
+++ /dev/null
@@ -1,156 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    height: 78
-    property int itemHeight: 25
-    property string effectSource: ""
-    property string effectName: "No effect"
-
-    signal clicked
-    QtObject {
-        id: d
-        property Item selectedItem
-    }
-
-    ListModel {
-        id: sources
-        ListElement { name: "No effect"; source: "Effects/EffectPassThrough.qml" }
-        ListElement { name: "Billboard"; source: "Effects/EffectBillboard.qml" }
-        ListElement { name: "Black & white"; source: "Effects/EffectBlackAndWhite.qml" }
-        ListElement { name: "Blur"; source: "Effects/EffectGaussianBlur.qml" }
-        ListElement { name: "Edge detection"; source: "Effects/EffectSobelEdgeDetection1.qml" }
-        ListElement { name: "Emboss"; source: "Effects/EffectEmboss.qml" }
-        ListElement { name: "Glow"; source: "Effects/EffectGlow.qml" }
-        ListElement { name: "Isolate"; source: "Effects/EffectIsolate.qml" }
-        ListElement { name: "Pixelate"; source: "Effects/EffectPixelate.qml" }
-        ListElement { name: "Posterize"; source: "Effects/EffectPosterize.qml" }
-        ListElement { name: "Ripple"; source: "Effects/EffectRipple.qml" }
-        ListElement { name: "Sepia"; source: "Effects/EffectSepia.qml" }
-        ListElement { name: "Sharpen"; source: "Effects/EffectSharpen.qml" }
-        ListElement { name: "Shockwave"; source: "Effects/EffectShockwave.qml" }
-        ListElement { name: "Toon"; source: "Effects/EffectToon.qml" }
-        ListElement { name: "Warhol"; source: "Effects/EffectWarhol.qml" }
-        ListElement { name: "Wobble"; source: "Effects/EffectWobble.qml" }
-        ListElement { name: "Vignette"; source: "Effects/EffectVignette.qml" }
-    }
-
-    Component {
-        id: sourceDelegate
-        Item {
-            id: sourceDelegateItem
-            width: root.width
-            height: itemHeight
-
-            Text {
-                id: sourceSelectorItem
-                anchors.centerIn: parent
-                width: 0.9 * parent.width
-                height: 0.8 * itemHeight
-                text: name
-                color: "white"
-            }
-
-            states: [
-                State {
-                    name: "selected"
-                    PropertyChanges {
-                        target: sourceSelectorItem
-                        bgColor: "#ff8888"
-                    }
-                }
-            ]
-
-            transitions: [
-                Transition {
-                    from: "*"
-                    to: "*"
-                    ColorAnimation {
-                        properties: "color"
-                        easing.type: Easing.OutQuart
-                        duration: 500
-                    }
-                }
-            ]
-        }
-    }
-
-    MouseArea {
-        id: mouseAboveMonitor
-        anchors.fill: parent
-        hoverEnabled: true
-    }
-
-    ListView {
-        id: list
-        anchors.fill: parent
-        clip: true
-        anchors.margins: root.width * 0.05
-        model: sources
-
-        currentIndex: 0
-
-        onCurrentIndexChanged : {
-            effectSource = model.get(currentIndex).source
-            effectName = model.get(currentIndex).name
-            root.clicked()
-        }
-
-        delegate: Item {
-            id: item
-            width: parent.width
-            height: itemHeight
-            Rectangle {
-                anchors.fill: parent
-                border.color: index == list.currentIndex ? "#44ffffff" : "transparent"
-                color: index == list.currentIndex ? "#22ffffff" : "transparent"
-                radius: 3
-                Text { color: "white" ; text: name ; anchors.centerIn: parent; font.pixelSize: item.height * 0.5  }
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked:  list.currentIndex = index
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/Effect.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/Effect.qml
deleted file mode 100755
index 34eb07c..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/Effect.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import ShaderReader 1.0
-
-ShaderEffect {
-    id: effect
-    property variant source
-    property ListModel parameters: ListModel { }
-    property bool divider: false
-    property real dividerValue: 1.0
-    property real targetWidth: 0
-    property real targetHeight: 0
-    property alias fragmentShaderFilename: shaderFileReader.fragmentShaderFilename
-    property alias vertexShaderFilename: shaderFileReader.vertexShaderFilename
-    //property string fragmentShaderFilename
-    //property string vertexShaderFilename
-
-    QtObject {
-        id: d
-        property string fragmentShaderCommon: "
-            #ifdef GL_ES
-                precision mediump float;
-            #else
-            #   define lowp
-            #   define mediump
-            #   define highp
-            #endif // GL_ES
-        "
-    }
-
-    ShaderFileReader {
-        id: shaderFileReader
-        onFragmentShaderFilenameChanged: {
-	    effect.fragmentShader = d.fragmentShaderCommon + shaderFileReader.fragmentShader
-        }
-        onVertexShaderFilenameChanged: {
-            effect.vertexShader = shaderFileReader.vertexShader
-        }
-    }
-
-    // The following is a workaround for the fact that ShaderEffect
-    // doesn't provide a way for shader programs to be read from a file,
-    // rather than being inline in the QML file
-
-    //onFragmentShaderFilenameChanged:
-    //    fragmentShader = d.fragmentShaderCommon + shaderFileReader.readFile("qml/QtDemo/demos/shaders/" + fragmentShaderFilename)
-    //onVertexShaderFilenameChanged:
-    //    vertexShader = shaderFileReader.readFile("qml/QtDemo/demos/shaders/" + vertexShaderFilename)
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectBillboard.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectBillboard.qml
deleted file mode 100755
index 124a2a1..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectBillboard.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "grid spacing"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real grid: parameters.get(0).value * 10
-
-    property real step_x: 0.0015625
-    property real step_y: targetHeight ? (step_x * targetWidth / targetHeight) : 0.0
-
-    fragmentShaderFilename: "shaders/billboard.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectBlackAndWhite.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectBlackAndWhite.qml
deleted file mode 100755
index 37a3b6e..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectBlackAndWhite.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "threshold"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real threshold: parameters.get(0).value
-
-    fragmentShaderFilename: "shaders/blackandwhite.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectEmboss.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectEmboss.qml
deleted file mode 100755
index 4bf5771..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectEmboss.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    fragmentShaderFilename: "shaders/emboss.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectGaussianBlur.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectGaussianBlur.qml
deleted file mode 100755
index e63e17a..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectGaussianBlur.qml
+++ /dev/null
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://www.geeks3d.com/20100909/shader-library-gaussian-blur-post-processing-filter-in-glsl/
-
-import QtQuick 2.0
-
-Item {
-    id: root
-    property bool divider: true
-    property real dividerValue: 1
-    property ListModel parameters: ListModel {
-        ListElement {
-            name: "radius"
-            value: 0.5
-        }
-    }
-
-    property alias targetWidth: verticalShader.targetWidth
-    property alias targetHeight: verticalShader.targetHeight
-    property alias source: verticalShader.source
-
-    Effect {
-        id: verticalShader
-        anchors.fill:  parent
-        dividerValue: parent.dividerValue
-        property real blurSize: 4.0 * parent.parameters.get(0).value / targetHeight
-        fragmentShaderFilename: "shaders/gaussianblur_v.fsh"
-    }
-
-    Effect {
-        id: horizontalShader
-        anchors.fill: parent
-        dividerValue: parent.dividerValue
-        property real blurSize: 4.0 * parent.parameters.get(0).value / parent.targetWidth
-        fragmentShaderFilename: "shaders/gaussianblur_h.fsh"
-        source: horizontalShaderSource
-
-        ShaderEffectSource {
-            id: horizontalShaderSource
-            sourceItem: verticalShader
-            smooth: true
-            hideSource: true
-        }
-    }
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectGlow.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectGlow.qml
deleted file mode 100755
index d6e987d..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectGlow.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    fragmentShaderFilename: "shaders/glow.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectIsolate.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectIsolate.qml
deleted file mode 100755
index 2425a25..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectIsolate.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "hue"
-            value: 0.5
-        }
-        ListElement {
-            name: "width"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real targetHue: parameters.get(0).value * 360
-    property real windowWidth: parameters.get(1).value * 60
-
-    fragmentShaderFilename: "shaders/isolate.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPassThrough.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPassThrough.qml
deleted file mode 100755
index 1f259be..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPassThrough.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    divider: false
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPixelate.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPixelate.qml
deleted file mode 100755
index 71f7da9..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPixelate.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "granularity"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real granularity: parameters.get(0).value * 20
-
-    fragmentShaderFilename: "shaders/pixelate.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPosterize.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPosterize.qml
deleted file mode 100755
index 0cf16a0..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectPosterize.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "gamma"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real gamma: parameters.get(0).value
-
-    property real numColors: 8.0
-
-    fragmentShaderFilename: "shaders/posterize.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectRipple.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectRipple.qml
deleted file mode 100755
index 0b7c48c..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectRipple.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "amplitude"
-            value: 0.5
-        }
-        ListElement {
-            name: "frequency"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real amplitude: parameters.get(0).value * 0.03
-    property real n: parameters.get(1).value * 7
-
-    property real time: 0
-    NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
-
-    fragmentShaderFilename: "shaders/ripple.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSepia.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSepia.qml
deleted file mode 100755
index 446e779..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSepia.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    fragmentShaderFilename: "shaders/sepia.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSharpen.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSharpen.qml
deleted file mode 100755
index 99ece3c..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSharpen.qml
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "sharpness"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real amount: parameters.get(0).value * 18
-
-    fragmentShaderFilename: "shaders/sharpen.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectShockwave.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectShockwave.qml
deleted file mode 100755
index fe91781..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectShockwave.qml
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    id: root
-    parameters: ListModel {
-        ListElement {
-            name: "amplitude"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real granularity: parameters.get(0).value * 20
-    property real weight: parameters.get(0).value
-
-    property real centerX
-    property real centerY
-    property real time
-
-    SequentialAnimation {
-        running: true
-        loops: Animation.Infinite
-        ScriptAction {
-            script: {
-                centerX = Math.random()
-                centerY = Math.random()
-            }
-        }
-        NumberAnimation {
-            target: root
-            property: "time"
-            from: 0
-            to: 1
-            duration: 1000
-        }
-    }
-
-    fragmentShaderFilename: "shaders/shockwave.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSobelEdgeDetection1.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSobelEdgeDetection1.qml
deleted file mode 100755
index 189d5d3..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectSobelEdgeDetection1.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "threshold"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real mixLevel: parameters.get(0).value
-    property real targetSize: 250 - (200 * mixLevel) // TODO: fix ...
-    property real resS: targetSize
-    property real resT: targetSize
-
-    fragmentShaderFilename: "shaders/sobeledgedetection1.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectToon.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectToon.qml
deleted file mode 100755
index 08f1849..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectToon.qml
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "threshold"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real threshold: parameters.get(0).value
-    property real targetSize: 250 - (200 * threshold) // TODO: fix ...
-    property real resS: targetSize
-    property real resT: targetSize
-
-    // TODO
-    property real magTol: 0.3
-    property real quantize: 8.0
-
-    fragmentShaderFilename: "shaders/toon.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectVignette.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectVignette.qml
deleted file mode 100755
index 1120161..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectVignette.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    fragmentShaderFilename: "shaders/vignette.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectWarhol.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectWarhol.qml
deleted file mode 100755
index e96d052..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectWarhol.qml
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    fragmentShaderFilename: "shaders/warhol.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectWobble.qml b/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectWobble.qml
deleted file mode 100755
index 4cccf48..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Effects/EffectWobble.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Effect {
-    parameters: ListModel {
-        ListElement {
-            name: "amplitude"
-            value: 0.5
-        }
-    }
-
-    // Transform slider values, and bind result to shader uniforms
-    property real amplitude: parameters.get(0).value * 0.05
-
-    property real frequency: 20
-    property real time: 0
-
-    NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
-
-    fragmentShaderFilename: "shaders/wobble.fsh"
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Logo.qml b/basicsuite/qt5-everywhere/demos/shaders/Logo.qml
deleted file mode 100644
index 04bcd36..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Logo.qml
+++ /dev/null
@@ -1,191 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: root
-
-    property int logoSize: Math.min(parent.height, parent.width) / 2
-    property int logoSizeDivider: 1
-    property int logoState: 1
-    property double posX: parent.width / 2
-    property double posY: parent.height / 2
-    property double rot: 0
-    property double dx: 10
-    property double dy: 10
-    property double drot: 1
-    property string explodeColor: "#ff3333"
-
-    function play() {
-        randomValues();
-        animationTimer.restart()
-    }
-
-    function logoClicked() {
-        switch(root.logoState) {
-        case 1: {
-            parent.createNewLogos(root.posX,root.posY,logoSize,2)
-            parent.decreaseCounter();
-            logo.visible = false;
-            root.logoState = 2;
-            root.explodeColor = "#33ff33"
-            explodeAnimation.restart()
-            break;
-        }
-        default: {
-            // return true if we must destroy this logo
-            if (parent.decreaseCounter(root.posX,root.posY) === true) {
-                logo.visible = false;
-                root.logoState = 2;
-                root.dx = 0;
-                root.dy = 0;
-                root.drot = 0;
-                root.explodeColor = "#ff3333"
-                explodeAnimation.restart()
-            }
-            else { // It was last logo, we will keep it
-                root.logoState = 1
-                root.logoSizeDivider = 1
-                root.explodeColor = "#3333ff"
-                explodeAnimation.restart()
-            }
-            break;
-        }
-        }
-
-    }
-
-    function randomValues() {
-        root.dx = Math.random()*5
-        root.dy = Math.random()*5
-        root.drot = Math.floor(Math.random()*10) - 5
-    }
-
-    function move() {
-        var x = root.posX + root.dx;
-        var y = root.posY + root.dy;
-        var limit = logoSize / logoState;
-
-        // Check x
-        if (x + limit >= parent.width) {
-            x = parent.width - limit;
-            root.dx = -root.dx;
-        }
-        else if (x <= 0) {
-            x = 0;
-            root.dx = -root.dx;
-        }
-
-        // Check y
-        if (y + limit >= parent.height) {
-            y = parent.height - limit;
-            root.dy = -root.dy;
-        }
-        else if (y <= 0) {
-            y = 0;
-            root.dy = -root.dy;
-        }
-
-        root.posX = x
-        root.posY = y
-        root.rot = root.rot + root.drot
-    }
-
-    ParticleSystem{
-        id: particleSystem;
-        anchors.fill: logo
-
-        Emitter {
-            id: emitter
-            anchors.fill: particleSystem
-            enabled: false
-            emitRate: 1000
-            lifeSpan: 500
-            size: logo.height * .5
-            endSize: logo.height * .1
-            velocity: AngleDirection { angleVariation: 360; magnitudeVariation: 160 }
-        }
-
-        ImageParticle {
-            id: smokeParticle
-            source: "images/particle-smoke.png"
-            alpha: 0.3
-            alphaVariation: 0.1
-            color: root.explodeColor
-        }
-    }
-
-    Timer {
-        id: animationTimer
-        interval: 20
-        running: false
-        repeat: true
-        onTriggered: move();
-    }
-
-    Image {
-        id: logo
-        width: (logoSize / logoSizeDivider)
-        height: (logoSize / logoSizeDivider)
-        x: root.posX
-        y: root.posY
-        rotation: root.rot
-        source: "images/qt-logo.png"
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: logoClicked();
-        }
-    }
-
-    SequentialAnimation {
-        id: explodeAnimation
-        running: false
-        ScriptAction { script: emitter.pulse(100); }
-        PauseAnimation { duration: 600 }
-        onRunningChanged: {
-            if (!explodeAnimation.running && root.logoState > 1)
-                root.destroy();
-        }
-    }
-
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml b/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml
deleted file mode 100644
index 57b3505..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/LogoContainer.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: root
-    anchors.fill: parent
-
-    property int logoCount: 0
-
-    Image {
-        id: background
-        source: "images/wallpaper.png"
-        anchors.fill: root
-    }
-
-    function createNewLogo(x,y,logoState) {
-        logoCount++;
-        var component = Qt.createComponent("Logo.qml")
-        if (component.status === Component.Ready) {
-            var logo = component.createObject(root, {"posX": x, "posY": y, "logoState": logoState, "logoSizeDivider" : logoState, "objectName": "logo"});
-            logo.play();
-        }
-    }
-
-    function createNewLogos(x, y, logoSize, logoState) {
-        var newSize = logoSize / logoState;
-        var temp = logoSize - newSize;
-
-        createNewLogo(x, y, logoState);
-        createNewLogo(x+temp, y, logoState);
-        createNewLogo(x+temp, y+temp, logoState);
-        createNewLogo(x, y+temp, logoState);
-        createNewLogo(x+logoSize/2-newSize/2, y+logoSize/2-newSize/2, logoState);
-    }
-
-    function decreaseCounter() {
-        if (logoCount > 1) {
-            logoCount--;
-            return true;
-        }
-        return false;
-    }
-
-    Component.onCompleted: {
-        var logoSize = Math.min(root.height, root.width) / 2;
-        createNewLogo(root.width/2 - logoSize/2, root.height/2 - logoSize/2, 1)
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/ParameterPanel.qml b/basicsuite/qt5-everywhere/demos/shaders/ParameterPanel.qml
deleted file mode 100644
index 33dd5ea..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/ParameterPanel.qml
+++ /dev/null
@@ -1,107 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    height: view.model.count * sliderHeight
-    color: "#BB333333"
-    property color lineColor: "black"
-    property real spacing: 10
-    property real sliderHeight: 50
-    property bool isMouseAbove: mouseAboveMonitor.containsMouse
-
-    property ListModel model: ListModel { }
-
-    MouseArea {
-        id: mouseAboveMonitor
-        anchors.fill: parent
-        hoverEnabled: true;
-    }
-
-    Component {
-        id: editDelegate
-
-        Item {
-            id: delegate
-            width: root.width
-            height: root.sliderHeight
-
-            Text {
-                id: text
-                text: name
-                color: "white"
-                anchors {
-                    top: parent.top
-                    bottom: parent.bottom
-                    left: parent.left
-                    leftMargin: root.width * 0.05
-                }
-                horizontalAlignment: Text.AlignLeft
-                verticalAlignment: Text.AlignVCenter
-                font.pixelSize: delegate.height * 0.3
-                font.capitalization: Font.Capitalize
-                width: root.width * 0.35
-            }
-
-            Slider {
-                anchors {
-                    verticalCenter: text.verticalCenter
-                    left: text.right
-                    leftMargin: root.width * 0.05
-                    right: parent.right
-                    rightMargin: root.width * 0.05
-                }
-                value: model.value
-                onValueChanged: view.model.setProperty(index, "value", value)
-            }
-        }
-    }
-
-    ListView {
-        id: view
-        anchors.fill: parent
-        model: root.model
-        delegate: editDelegate
-        interactive: false
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/Slider.qml b/basicsuite/qt5-everywhere/demos/shaders/Slider.qml
deleted file mode 100644
index 2e21010..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/Slider.qml
+++ /dev/null
@@ -1,138 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: slider
-
-    height: handleBack.height
-    // value is read/write.
-    property real value: 0
-    property real maximum: 1
-    property real minimum: 0
-    property int xMax: width - handle.width
-    onXMaxChanged: updatePos()
-    onMinimumChanged: updatePos()
-    onValueChanged: if (!pressed) updatePos()
-    property bool mutable: true
-    property alias pressed : backgroundMouse.pressed
-
-    signal valueChangedByHandle(int newValue)
-
-    function updatePos() {
-        if (maximum > minimum) {
-            var pos = 0 + (value - minimum) * slider.xMax / (maximum - minimum);
-            pos = Math.min(pos, width - handle.width - 0);
-            pos = Math.max(pos, 0);
-            handle.x = pos;
-        } else {
-            handle.x = 0;
-        }
-    }
-
-    Rectangle {
-        id: background
-        width: slider.width
-        anchors.verticalCenter: slider.verticalCenter
-        height: 2
-        color: "#666666"
-
-        MouseArea {
-            id: backgroundMouse
-            anchors.fill: parent
-            anchors.topMargin: -24
-            anchors.bottomMargin: -24
-            enabled: slider.mutable
-            drag.target: handle
-            drag.axis: Drag.XAxis
-            drag.minimumX: 0
-            drag.maximumX: slider.xMax
-            onPressedChanged: {
-                value = Math.max(minimum, Math.min(maximum, (maximum - minimum) * (mouseX - handle.width/2) / slider.xMax + minimum));
-                valueChangedByHandle(value);
-                updatePos();
-            }
-            onPositionChanged: {
-                value = Math.max(minimum, Math.min(maximum, (maximum - minimum) * (mouseX - handle.width/2) / slider.xMax + minimum));
-                valueChangedByHandle(value);
-            }
-            onWheel: {
-                value = Math.max(minimum, Math.min(maximum, value + (wheel.angleDelta.y > 0 ? 1 : -1) * (10 / slider.xMax) * (slider.maximum - slider.minimum)));
-                valueChangedByHandle(value);
-                updatePos();
-            }
-        }
-    }
-
-    Rectangle {
-        id: progress
-        height: 5
-        anchors.verticalCenter: background.verticalCenter
-        anchors.left: background.left
-        anchors.right: handle.right
-        anchors.rightMargin: handle.width / 2
-        visible: slider.enabled
-        color: "#98c66c"
-    }
-
-    Rectangle {
-        id: handleBack
-        width: 40
-        height: width
-        radius: width / 2
-        color: "#8898c66c"
-        antialiasing: true
-        anchors.centerIn: handle
-        visible: handle.visible
-    }
-
-    Rectangle {
-        id: handle
-        width: 14
-        height: width
-        radius: width / 2
-        antialiasing: true
-        color: "#98c66c"
-        anchors.verticalCenter: background.verticalCenter
-        visible: slider.enabled
-    }
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/shaders/images/particle-smoke.png b/basicsuite/qt5-everywhere/demos/shaders/images/particle-smoke.png
deleted file mode 100644
index b27f954..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/images/particle-smoke.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/shaders/images/qt-logo.png b/basicsuite/qt5-everywhere/demos/shaders/images/qt-logo.png
deleted file mode 100755
index 242bb28..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/images/qt-logo.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/shaders/images/wallpaper.png b/basicsuite/qt5-everywhere/demos/shaders/images/wallpaper.png
deleted file mode 100644
index a499231..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/images/wallpaper.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/import.pro b/basicsuite/qt5-everywhere/demos/shaders/import/import.pro
deleted file mode 100644
index af51461..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/import/import.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin
-
-TARGET = shaderreader
-
-QT += qml quick
-
-SOURCES = main.cpp \
-          shaderfilereader.cpp \
-
-HEADERS = shaderfilereader.h \
-
-pluginfiles.files += \
-    qmldir \
-
-B2QT_DEPLOYPATH = /data/user/qt/qmlplugins/ShaderReader
-target.path += $$B2QT_DEPLOYPATH
-pluginfiles.path += $$B2QT_DEPLOYPATH
-
-INSTALLS += target pluginfiles
diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/plugin.json b/basicsuite/qt5-everywhere/demos/shaders/import/plugin.json
deleted file mode 100644
index e69de29..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/import/plugin.json
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/qmldir b/basicsuite/qt5-everywhere/demos/shaders/import/qmldir
deleted file mode 100644
index 0c53031..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/import/qmldir
+++ /dev/null
@@ -1,2 +0,0 @@
-module ShaderReader
-plugin shaderreader
diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp
deleted file mode 100644
index 629f4b7..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
-**
-** This file is part of the examples of the Qt Enterprise Embedded.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "shaderfilereader.h"
-#include <QtCore/QFile>
-#include <QtCore/QTextStream>
-#include <QtCore/QDir>
-#include <QtCore/QDebug>
-
-ShaderFileReader::ShaderFileReader(QObject* parent)
-    : QObject(parent)
-{
-    if (qEnvironmentVariableIsEmpty("QT_SHADER_PATH"))
-        setenv("QT_SHADER_PATH", "/data/user/qt/qt5-everywhere/demos/shaders/",1);
-    // check if directory contains shader files
-    QByteArray shaderPath(qgetenv("QT_SHADER_PATH").append("shaders/"));
-    QDir shaderDir(shaderPath);
-    if (shaderDir.entryInfoList(QStringList() << "*.fsh").length() < 1)
-        qWarning() << "ShaderFileReader: can not find shader files in " << shaderPath;
-}
-
-ShaderFileReader::~ShaderFileReader()
-{
-}
-
-void ShaderFileReader::setFragmentShaderFilename(const QString &name)
-{
-    m_fragmentShaderFilename = name;
-    Q_EMIT fragmentShaderFilenameChanged();
-}
-
-void ShaderFileReader::setVertexShaderFilename(const QString &name)
-{
-    m_vertexShaderFilename = name;
-    Q_EMIT vertexShaderFilenameChanged();
-}
-
-QString ShaderFileReader::fragmentShader() const
-{
-    return readShaderFile(m_fragmentShaderFilename);
-}
-
-QString ShaderFileReader::vertexShader() const
-{
-    return readShaderFile(m_vertexShaderFilename);
-}
-
-QString ShaderFileReader::readShaderFile(const QString &fileName) const
-{
-    QString content;
-    QString path = qgetenv("QT_SHADER_PATH");
-    QFile file(path.append(fileName));
-    if (file.open(QIODevice::ReadOnly)) {
-        QTextStream stream(&file);
-        content = stream.readAll();
-        file.close();
-    }
-    return content;
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h b/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h
deleted file mode 100644
index 30a68f3..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/import/shaderfilereader.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
-**
-** This file is part of the examples of the Qt Enterprise Embedded.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef SHADERFILEREADER_H
-#define SHADERFILEREADER_H
-
-#include <QtCore/QObject>
-#include <QtCore/QString>
-
-class ShaderFileReader : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString fragmentShaderFilename READ fragmentShaderFilename
-               WRITE setFragmentShaderFilename NOTIFY fragmentShaderFilenameChanged)
-    Q_PROPERTY(QString vertexShaderFilename READ vertexShaderFilename
-               WRITE setVertexShaderFilename NOTIFY vertexShaderFilenameChanged)
-
-    Q_PROPERTY(QString fragmentShader READ fragmentShader)
-    Q_PROPERTY(QString vertexShader READ vertexShader)
-
-public:
-    ShaderFileReader(QObject* parent = 0);
-    ~ShaderFileReader();
-
-    void setFragmentShaderFilename(const QString &name);
-    void setVertexShaderFilename(const QString &name);
-    QString fragmentShaderFilename() const { return m_fragmentShaderFilename; }
-    QString vertexShaderFilename() const { return m_vertexShaderFilename; }
-
-    QString fragmentShader() const;
-    QString vertexShader() const;
-
-protected:
-    QString readShaderFile(const QString &fileName) const;
-
-Q_SIGNALS:
-    void fragmentShaderFilenameChanged();
-    void vertexShaderFilenameChanged();
-
-private:
-    QString m_fragmentShaderFilename;
-    QString m_vertexShaderFilename;
-};
-
-Q_DECLARE_METATYPE(ShaderFileReader*)
-
-#endif // SHADERFILEREADER_H
diff --git a/basicsuite/qt5-everywhere/demos/shaders/main.qml b/basicsuite/qt5-everywhere/demos/shaders/main.qml
deleted file mode 100755
index c5f5d4c..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/main.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: applicationWindow
-    anchors.fill:parent
-    color: "black"
-    property int margin: applicationWindow.height * 0.02
-
-    Content {
-        id: content
-        anchors.fill: parent
-    }
-
-    Rectangle {
-        id: fx
-        anchors.right: applicationWindow.right
-        anchors.bottom: applicationWindow.bottom
-        anchors.margins: applicationWindow.margin
-        width: applicationWindow.width * 0.25
-        height: applicationWindow.height * 0.08
-        color: "#333333"
-        border.color: "#777777"
-        opacity: 0.5
-
-        Text {
-            anchors.centerIn: fx
-            color: "#ffffff"
-            text: effectSelectionPanel.effectName
-            font.pixelSize: fx.height * 0.5
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onPressed: fx.color = "#555555"
-            onReleased: fx.color = "#333333"
-            onClicked: effectSelectionPanel.visible = !effectSelectionPanel.visible;
-        }
-    }
-
-    ParameterPanel {
-        id: parameterPanel
-        opacity: 0.7
-        visible: effectSelectionPanel.visible && model.count !== 0
-        width: applicationWindow.width * 0.4
-        sliderHeight: applicationWindow.height * 0.15
-        anchors {
-            bottom: effectSelectionPanel.bottom
-            right: effectSelectionPanel.left
-        }
-    }
-
-    EffectSelectionPanel {
-        id: effectSelectionPanel
-        visible: false
-        opacity: 0.7
-        anchors {
-            top: applicationWindow.top
-            right: applicationWindow.right
-            margins: applicationWindow.margin
-        }
-        width: fx.width
-        height: applicationWindow.height - fx.height - 2*applicationWindow.margin
-        itemHeight: fx.height
-        color: fx.color
-
-        onClicked: {
-            content.effectSource = effectSource
-            parameterPanel.model = content.effect.parameters
-        }
-    }
-
-    Component.onCompleted: {
-        content.init()
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders.pro b/basicsuite/qt5-everywhere/demos/shaders/shaders.pro
deleted file mode 100644
index de580fd..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += \
-     import \
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/billboard.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/billboard.fsh
deleted file mode 100755
index baa9554..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/billboard.fsh
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float grid;
-uniform float dividerValue;
-uniform float step_x;
-uniform float step_y;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    float offx = floor(uv.x  / (grid * step_x));
-    float offy = floor(uv.y  / (grid * step_y));
-    vec3 res = texture2D(source, vec2(offx * grid * step_x , offy * grid * step_y)).rgb;
-    vec2 prc = fract(uv / vec2(grid * step_x, grid * step_y));
-    vec2 pw = pow(abs(prc - 0.5), vec2(2.0));
-    float  rs = pow(0.45, 2.0);
-    float gr = smoothstep(rs - 0.1, rs + 0.1, pw.x + pw.y);
-    float y = (res.r + res.g + res.b) / 3.0;
-    vec3 ra = res / y;
-    float ls = 0.3;
-    float lb = ceil(y / ls);
-    float lf = ls * lb + 0.3;
-    res = lf * res;
-    vec3 col = mix(res, vec3(0.1, 0.1, 0.1), gr);
-    if (uv.x < dividerValue)
-        gl_FragColor = qt_Opacity * vec4(col, 1.0);
-    else
-        gl_FragColor = qt_Opacity * texture2D(source, uv);
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/blackandwhite.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/blackandwhite.fsh
deleted file mode 100755
index 40756c4..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/blackandwhite.fsh
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float threshold;
-uniform float dividerValue;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec4 orig = texture2D(source, uv);
-    vec3 col = orig.rgb;
-    float y = 0.3 *col.r + 0.59 * col.g + 0.11 * col.b;
-    y = y < threshold ? 0.0 : 1.0;
-    if (uv.x < dividerValue)
-        gl_FragColor = qt_Opacity * vec4(y, y, y, 1.0);
-    else
-        gl_FragColor = qt_Opacity * orig;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/emboss.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/emboss.fsh
deleted file mode 100755
index bd13a0b..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/emboss.fsh
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float dividerValue;
-const float step_w = 0.0015625;
-const float step_h = 0.0027778;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
-    vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
-    vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
-    vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
-    vec3 t5 = texture2D(source, uv).rgb;
-    vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
-    vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
-    vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
-    vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
-    vec3 rr = -4.0 * t1 - 4.0 * t2 - 4.0 * t4 + 12.0 * t5;
-    float y = (rr.r + rr.g + rr.b) / 3.0;
-    vec3 col = vec3(y, y, y) + 0.3;
-    if (uv.x < dividerValue)
-        gl_FragColor = qt_Opacity * vec4(col, 1.0);
-    else
-        gl_FragColor = qt_Opacity * texture2D(source, uv);
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/gaussianblur_h.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/gaussianblur_h.fsh
deleted file mode 100755
index 96ae8e4..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/gaussianblur_h.fsh
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-uniform float dividerValue;
-uniform float blurSize;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec4 c = vec4(0.0);
-    if (uv.x < dividerValue) {
-        c += texture2D(source, uv - vec2(4.0*blurSize, 0.0)) * 0.05;
-        c += texture2D(source, uv - vec2(3.0*blurSize, 0.0)) * 0.09;
-        c += texture2D(source, uv - vec2(2.0*blurSize, 0.0)) * 0.12;
-        c += texture2D(source, uv - vec2(1.0*blurSize, 0.0)) * 0.15;
-        c += texture2D(source, uv) * 0.18;
-        c += texture2D(source, uv + vec2(1.0*blurSize, 0.0)) * 0.15;
-        c += texture2D(source, uv + vec2(2.0*blurSize, 0.0)) * 0.12;
-        c += texture2D(source, uv + vec2(3.0*blurSize, 0.0)) * 0.09;
-        c += texture2D(source, uv + vec2(4.0*blurSize, 0.0)) * 0.05;
-    } else {
-        c = texture2D(source, qt_TexCoord0);
-    }
-    gl_FragColor = qt_Opacity * c;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/gaussianblur_v.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/gaussianblur_v.fsh
deleted file mode 100755
index 6bc7b8b..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/gaussianblur_v.fsh
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-uniform float dividerValue;
-uniform float blurSize;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec4 c = vec4(0.0);
-    if (uv.x < dividerValue) {
-        c += texture2D(source, uv - vec2(0.0, 4.0*blurSize)) * 0.05;
-        c += texture2D(source, uv - vec2(0.0, 3.0*blurSize)) * 0.09;
-        c += texture2D(source, uv - vec2(0.0, 2.0*blurSize)) * 0.12;
-        c += texture2D(source, uv - vec2(0.0, 1.0*blurSize)) * 0.15;
-        c += texture2D(source, uv) * 0.18;
-        c += texture2D(source, uv + vec2(0.0, 1.0*blurSize)) * 0.15;
-        c += texture2D(source, uv + vec2(0.0, 2.0*blurSize)) * 0.12;
-        c += texture2D(source, uv + vec2(0.0, 3.0*blurSize)) * 0.09;
-        c += texture2D(source, uv + vec2(0.0, 4.0*blurSize)) * 0.05;
-    } else {
-        c = texture2D(source, qt_TexCoord0);
-    }
-    // First pass we don't apply opacity
-    gl_FragColor = c;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/glow.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/glow.fsh
deleted file mode 100755
index e0adcfd..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/glow.fsh
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float dividerValue;
-const float step_w = 0.0015625;
-const float step_h = 0.0027778;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
-    vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
-    vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
-    vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
-    vec3 t5 = texture2D(source, uv).rgb;
-    vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
-    vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
-    vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
-    vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
-    vec3 xx = t1 + 2.0*t2 + t3 - t7 - 2.0*t8 - t9;
-    vec3 yy = t1 - t3 + 2.0*t4 - 2.0*t6 + t7 - t9;
-    vec3 rr = sqrt(xx * xx + yy * yy);
-    vec3 col = rr * 2.0 * t5;
-    if (uv.x < dividerValue)
-        gl_FragColor = qt_Opacity * vec4(col, 1.0);
-    else
-        gl_FragColor = qt_Opacity * texture2D(source, uv);
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/isolate.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/isolate.fsh
deleted file mode 100755
index 0f25bfa..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/isolate.fsh
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float targetHue;
-uniform float windowWidth;
-uniform float dividerValue;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void rgb2hsl(vec3 rgb, out float h, out float s, float l)
-{
-    float maxval = max(rgb.r, max(rgb.g, rgb.b));
-    float minval = min(rgb.r, min(rgb.g, rgb.b));
-    float delta = maxval - minval;
-    l = (minval + maxval) / 2.0;
-    s = 0.0;
-    if (l > 0.0 && l < 1.0)
-        s = delta / (l < 0.5 ? 2.0 * l : 2.0 - 2.0 * l);
-    h = 0.0;
-    if (delta > 0.0)
-    {
-        if (rgb.r == maxval && rgb.g != maxval)
-            h += (rgb.g - rgb.b ) / delta;
-        if (rgb.g == maxval && rgb.b != maxval)
-            h += 2.0  + (rgb.b - rgb.r) / delta;
-        if (rgb.b == maxval && rgb.r != maxval)
-            h += 4.0 + (rgb.r - rgb.g) / delta;
-        h *= 60.0;
-    }
-}
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec3 col = texture2D(source, uv).rgb;
-    float h, s, l;
-    rgb2hsl(col, h, s, l);
-    float h2 = (h > targetHue) ? h - 360.0 : h + 360.0;
-    float y = 0.3 * col.r + 0.59 * col.g + 0.11 * col.b;
-    vec3 result;
-    if (uv.x > dividerValue || (abs(h - targetHue) < windowWidth) || (abs(h2 - targetHue) < windowWidth))
-        result = col;
-    else
-        result = vec3(y, y, y);
-    gl_FragColor = qt_Opacity * vec4(result, 1.0);
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/pixelate.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/pixelate.fsh
deleted file mode 100755
index 922d79b..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/pixelate.fsh
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://www.geeks3d.com/20101029/shader-library-pixelation-post-processing-effect-glsl/
-
-uniform float dividerValue;
-uniform float granularity;
-uniform float targetWidth;
-uniform float targetHeight;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec2 tc = qt_TexCoord0;
-    if (uv.x < dividerValue && granularity > 0.0) {
-        float dx = granularity / targetWidth;
-        float dy = granularity / targetHeight;
-        tc = vec2(dx*(floor(uv.x/dx) + 0.5),
-                  dy*(floor(uv.y/dy) + 0.5));
-    }
-    gl_FragColor = qt_Opacity * texture2D(source, tc);
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/posterize.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/posterize.fsh
deleted file mode 100755
index e5c77ce..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/posterize.fsh
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://www.geeks3d.com/20091027/shader-library-posterization-post-processing-effect-glsl/
-
-uniform float dividerValue;
-uniform float gamma;
-uniform float numColors;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec4 c = vec4(0.0);
-    if (uv.x < dividerValue) {
-        vec3 x = texture2D(source, uv).rgb;
-        x = pow(x, vec3(gamma, gamma, gamma));
-        x = x * numColors;
-        x = floor(x);
-        x = x / numColors;
-        x = pow(x, vec3(1.0/gamma));
-        c = vec4(x, 1.0);
-    } else {
-        c = texture2D(source, uv);
-    }
-    gl_FragColor = qt_Opacity * c;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/ripple.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/ripple.fsh
deleted file mode 100755
index 6d4187c..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/ripple.fsh
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://labs.qt.nokia.com/2011/03/22/the-convenient-power-of-qml-scene-graph/
-
-uniform float dividerValue;
-uniform float targetWidth;
-uniform float targetHeight;
-uniform float time;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-const float PI = 3.1415926535;
-const int ITER = 7;
-const float RATE = 0.1;
-uniform float amplitude;
-uniform float n;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec2 tc = uv;
-    vec2 p = vec2(-1.0 + 2.0 * gl_FragCoord.x / targetWidth, -(-1.0 + 2.0 * gl_FragCoord.y / targetHeight));
-    float diffx = 0.0;
-    float diffy = 0.0;
-    vec4 col;
-    if (uv.x < dividerValue) {
-        for (int i=0; i<ITER; ++i) {
-            float theta = float(i) * PI / float(ITER);
-            vec2 r = vec2(cos(theta) * p.x + sin(theta) * p.y, -1.0 * sin(theta) * p.x + cos(theta) * p.y);
-            float diff = (sin(2.0 * PI * n * (r.y + time * RATE)) + 1.0) / 2.0;
-            diffx += diff * sin(theta);
-            diffy += diff * cos(theta);
-        }
-        tc = 0.5*(vec2(1.0,1.0) + p) + amplitude * vec2(diffx, diffy);
-    }
-    gl_FragColor = qt_Opacity * texture2D(source, tc);
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/selectionpanel.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/selectionpanel.fsh
deleted file mode 100755
index 89d570e..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/selectionpanel.fsh
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/sepia.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/sepia.fsh
deleted file mode 100755
index 196c517..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/sepia.fsh
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float dividerValue;
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec4 orig = texture2D(source, uv);
-    vec3 col = orig.rgb;
-    float y = 0.3 * col.r + 0.59 * col.g + 0.11 * col.b;
-    if (uv.x < dividerValue)
-        gl_FragColor = qt_Opacity * vec4(y + 0.15, y + 0.07, y - 0.12, 1.0);
-    else
-        gl_FragColor = qt_Opacity * orig;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/sharpen.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/sharpen.fsh
deleted file mode 100755
index 3907637..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/sharpen.fsh
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float dividerValue;
-uniform float amount;
-const float step_w = 0.0015625;
-const float step_h = 0.0027778;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-vec3 sharpen(vec3 t1, vec3 t2, vec3 t3, vec3 t4, vec3 t5, vec3 t6, vec3 t7, vec3 t8, vec3 t9)
-{
-    return -t1 - t2 - t3 - t4 + amount * t5 - t6 - t7 - t8 - t9;
-}
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
-    vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
-    vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
-    vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
-    vec3 t5 = texture2D(source, uv).rgb;
-    vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
-    vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
-    vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
-    vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
-    vec3 col = sharpen(t1, t2, t3, t4, t5, t6, t7, t8, t9);
-    if (uv.x < dividerValue)
-        gl_FragColor = qt_Opacity * vec4(col, 1.0);
-    else
-        gl_FragColor = qt_Opacity * texture2D(source, uv);
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/shockwave.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/shockwave.fsh
deleted file mode 100755
index 64f33c8..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/shockwave.fsh
+++ /dev/null
@@ -1,73 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://www.geeks3d.com/20091116/shader-library-2d-shockwave-post-processing-filter-glsl/
-
-uniform float centerX;
-uniform float centerY;
-uniform float dividerValue;
-uniform float granularity;
-uniform float time;
-uniform float weight;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec2 tc = qt_TexCoord0;
-    vec2 center = vec2(centerX, centerY);
-    const vec3 shock = vec3(10.0, 1.5, 0.1);
-    if (uv.x < dividerValue) {
-        float distance = distance(uv, center);
-        if ((distance <= (time + shock.z)) &&
-            (distance >= (time - shock.z))) {
-            float diff = (distance - time);
-            float powDiff = 1.0 - pow(abs(diff*shock.x), shock.y*weight);
-            float diffTime = diff  * powDiff;
-            vec2 diffUV = normalize(uv - center);
-            tc += (diffUV * diffTime);
-        }
-    }
-    gl_FragColor = qt_Opacity * texture2D(source, tc);
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/sobeledgedetection1.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/sobeledgedetection1.fsh
deleted file mode 100755
index 96732fa..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/sobeledgedetection1.fsh
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on "Graphics Shaders: Theory and Practice" (http://cgeducation.org/ShadersBook/)
-
-uniform float dividerValue;
-uniform float mixLevel;
-uniform float resS;
-uniform float resT;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec4 c = vec4(0.0);
-    if (uv.x < dividerValue) {
-        vec2 st = qt_TexCoord0.st;
-        vec3 irgb = texture2D(source, st).rgb;
-        vec2 stp0 = vec2(1.0 / resS, 0.0);
-        vec2 st0p = vec2(0.0       , 1.0 / resT);
-        vec2 stpp = vec2(1.0 / resS, 1.0 / resT);
-        vec2 stpm = vec2(1.0 / resS, -1.0 / resT);
-        const vec3 W = vec3(0.2125, 0.7154, 0.0721);
-        float i00   = dot(texture2D(source, st).rgb, W);
-        float im1m1 = dot(texture2D(source, st-stpp).rgb, W);
-        float ip1p1 = dot(texture2D(source, st+stpp).rgb, W);
-        float im1p1 = dot(texture2D(source, st-stpm).rgb, W);
-        float ip1m1 = dot(texture2D(source, st+stpm).rgb, W);
-        float im10  = dot(texture2D(source, st-stp0).rgb, W);
-        float ip10  = dot(texture2D(source, st+stp0).rgb, W);
-        float i0m1  = dot(texture2D(source, st-st0p).rgb, W);
-        float i0p1  = dot(texture2D(source, st+st0p).rgb, W);
-        float h = -1.0*im1p1 - 2.0*i0p1 - 1.0*ip1p1 + 1.0*im1m1 + 2.0*i0m1 + 1.0*ip1m1;
-        float v = -1.0*im1m1 - 2.0*im10 - 1.0*im1p1 + 1.0*ip1m1 + 2.0*ip10 + 1.0*ip1p1;
-        float mag = 1.0 - length(vec2(h, v));
-        vec3 target = vec3(mag, mag, mag);
-        c = vec4(target, 1.0);
-    } else {
-        c = texture2D(source, qt_TexCoord0);
-    }
-    gl_FragColor = qt_Opacity * c;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/toon.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/toon.fsh
deleted file mode 100755
index 2814dfb..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/toon.fsh
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://www.geeks3d.com/20101029/shader-library-pixelation-post-processing-effect-glsl/
-
-uniform float dividerValue;
-uniform float threshold;
-uniform float resS;
-uniform float resT;
-uniform float magTol;
-uniform float quantize;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec4 color = vec4(1.0, 0.0, 0.0, 1.1);
-    vec2 uv = qt_TexCoord0.xy;
-    if (uv.x < dividerValue) {
-        vec2 st = qt_TexCoord0.st;
-        vec3 rgb = texture2D(source, st).rgb;
-        vec2 stp0 = vec2(1.0/resS,  0.0);
-        vec2 st0p = vec2(0.0     ,  1.0/resT);
-        vec2 stpp = vec2(1.0/resS,  1.0/resT);
-        vec2 stpm = vec2(1.0/resS, -1.0/resT);
-        float i00 =   dot( texture2D(source, st).rgb, vec3(0.2125,0.7154,0.0721));
-        float im1m1 = dot( texture2D(source, st-stpp).rgb, vec3(0.2125,0.7154,0.0721));
-        float ip1p1 = dot( texture2D(source, st+stpp).rgb, vec3(0.2125,0.7154,0.0721));
-        float im1p1 = dot( texture2D(source, st-stpm).rgb, vec3(0.2125,0.7154,0.0721));
-        float ip1m1 = dot( texture2D(source, st+stpm).rgb, vec3(0.2125,0.7154,0.0721));
-        float im10 =  dot( texture2D(source, st-stp0).rgb, vec3(0.2125,0.7154,0.0721));
-        float ip10 =  dot( texture2D(source, st+stp0).rgb, vec3(0.2125,0.7154,0.0721));
-        float i0m1 =  dot( texture2D(source, st-st0p).rgb, vec3(0.2125,0.7154,0.0721));
-        float i0p1 =  dot( texture2D(source, st+st0p).rgb, vec3(0.2125,0.7154,0.0721));
-        float h = -1.*im1p1 - 2.*i0p1 - 1.*ip1p1  +  1.*im1m1 + 2.*i0m1 + 1.*ip1m1;
-        float v = -1.*im1m1 - 2.*im10 - 1.*im1p1  +  1.*ip1m1 + 2.*ip10 + 1.*ip1p1;
-        float mag = sqrt(h*h + v*v);
-        if (mag > magTol) {
-            color = vec4(0.0, 0.0, 0.0, 1.0);
-        }
-        else {
-            rgb.rgb *= quantize;
-            rgb.rgb += vec3(0.5, 0.5, 0.5);
-            ivec3 irgb = ivec3(rgb.rgb);
-            rgb.rgb = vec3(irgb) / quantize;
-            color = vec4(rgb, 1.0);
-        }
-    } else {
-        color = texture2D(source, uv);
-    }
-    gl_FragColor = qt_Opacity * color;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/vignette.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/vignette.fsh
deleted file mode 100755
index bd20c8e..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/vignette.fsh
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float dividerValue;
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec4 orig = texture2D(source, uv);
-    float cr = pow(0.1, 2.0);
-    float pt = pow(uv.x - 0.5, 2.0) + pow(uv.y - 0.5, 2.0);
-    float d = pt - cr;
-    float cf = 1.0;
-    if (d > 0.0)
-        cf = 1.0 - 2.0 * d;
-    vec3 col = cf * orig.rgb;
-    if (uv.x < dividerValue)
-        gl_FragColor = qt_Opacity * vec4(col, 1.0);
-    else
-        gl_FragColor = qt_Opacity * orig;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/warhol.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/warhol.fsh
deleted file mode 100755
index 6852495..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/warhol.fsh
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
-
-uniform float dividerValue;
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec4 orig = texture2D(source, uv);
-    vec3 col = orig.rgb;
-    float y = 0.3 *col.r + 0.59 * col.g + 0.11 * col.b;
-    y = y < 0.3 ? 0.0 : (y < 0.6 ? 0.5 : 1.0);
-    if (y == 0.5)
-        col = vec3(0.8, 0.0, 0.0);
-    else if (y == 1.0)
-        col = vec3(0.9, 0.9, 0.0);
-    else
-        col = vec3(0.0, 0.0, 0.0);
-    if (uv.x < dividerValue)
-        gl_FragColor = qt_Opacity * vec4(col, 1.0);
-    else
-        gl_FragColor = qt_Opacity * orig;
-}
diff --git a/basicsuite/qt5-everywhere/demos/shaders/shaders/wobble.fsh b/basicsuite/qt5-everywhere/demos/shaders/shaders/wobble.fsh
deleted file mode 100755
index 1670de3..0000000
--- a/basicsuite/qt5-everywhere/demos/shaders/shaders/wobble.fsh
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// Based on http://labs.qt.nokia.com/2011/03/22/the-convenient-power-of-qml-scene-graph/
-
-uniform float amplitude;
-uniform float dividerValue;
-uniform float frequency;
-uniform float time;
-
-uniform sampler2D source;
-uniform lowp float qt_Opacity;
-varying vec2 qt_TexCoord0;
-
-void main()
-{
-    vec2 uv = qt_TexCoord0.xy;
-    vec2 tc = qt_TexCoord0;
-    if (uv.x < dividerValue) {
-        vec2 p = sin(time + frequency * qt_TexCoord0);
-        tc += amplitude * vec2(p.y, -p.x);
-    }
-    gl_FragColor = qt_Opacity * texture2D(source, tc);
-}
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml
deleted file mode 100644
index e84d6b1..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/AndroidDelegate.qml
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-
-
-
-import QtQuick 2.1
-
-Item {
-    id: root
-    width: parent.width
-    height: app.height*.1
-
-    property alias text: textitem.text
-    signal clicked
-
-    Rectangle {
-        anchors.fill: parent
-        color: "#11ffffff"
-        visible: mouse.pressed
-    }
-
-    Text {
-        id: textitem
-        color: "white"
-        font.pixelSize: root.height*.6
-        text: modelData
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.left: parent.left
-        anchors.leftMargin: 30
-    }
-
-    Rectangle {
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.margins: 15
-        height: 1
-        color: "#424246"
-    }
-
-    Image {
-        anchors.right: parent.right
-        anchors.rightMargin: 20
-        anchors.verticalCenter: parent.verticalCenter
-        height: root.height*.8
-        width: height
-        source: "../images/navigation_next_item.png"
-    }
-
-    MouseArea {
-        id: mouse
-        anchors.fill: parent
-        onClicked: root.clicked()
-
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml
deleted file mode 100644
index 9133158..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/ButtonPage.qml
+++ /dev/null
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-
-
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-Item {
-    width: parent.width
-    height: parent.height
-    anchors {leftMargin: width*.1; rightMargin: width*.1}
-
-    property real progress: 0
-    SequentialAnimation on progress {
-        loops: Animation.Infinite
-        running: true
-        NumberAnimation {
-            from: 0
-            to: 1
-            duration: 3000
-        }
-        NumberAnimation {
-            from: 1
-            to: 0
-            duration: 3000
-        }
-    }
-
-    Column {
-        spacing: 40
-        anchors.centerIn: parent
-
-        Button {
-            anchors.margins: 20
-            text: "Press me"
-            style: touchStyle
-        }
-
-        Button {
-            anchors.margins: 20
-            style: touchStyle
-            text: "Press me too"
-        }
-
-        Button {
-            anchors.margins: 20
-            style: touchStyle
-            text: "Dont press me"
-            onClicked: if (pageStack) pageStack.pop()
-        }
-
-    }
-
-    Component {
-        id: touchStyle
-        ButtonStyle {
-            panel: Item {
-                implicitHeight: 50
-                implicitWidth: 300
-                BorderImage {
-                    anchors.fill: parent
-                    antialiasing: true
-                    border.bottom: 8
-                    border.top: 8
-                    border.left: 8
-                    border.right: 8
-                    anchors.margins: control.pressed ? -4 : 0
-                    source: control.pressed ? "../images/button_pressed.png" : "../images/button_default.png"
-                    Text {
-                        text: control.text
-                        anchors.centerIn: parent
-                        color: "white"
-                        font.pixelSize: 23
-                        renderType: Text.NativeRendering
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml
deleted file mode 100644
index afaa951..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/CustomAppWindow.qml
+++ /dev/null
@@ -1,181 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick.Window 2.1
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Layouts 1.0
-import QtQuick.Controls.Private 1.0
-
-/*!
-    \qmltype ApplicationWindow
-    \since QtQuick.Controls 1.0
-    \inqmlmodule QtQuick.Controls 1.0
-    \ingroup applicationwindow
-    \brief Provides a top-level application window.
-
-    ApplicationWindow is a \l Window that adds convenience for positioning items,
-    such as \l MenuBar, \l ToolBar, and \l StatusBar in a platform independent
-    manner.
-
-    \code
-    ApplicationWindow {
-        id: window
-        menuBar: MenuBar {
-            Menu { MenuItem {...} }
-            Menu { MenuItem {...} }
-        }
-
-        toolBar: ToolBar {
-            RowLayout {
-                anchors.fill: parent
-                ToolButton {...}
-            }
-        }
-
-        TabView {
-            id: myContent
-            anchors.fill: parent
-            ...
-        }
-    }
-    \endcode
-*/
-
-Rectangle {
-    id: root
-
-    /*!
-        \qmlproperty MenuBar ApplicationWindow::menuBar
-
-        This property holds the \l MenuBar.
-
-        By default, this value is not set.
-    */
-    property MenuBar menuBar: null
-
-    /*!
-        \qmlproperty Item ApplicationWindow::toolBar
-
-        This property holds the toolbar \l Item.
-
-        It can be set to any Item type, but is generally used with \l ToolBar.
-
-        By default, this value is not set. When you set the toolbar item, it will
-        be anchored automatically into the application window.
-    */
-    property Item toolBar
-
-    /*!
-        \qmlproperty Item ApplicationWindow::statusBar
-
-        This property holds the status bar \l Item.
-
-        It can be set to any Item type, but is generally used with \l StatusBar.
-
-        By default, this value is not set. When you set the status bar item, it
-        will be anchored automatically into the application window.
-    */
-    property Item statusBar
-
-    onToolBarChanged: { if (toolBar) { toolBar.parent = toolBarArea } }
-
-    onStatusBarChanged: { if (statusBar) { statusBar.parent = statusBarArea } }
-
-    /*! \internal */
-    default property alias data: contentArea.data
-
-    color: syspal.window
-
-    SystemPalette {id: syspal}
-
-    Item {
-        id: backgroundItem
-        anchors.fill: parent
-
-        Item {
-            id: toolBarArea
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: childrenRect.height
-        }
-
-        Item {
-            id: contentArea
-            anchors.top: toolBarArea.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.bottom: statusBarArea.top
-        }
-
-        Item {
-            id: statusBarArea
-            anchors.bottom: parent.bottom
-            anchors.left: parent.left
-            anchors.right: parent.right
-            height: childrenRect.height
-        }
-
-        onVisibleChanged: if (visible && menuBar) menuBar.__parentWindow = root
-
-        states: State {
-            name: "hasMenuBar"
-            when: menuBar && !menuBar.__isNative
-
-            ParentChange {
-                target: menuBar.__contentItem
-                parent: backgroundItem
-            }
-
-            PropertyChanges {
-                target: menuBar.__contentItem
-                x: 0
-                y: 0
-                width: backgroundItem.width
-            }
-
-            AnchorChanges {
-                target: toolBarArea
-                anchors.top: menuBar.__contentItem.bottom
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml
deleted file mode 100644
index 93adc7a..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/ProgressBarPage.qml
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-
-
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-Item {
-    width: parent.width
-    height: parent.height
-
-    property real progress: 0
-    SequentialAnimation on progress {
-        loops: Animation.Infinite
-        running: true
-        NumberAnimation {
-            from: 0
-            to: 1
-            duration: 3000
-        }
-        NumberAnimation {
-            from: 1
-            to: 0
-            duration: 3000
-        }
-    }
-
-    Column {
-        spacing: 40
-        anchors.centerIn: parent
-
-        ProgressBar {
-            anchors.margins: 20
-            style: touchStyle
-            width: 300
-            value: progress
-        }
-
-        ProgressBar {
-            anchors.margins: 20
-            style: touchStyle
-            width: 300
-            value: 1 - progress
-        }
-
-        ProgressBar {
-            anchors.margins: 20
-            style: touchStyle
-            value: 1
-            width: 300
-        }
-
-    }
-
-    Component {
-        id: touchStyle
-        ProgressBarStyle {
-            panel: Rectangle {
-                implicitHeight: 15
-                implicitWidth: 400
-                color: "#444"
-                opacity: 0.8
-                Rectangle {
-                    antialiasing: true
-                    radius: 1
-                    color: "#468bb7"
-                    height: parent.height
-                    width: parent.width * control.value / control.maximumValue
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml
deleted file mode 100644
index 4a34037..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/SliderPage.qml
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-Item {
-    id: root
-    width: parent.width
-    height: parent.height
-
-    Column {
-        spacing: 12
-        anchors.centerIn: parent
-
-        Slider {
-            anchors.margins: 20
-            width: 280
-            style: touchStyle
-            value: 0
-        }
-        Slider {
-            anchors.margins: 20
-            width: 280
-            style: touchStyle
-            value: 0.5
-        }
-        Slider {
-            anchors.margins: 20
-            width: 280
-            style: touchStyle
-            value: 1.0
-        }
-    }
-
-    Component {
-        id: touchStyle
-        SliderStyle {
-            handle: Rectangle {
-                width: 30
-                height: 30
-                radius: height
-                antialiasing: true
-                color: Qt.lighter("#468bb7", 1.2)
-            }
-
-            groove: Item {
-                implicitHeight: 50
-                implicitWidth: root.width
-                Rectangle {
-                    height: 8
-                    width: parent.width
-                    anchors.verticalCenter: parent.verticalCenter
-                    color: "#444"
-                    opacity: 0.8
-                    Rectangle {
-                        antialiasing: true
-                        radius: 1
-                        color: "#468bb7"
-                        height: parent.height
-                        width: parent.width * control.value / control.maximumValue
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml
deleted file mode 100644
index 7731c33..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/TabBarPage.qml
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-
-
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-Item {
-    width: parent.width
-    height: parent.height
-
-    TabView {
-        anchors.fill: parent
-        style: touchStyle
-        Tab {
-            title: "Buttons"
-            ButtonPage{ visible: true }
-        }
-        Tab {
-            title: "Sliders"
-            SliderPage{ visible: true }
-        }
-        Tab {
-            title: "Progress"
-            ProgressBarPage{ visible: true }
-        }
-    }
-
-    Component {
-        id: touchStyle
-        TabViewStyle {
-            tabsAlignment: Qt.AlignVCenter
-            tabOverlap: 0
-            frame: Item { }
-            tab: Item {
-                implicitWidth: control.width/control.count
-                implicitHeight: 50
-                BorderImage {
-                    anchors.fill: parent
-                    border.bottom: 8
-                    border.top: 8
-                    source: tab.selected ? "../images/tab_selected.png":"../images/tabs_standard.png"
-                    Text {
-                        anchors.centerIn: parent
-                        color: "white"
-                        text: styleData.title
-                        font.pixelSize: 16
-                    }
-                    Rectangle {
-                        visible: index > 0
-                        anchors.top: parent.top
-                        anchors.bottom: parent.bottom
-                        anchors.margins: 10
-                        width:1
-                        color: "#3a3a3a"
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml b/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml
deleted file mode 100644
index 0ed71f7..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/content/TextInputPage.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-
-
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
-
-Item {
-    width: parent.width
-    height: parent.height
-
-    property real progress: 0
-    SequentialAnimation on progress {
-        loops: Animation.Infinite
-        running: true
-        NumberAnimation {
-            from: 0
-            to: 1
-            duration: 3000
-        }
-        NumberAnimation {
-            from: 1
-            to: 0
-            duration: 3000
-        }
-    }
-
-    Column {
-        spacing: 40
-        anchors.centerIn: parent
-
-        TextField {
-            anchors.margins: 20
-            text: "Text input"
-            style: touchStyle
-        }
-
-        TextField {
-            anchors.margins: 20
-            text: "Readonly Text input"
-            style: touchStyle
-            readOnly: true
-        }
-    }
-    Component {
-        id: touchStyle
-
-        TextFieldStyle {
-            textColor: "white"
-            font.pixelSize: 28
-            background: Item {
-                implicitHeight: 50
-                implicitWidth: 300
-                BorderImage {
-                    source: "../images/textinput.png"
-                    border.left: 8
-                    border.right: 8
-                    anchors.bottom: parent.bottom
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/NOTICE.txt b/basicsuite/qt5-everywhere/demos/touchgallery/images/NOTICE.txt
deleted file mode 100644
index 93a9afc..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/NOTICE.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Notice some of these images are derived from Google applications resources. They were provided under the following license:
-You may use the materials in this directory without restriction to develop your apps and to use in your apps.
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/button_default.png b/basicsuite/qt5-everywhere/demos/touchgallery/images/button_default.png
deleted file mode 100644
index 6d6cfd9..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/button_default.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/button_pressed.png b/basicsuite/qt5-everywhere/demos/touchgallery/images/button_pressed.png
deleted file mode 100644
index ab78b6e..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/button_pressed.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/navigation_next_item.png b/basicsuite/qt5-everywhere/demos/touchgallery/images/navigation_next_item.png
deleted file mode 100644
index 6665c9d..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/navigation_next_item.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/navigation_previous_item.png b/basicsuite/qt5-everywhere/demos/touchgallery/images/navigation_previous_item.png
deleted file mode 100644
index f8be011..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/navigation_previous_item.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/tab_selected.png b/basicsuite/qt5-everywhere/demos/touchgallery/images/tab_selected.png
deleted file mode 100644
index 2345f7a..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/tab_selected.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/tabs_standard.png b/basicsuite/qt5-everywhere/demos/touchgallery/images/tabs_standard.png
deleted file mode 100644
index 7140ab7..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/tabs_standard.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/textinput.png b/basicsuite/qt5-everywhere/demos/touchgallery/images/textinput.png
deleted file mode 100644
index b0256db..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/textinput.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/images/toolbar.png b/basicsuite/qt5-everywhere/demos/touchgallery/images/toolbar.png
deleted file mode 100644
index e9eba4c..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/images/toolbar.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/touchgallery/main.qml b/basicsuite/qt5-everywhere/demos/touchgallery/main.qml
deleted file mode 100644
index 94089cf..0000000
--- a/basicsuite/qt5-everywhere/demos/touchgallery/main.qml
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import "content"
-
-CustomAppWindow {
-    id: app
-    anchors.fill: parent
-    color: "black"
-
-    toolBar: BorderImage {
-        border.bottom: 8
-        source: "images/toolbar.png"
-        width: parent.width
-        height: app.height*.1
-
-        Rectangle {
-            id: backButton
-            width: opacity ? height : 0
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            opacity: pageStack.depth > 1 ? 1 : 0
-            anchors.verticalCenter: parent.verticalCenter
-            antialiasing: true
-            height: parent.height* .8
-            radius: 4
-            color: backmouse.pressed ? "#222" : "transparent"
-            Behavior on opacity { NumberAnimation{} }
-            Image {
-                anchors.verticalCenter: parent.verticalCenter
-                source: "images/navigation_previous_item.png"
-                height: parent.height*.8
-                width: height
-            }
-            MouseArea {
-                id: backmouse
-                anchors.fill: parent
-                anchors.margins: -10
-                onClicked: pageStack.pop()
-            }
-        }
-
-        Text {
-            font.pixelSize: app.height*.06
-            Behavior on x { NumberAnimation{ easing.type: Easing.OutCubic} }
-            x: backButton.x + backButton.width + 10
-            anchors.verticalCenter: parent.verticalCenter
-            color: "white"
-            text: "Widget Gallery"
-        }
-}
-
-    ListModel {
-        id: pageModel
-        ListElement {
-            title: "Buttons"
-            page: "content/ButtonPage.qml"
-        }
-        ListElement {
-            title: "Sliders"
-            page: "content/SliderPage.qml"
-        }
-        ListElement {
-            title: "ProgressBar"
-            page: "content/ProgressBarPage.qml"
-        }
-        ListElement {
-            title: "Tabs"
-            page: "content/TabBarPage.qml"
-        }
-        ListElement {
-            title: "TextInput"
-            page: "content/TextInputPage.qml"
-        }
-    }
-
-    StackView {
-        id: pageStack
-        anchors.fill: parent
-
-        initialItem: Item {
-            width: parent.width
-            height: parent.height
-            ListView {
-                model: pageModel
-                anchors.fill: parent
-                clip: true
-                delegate: AndroidDelegate {
-                    text: title
-                    onClicked: pageStack.push(Qt.resolvedUrl(page))
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/Content.qml b/basicsuite/qt5-everywhere/demos/video/Content.qml
deleted file mode 100644
index de25f13..0000000
--- a/basicsuite/qt5-everywhere/demos/video/Content.qml
+++ /dev/null
@@ -1,67 +0,0 @@
- /****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-Rectangle {
-    id: root
-    property alias videoPlayer: videoContent
-
-    color: "black"
-
-    ContentVideo {
-        id: videoContent
-        anchors.fill: root
-        visible: mediaSource == "" ? false : true
-    }
-
-    function openVideo(path) {
-        stop();
-        videoContent.mediaSource = path
-    }
-
-    function stop() {
-        if (videoContent.mediaSource !== undefined) {
-            videoContent.stop();
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/ContentVideo.qml b/basicsuite/qt5-everywhere/demos/video/ContentVideo.qml
deleted file mode 100644
index 83c9ab7..0000000
--- a/basicsuite/qt5-everywhere/demos/video/ContentVideo.qml
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-VideoOutput {
-    id: videoOutput
-    source: mediaPlayer
-    fillMode: VideoOutput.PreserveAspectFit
-    property alias mediaSource: mediaPlayer.source
-    property alias mediaPlayer: mediaPlayer
-    property bool isPlaying: false
-
-    MediaPlayer {
-        id: mediaPlayer
-        autoLoad: true
-        autoPlay: true
-
-        onPlaybackStateChanged: {
-            if (playbackState === MediaPlayer.PlayingState)
-                videoOutput.isPlaying = true;
-            else
-                videoOutput.isPlaying = false;
-        }
-
-        Component.onDestruction: {
-            mediaPlayer.stop()
-        }
-    }
-    function play() { mediaPlayer.play() }
-    function stop() { mediaPlayer.stop() }
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/ControlBar.qml b/basicsuite/qt5-everywhere/demos/video/ControlBar.qml
deleted file mode 100644
index f013dcf..0000000
--- a/basicsuite/qt5-everywhere/demos/video/ControlBar.qml
+++ /dev/null
@@ -1,290 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-Item {
-    id: controlBar
-    anchors.fill: parent
-
-    property MediaPlayer mediaPlayer: null
-    property bool isMouseAbove: false
-    property int margin: applicationWindow.width * 0.01
-
-    signal openURL()
-
-    state: "VISIBLE"
-
-    onMediaPlayerChanged: {
-        if (mediaPlayer === null)
-            return;
-        volumeControl.volume = mediaPlayer.volume;
-    }
-
-    function updateStatusText()
-    {
-        var strText = ""
-        switch (mediaPlayer.status) {
-            case MediaPlayer.NoMedia: strText = "No Media"; break;
-            case MediaPlayer.Loading: strText = "Loading..."; break;
-            case MediaPlayer.Buffering: strText = "Buffering..."; break;
-            case MediaPlayer.Stalled: strText = "Stalled"; break;
-            case MediaPlayer.EndOfMedia: strText = "EndOfMedia"; break;
-            case MediaPlayer.InvalidMedia: strText = "InvalidMedia"; break;
-            case MediaPlayer.UnknownStatus: strText = "UnknownStatus"; break;
-            default: strText = ""; break;
-        }
-
-        statusText.text = strText;
-    }
-
-    Rectangle {
-        anchors.right: parent.right
-        anchors.top: parent.top
-        width: applicationWindow.height * 0.12
-        height: width
-        color: "#88333333"
-
-        Image {
-            id: closeImage
-            source: "images/CloseButton.png"
-            anchors.centerIn: parent
-            width: 0.5*parent.height
-            height: width
-            opacity: closeMouseArea.pressed ? 0.6 : 1
-            smooth: true
-        }
-
-        MouseArea {
-            id: closeMouseArea
-            anchors.fill: parent
-            onClicked: {
-                if (mediaPlayer !== null) {
-                    mediaPlayer.stop();
-                    mediaPlayer.source = "";
-                }
-
-                videoSelector.show();
-            }
-        }
-    }
-
-    Rectangle {
-        id: bottomBar
-        height: parent.height * 0.2
-        color: "#88333333"
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-
-        property double playBackHeight: height*0.48
-        property double seekHeight: height*0.48
-
-        VolumeControl {
-            id: volumeControl
-            anchors.verticalCenter: playbackControl.verticalCenter
-            anchors.left: bottomBar.left
-            anchors.leftMargin: bottomBar.margin
-            height: bottomBar.playBackHeight
-            width: parent.width * 0.3
-            onVolumeChanged: {
-                if (mediaPlayer !== null)
-                    mediaPlayer.volume = volume
-            }
-
-            Connections {
-                target: mediaPlayer
-                onVolumeChanged: volumeControl.volume = mediaPlayer.volume
-            }
-        }
-
-        //Playback Controls
-        PlaybackControl {
-            id: playbackControl
-            anchors.horizontalCenter: bottomBar.horizontalCenter
-            anchors.top: bottomBar.top
-            anchors.topMargin: bottomBar.margin
-            height: bottomBar.playBackHeight
-
-            onPlayButtonPressed: {
-                if (mediaPlayer === null)
-                    return;
-
-                if (isPlaying) {
-                    mediaPlayer.pause();
-                } else {
-                    mediaPlayer.play();
-                }
-            }
-        }
-
-        Text {
-            id: statusText
-            anchors.right: parent.right
-            anchors.verticalCenter: playbackControl.verticalCenter
-            anchors.rightMargin: bottomBar.margin
-            verticalAlignment: Text.AlignVCenter
-            height: bottomBar.playBackHeight
-            font.pixelSize: playbackControl.height * 0.5
-            color: "white"
-        }
-
-        //Seek controls
-        SeekControl {
-            id: seekControl
-            anchors.bottom: bottomBar.bottom
-            anchors.right: bottomBar.right
-            anchors.left: bottomBar.left
-            height: bottomBar.seekHeight
-            anchors.leftMargin: bottomBar.margin
-            anchors.rightMargin: bottomBar.margin
-
-            enabled: playbackControl.isPlaybackEnabled
-            duration: mediaPlayer !== null ? mediaPlayer.duration : 0
-
-            onSeekValueChanged: {
-                if (mediaPlayer !== null) {
-                    mediaPlayer.seek(newPosition);
-                    position = mediaPlayer.position;
-                }
-            }
-
-            Component.onCompleted: {
-                if (mediaPlayer !== null)
-                    seekable = mediaPlayer.seekable;
-            }
-        }
-
-        Connections {
-            target: mediaPlayer
-            onPositionChanged: {
-                if (!seekControl.pressed) seekControl.position = mediaPlayer.position;
-            }
-            onStatusChanged: {
-                if ((mediaPlayer.status == MediaPlayer.Loaded) || (mediaPlayer.status == MediaPlayer.Buffered) || mediaPlayer.status === MediaPlayer.Buffering || mediaPlayer.status === MediaPlayer.EndOfMedia)
-                    playbackControl.isPlaybackEnabled = true;
-                else
-                    playbackControl.isPlaybackEnabled = false;
-                updateStatusText();
-            }
-            onErrorChanged: {
-                updateStatusText();
-            }
-
-            onPlaybackStateChanged: {
-                if (mediaPlayer.playbackState === MediaPlayer.PlayingState) {
-                    playbackControl.isPlaying = true;
-                    applicationWindow.resetTimer();
-                } else {
-                    show();
-                    playbackControl.isPlaying = false;
-                }
-            }
-
-            onSeekableChanged: {
-                seekControl.seekable = mediaPlayer.seekable;
-            }
-        }
-    }
-
-    //Usage: give the value you wish to modify position,
-    //returns a value between 0 and duration
-    function normalizeSeek(value) {
-        var newPosition = mediaPlayer.position + value;
-        if (newPosition < 0)
-            newPosition = 0;
-        else if (newPosition > mediaPlayer.duration)
-            newPosition = mediaPlayer.duration;
-        return newPosition;
-    }
-
-    function hide() {
-        controlBar.state = "HIDDEN";
-    }
-
-    function show() {
-        controlBar.state = "VISIBLE";
-    }
-
-    states: [
-        State {
-            name: "HIDDEN"
-            PropertyChanges {
-                target: controlBar
-                opacity: 0.0
-            }
-        },
-        State {
-            name: "VISIBLE"
-            PropertyChanges {
-                target: controlBar
-                opacity: 0.95
-            }
-        }
-    ]
-
-    transitions: [
-        Transition {
-            from: "HIDDEN"
-            to: "VISIBLE"
-            NumberAnimation {
-                id: showAnimation
-                target: controlBar
-                properties: "opacity"
-                from: 0.0
-                to: 1.0
-                duration: 200
-            }
-        },
-        Transition {
-            from: "VISIBLE"
-            to: "HIDDEN"
-            NumberAnimation {
-                id: hideAnimation
-                target: controlBar
-                properties: "opacity"
-                from: 0.95
-                to: 0.0
-                duration: 200
-            }
-        }
-    ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/ImageButton.qml b/basicsuite/qt5-everywhere/demos/video/ImageButton.qml
deleted file mode 100644
index 428f6de..0000000
--- a/basicsuite/qt5-everywhere/demos/video/ImageButton.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: root
-
-    height: parent.height * 0.8
-    width: image.width * image.scale
-
-    property alias enabled: mouseArea.enabled
-    property alias imageSource: image.source
-
-    property bool checkable: false
-    property bool checked: false
-    property alias hover: mouseArea.containsMouse
-    property alias pressed: mouseArea.pressed
-    property double imageSize: 0.9*root.height
-
-    opacity: enabled ? 1.0 : 0.3
-    signal clicked
-
-    Image {
-        id: image
-        anchors.centerIn: parent
-        scale: root.height / height
-        visible: true
-        opacity: pressed ? 0.6 : 1
-        smooth: true
-    }
-
-    MouseArea {
-        id: mouseArea
-        hoverEnabled: true
-        anchors.fill: root
-        onPositionChanged: applicationWindow.resetTimer()
-        onClicked: root.clicked();
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml b/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml
deleted file mode 100644
index 2d7307e..0000000
--- a/basicsuite/qt5-everywhere/demos/video/PlaybackControl.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Row {
-    id: root
-    spacing: controlBar.margin
-
-    property bool isPlaybackEnabled: false
-    property bool isPlaying: false
-
-    signal playButtonPressed()
-
-    ImageButton {
-        id: playButton
-        enabled: isPlaybackEnabled
-        imageSource: !isPlaying ? "images/PlayButton.png" : "images/PauseButton.png"
-        anchors.verticalCenter: root.verticalCenter
-        onClicked: {
-            playButtonPressed();
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml b/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml
deleted file mode 100644
index 8ac0d31..0000000
--- a/basicsuite/qt5-everywhere/demos/video/ScrollBar.qml
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: scrollBar
-
-    // The properties that define the scrollbar's state.
-    // position and pageSize are in the range 0.0 - 1.0.  They are relative to the
-    // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
-    // of the height of the view.
-    property real position
-    property real pageSize
-
-    // A light, semi-transparent background
-    Rectangle {
-        id: background
-        anchors.fill: parent
-        radius: width/2 - 1
-        color: "transparent"
-    }
-
-    Rectangle {
-        x: scrollBar.position * (scrollBar.width-2) + 1
-        y: 1
-        width: scrollBar.pageSize * (scrollBar.width-2)
-        height: parent.height
-        radius: height/2 - 1
-        color: "#22aa22"
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/SeekControl.qml b/basicsuite/qt5-everywhere/demos/video/SeekControl.qml
deleted file mode 100644
index 2e037e3..0000000
--- a/basicsuite/qt5-everywhere/demos/video/SeekControl.qml
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: root
-
-    property int position: 0
-    property int duration: 0
-    property bool seekable: false
-    property alias pressed : seekSlider.pressed
-    property bool enabled
-
-    signal seekValueChanged(int newPosition)
-
-    onPositionChanged: {
-        elapsedText.text = formatTime(position);
-        seekSlider.value = position;
-    }
-
-    onDurationChanged: {
-        remainingText.text = formatTime(duration);
-    }
-
-    Text {
-        id: elapsedText
-        anchors.verticalCenter: seekSlider.verticalCenter
-        anchors.left: root.left
-        verticalAlignment: Text.AlignVCenter
-        height: parent.height
-        text: "00:00"
-        font.pixelSize: height * 0.4
-        color: "#cccccc"
-    }
-
-    Slider {
-        id: seekSlider
-        anchors.left: elapsedText.right
-        anchors.right: remainingText.left
-        anchors.verticalCenter: root.verticalCenter
-        mutable: root.seekable
-        enabled: root.enabled
-        height: parent.height
-
-        minimum: 0.0
-        maximum: root.duration !== 0 ? root.duration : 1
-
-        onValueChangedByHandle: {
-            seekValueChanged(newValue);
-            applicationWindow.resetTimer()
-        }
-    }
-
-    Text {
-        id: remainingText
-        anchors.verticalCenter: seekSlider.verticalCenter
-        anchors.right: root.right
-        verticalAlignment: Text.AlignVCenter
-        height: parent.height
-        text: "00:00"
-        font.pixelSize: height * 0.4
-        color: "#cccccc"
-    }
-
-    function formatTime(time) {
-        time = time / 1000
-        var hours = Math.floor(time / 3600);
-        time = time - hours * 3600;
-        var minutes = Math.floor(time / 60);
-        var seconds = Math.floor(time - minutes * 60);
-
-        if (hours > 0)
-            return formatTimeBlock(hours) + ":" + formatTimeBlock(minutes) + ":" + formatTimeBlock(seconds);
-        else
-            return formatTimeBlock(minutes) + ":" + formatTimeBlock(seconds);
-
-    }
-
-    function formatTimeBlock(time) {
-        if (time === 0)
-            return "00"
-        if (time < 10)
-            return "0" + time;
-        else
-            return time.toString();
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/Slider.qml b/basicsuite/qt5-everywhere/demos/video/Slider.qml
deleted file mode 100644
index cc45537..0000000
--- a/basicsuite/qt5-everywhere/demos/video/Slider.qml
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: slider
-
-    anchors.leftMargin: handleBack.radius
-    anchors.rightMargin: handleBack.radius
-
-    // value is read/write.
-    property real value: 0
-    property real maximum: 1
-    property real minimum: 0
-    property int xMax: width - handle.width
-    onXMaxChanged: updatePos()
-    onMinimumChanged: updatePos()
-    onValueChanged: if (!pressed) updatePos()
-    property bool mutable: true
-    property alias pressed : backgroundMouse.pressed
-
-    signal valueChangedByHandle(int newValue)
-
-    function updatePos() {
-        if (maximum > minimum) {
-            var pos = 0 + (value - minimum) * slider.xMax / (maximum - minimum);
-            pos = Math.min(pos, width - handle.width - 0);
-            pos = Math.max(pos, 0);
-            handle.x = pos;
-        } else {
-            handle.x = 0;
-        }
-    }
-
-    Rectangle {
-        id: background
-        width: slider.width
-        anchors.verticalCenter: slider.verticalCenter
-        height: 2
-        color: "#666666"
-
-        MouseArea {
-            id: backgroundMouse
-            anchors.fill: parent
-            anchors.topMargin: -24
-            anchors.bottomMargin: -24
-            enabled: slider.mutable
-            drag.target: handle
-            drag.axis: Drag.XAxis
-            drag.minimumX: 0
-            drag.maximumX: slider.xMax
-            onPressedChanged: {
-                value = Math.max(minimum, Math.min(maximum, (maximum - minimum) * (mouseX - handle.width/2) / slider.xMax + minimum));
-                valueChangedByHandle(value);
-                updatePos();
-            }
-            onPositionChanged: {
-                value = Math.max(minimum, Math.min(maximum, (maximum - minimum) * (mouseX - handle.width/2) / slider.xMax + minimum));
-                valueChangedByHandle(value);
-            }
-            onWheel: {
-                value = Math.max(minimum, Math.min(maximum, value + (wheel.angleDelta.y > 0 ? 1 : -1) * (10 / slider.xMax) * (slider.maximum - slider.minimum)));
-                valueChangedByHandle(value);
-                updatePos();
-            }
-        }
-    }
-
-    Rectangle {
-        id: progress
-        height: 5
-        anchors.verticalCenter: background.verticalCenter
-        anchors.left: background.left
-        anchors.right: handle.right
-        anchors.rightMargin: handle.width / 2
-        visible: slider.enabled
-        color: "#98c66c"
-    }
-
-    Rectangle {
-        id: handleBack
-        width: Math.max(10, Math.min(50, slider.height))
-        height: width
-        radius: width / 2
-        color: "#8898c66c"
-        antialiasing: true
-        anchors.centerIn: handle
-        visible: handle.visible
-    }
-
-    Rectangle {
-        id: handle
-        width: Math.max(3,handleBack.height / 3)
-        height: width
-        radius: width / 2
-        antialiasing: true
-        color: "#98c66c"
-        anchors.verticalCenter: background.verticalCenter
-        visible: slider.enabled
-    }
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml b/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml
deleted file mode 100644
index 9cdbb50..0000000
--- a/basicsuite/qt5-everywhere/demos/video/VideoDelegate.qml
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: delegate
-    height: grid.cellHeight
-    width: grid.cellWidth
-    property int tileMargin: videoSelector.tileMargin
-
-    signal videoSelected(string link)
-
-    Rectangle {
-        anchors.left: parent.left
-        anchors.top: parent.top
-        anchors.topMargin: parent.tileMargin/2
-        width: parent.width - tileMargin
-        height: parent.height - tileMargin
-        color: videoSelector.tileBackground
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                grid.currentIndex = index
-                delegate.videoSelected(link)
-            }
-        }
-
-        states: [
-            State {
-                name: "selected"
-                when: delegate.GridView.isCurrentItem
-            }
-        ]
-
-
-        Image {
-            id: iconImage
-            source: thumbnail
-            width: parent.width
-            height: parent.height
-        }
-
-        Rectangle{
-            width: parent.width
-            height: titleText.height + tileMargin
-            anchors.top: titleText.top
-            anchors.bottom: parent.bottom
-            color: "Black"
-            opacity: 0.5
-        }
-
-        Text {
-            id: titleText
-            anchors.left: parent.left
-            anchors.leftMargin: tileMargin/3
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: tileMargin/3
-            anchors.right: parent.right
-            anchors.rightMargin: tileMargin/3
-
-            color: videoSelector.textColor
-            text: title
-            width: parent.width;
-            wrapMode: Text.WordWrap;
-            smooth: true
-            font { family: videoSelector.uiFont; pixelSize: videoSelector.tileFontSize }
-        }
-    }
-}
-
diff --git a/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml b/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml
deleted file mode 100644
index 8ce8d83..0000000
--- a/basicsuite/qt5-everywhere/demos/video/VideoSelector.qml
+++ /dev/null
@@ -1,181 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.XmlListModel 2.0
-
-Item {
-    id: videoSelector
-
-    property int tileHeight: parseInt(grid.height / 2)
-    property int tileMargin: tileHeight * 0.1
-    property int tileFontSize: tileHeight * 0.08
-    property string tileBackground: "#262626"
-    property string textColor: "white"
-    property string uiFont: "Segoe UI"
-
-    signal selectVideo(string link)
-
-    state: "VISIBLE"
-
-    onOpacityChanged: {
-        if (state === "HIDDEN" && opacity <= 0.05)
-            visible = false;
-    }
-
-    XmlListModel {
-        id: videoModel
-        source: "http://qt-project.org/uploads/videos/qt5_videos.xml"
-        query: "/videolist/item"
-        XmlRole  { name: "thumbnail"; query: "thumbnail/string()" }
-        XmlRole { name: "title"; query: "title/string()" }
-        XmlRole { name: "link"; query: "link/string()" }
-
-        onStatusChanged: {
-            if (status == XmlListModel.Ready) {
-                networkErrorBox.opacity = 0.0
-            } else if (status == XmlListModel.Error) {
-                networkErrorBox.opacity = 1.0
-            }
-        }
-    }
-
-    Item {
-        id: networkErrorBox
-        opacity: 0
-        anchors.fill: parent
-
-        Text {
-            anchors.centerIn: parent
-            text: qsTr("Sorry! No network connection")
-            font.family: uiFont;
-            font.pixelSize: tileFontSize * 2;
-            color: textColor
-            smooth: true
-        }
-    }
-
-    // Grid view
-    GridView {
-        id: grid
-        anchors.fill: parent
-        flow: GridView.TopToBottom
-        cellHeight: tileHeight
-        cellWidth: parseInt(tileHeight * 1.5)
-        cacheBuffer: cellWidth
-        clip: false
-        focus: true
-        model: videoModel
-        delegate: VideoDelegate { onVideoSelected: videoSelector.selectVideo(link); }
-
-        // Only show the scrollbars when the view is moving.
-        states: State {
-            when: grid.movingHorizontally
-            PropertyChanges { target: horizontalScrollBar; opacity: 1 }
-        }
-
-        transitions: Transition {
-            NumberAnimation { properties: "opacity"; duration: 400 }
-        }
-    }
-
-    ScrollBar {
-        id: horizontalScrollBar
-        width: parent.width; height: 6
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        opacity: 0
-        position: grid.visibleArea.xPosition
-        pageSize: grid.visibleArea.widthRatio
-    }
-
-    function hide() {
-        videoSelector.state = "HIDDEN";
-    }
-
-    function show() {
-        videoSelector.visible = true;
-        videoSelector.state = "VISIBLE";
-    }
-
-    states: [
-        State {
-            name: "HIDDEN"
-            PropertyChanges {
-                target: videoSelector
-                opacity: 0.0
-            }
-        },
-        State {
-            name: "VISIBLE"
-            PropertyChanges {
-                target: videoSelector
-                opacity: 0.95
-            }
-        }
-    ]
-
-    transitions: [
-        Transition {
-            from: "HIDDEN"
-            to: "VISIBLE"
-            NumberAnimation {
-                id: showAnimation
-                target: videoSelector
-                properties: "opacity"
-                from: 0.0
-                to: 1.0
-                duration: 200
-            }
-        },
-        Transition {
-            from: "VISIBLE"
-            to: "HIDDEN"
-            NumberAnimation {
-                id: hideAnimation
-                target: videoSelector
-                properties: "opacity"
-                from: 0.95
-                to: 0.0
-                duration: 200
-            }
-        }
-    ]
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml b/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml
deleted file mode 100644
index 4754951..0000000
--- a/basicsuite/qt5-everywhere/demos/video/VolumeControl.qml
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: root
-    property alias volume: volumeSlider.value
-
-    //Volume Controls
-    ImageButton {
-        id: volumeDown
-        height: parent.height * 0.5
-        imageSource: "images/VolumeDown.png"
-        anchors.verticalCenter: root.verticalCenter
-        anchors.left: root.left
-        onClicked: {
-            root.volume = 0.0;
-        }
-    }
-    Slider {
-        id: volumeSlider
-        anchors.left: volumeDown.right
-        anchors.right: volumeUp.left
-        height: root.height
-        maximum: 1.0
-        minimum: 0.0
-        anchors.verticalCenter: root.verticalCenter
-        anchors.verticalCenterOffset: 1
-    }
-
-    ImageButton {
-        id: volumeUp
-        height: parent.height * 0.5
-        imageSource: "images/VolumeUp.png"
-        anchors.verticalCenter: root.verticalCenter
-        anchors.verticalCenterOffset: 1
-        anchors.right: root.right
-        onClicked: {
-            root.volume = 1.0
-        }
-    }
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/images/CloseButton.png b/basicsuite/qt5-everywhere/demos/video/images/CloseButton.png
deleted file mode 100644
index 24407fe..0000000
--- a/basicsuite/qt5-everywhere/demos/video/images/CloseButton.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/images/PauseButton.png b/basicsuite/qt5-everywhere/demos/video/images/PauseButton.png
deleted file mode 100644
index b58ceb4..0000000
--- a/basicsuite/qt5-everywhere/demos/video/images/PauseButton.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/images/PlayButton.png b/basicsuite/qt5-everywhere/demos/video/images/PlayButton.png
deleted file mode 100644
index 247fe32..0000000
--- a/basicsuite/qt5-everywhere/demos/video/images/PlayButton.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/images/RateButtonForward.png b/basicsuite/qt5-everywhere/demos/video/images/RateButtonForward.png
deleted file mode 100644
index ebfca0d..0000000
--- a/basicsuite/qt5-everywhere/demos/video/images/RateButtonForward.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/images/RateButtonReverse.png b/basicsuite/qt5-everywhere/demos/video/images/RateButtonReverse.png
deleted file mode 100644
index 1837bfd..0000000
--- a/basicsuite/qt5-everywhere/demos/video/images/RateButtonReverse.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/images/StopButton.png b/basicsuite/qt5-everywhere/demos/video/images/StopButton.png
deleted file mode 100644
index 76bcbc8..0000000
--- a/basicsuite/qt5-everywhere/demos/video/images/StopButton.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/images/VolumeDown.png b/basicsuite/qt5-everywhere/demos/video/images/VolumeDown.png
deleted file mode 100644
index 38b1013..0000000
--- a/basicsuite/qt5-everywhere/demos/video/images/VolumeDown.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/images/VolumeUp.png b/basicsuite/qt5-everywhere/demos/video/images/VolumeUp.png
deleted file mode 100644
index cffe961..0000000
--- a/basicsuite/qt5-everywhere/demos/video/images/VolumeUp.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/main.qml b/basicsuite/qt5-everywhere/demos/video/main.qml
deleted file mode 100644
index 5987843..0000000
--- a/basicsuite/qt5-everywhere/demos/video/main.qml
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-Rectangle {
-    id: applicationWindow
-    focus: true
-    color: "black"
-    anchors.fill:parent
-
-    MouseArea {
-        id: mouseActivityMonitor
-        anchors.fill: parent
-
-        hoverEnabled: true
-        onClicked: {
-            if (controlBar.state === "VISIBLE") {
-                controlBar.hide();
-            } else {
-                controlBar.show();
-                controlBarTimer.restart();
-            }
-        }
-    }
-
-    signal resetTimer
-    onResetTimer: {
-        controlBar.show();
-        controlBarTimer.restart();
-    }
-
-    Content {
-        id: content
-        anchors.fill: parent
-    }
-
-    VideoSelector {
-        id: videoSelector
-        anchors.fill: parent
-        anchors.margins: applicationWindow.width * 0.02
-        visible: true
-        onSelectVideo: {
-            videoSelector.hide()
-            content.openVideo(link)
-            content.videoPlayer.play()
-        }
-        onVisibleChanged: {
-            if (visible)
-                controlBar.hide()
-            else
-                controlBar.show()
-        }
-    }
-
-    Timer {
-        id: controlBarTimer
-        interval: 4000
-        running: false
-
-        onTriggered: hideToolBars();
-    }
-
-    ControlBar {
-        id: controlBar
-        anchors.left: parent.left
-        anchors.right: parent.right
-        anchors.bottom: applicationWindow.bottom
-        mediaPlayer: content.videoPlayer.mediaPlayer
-    }
-
-    Component.onCompleted: {
-        controlBar.hide()
-    }
-
-    property real volumeBeforeMuted: 1.0
-
-    Keys.onPressed: {
-        applicationWindow.resetTimer();
-        if (event.key === Qt.Key_Up || event.key === Qt.Key_VolumeUp) {
-            content.videoPlayer.mediaPlayer.volume = Math.min(1, content.videoPlayer.mediaPlayer.volume + 0.1);
-            return;
-        } else if (event.key === Qt.Key_Down || event.key === Qt.Key_VolumeDown) {
-            if (event.modifiers & Qt.ControlModifier) {
-                if (content.videoPlayer.mediaPlayer.volume) {
-                    volumeBeforeMuted = content.videoPlayer.mediaPlayer.volume;
-                    content.videoPlayer.mediaPlayer.volume = 0
-                } else {
-                    content.videoPlayer.mediaPlayer.volume = volumeBeforeMuted;
-                }
-            } else {
-                content.videoPlayer.mediaPlayer.volume = Math.max(0, content.videoPlayer.mediaPlayer.volume - 0.1);
-            }
-            return;
-        }
-
-        // What's next should be handled only if there's a loaded media
-        if (content.videoPlayer.mediaPlayer.status !== MediaPlayer.Loaded
-                && content.videoPlayer.mediaPlayer.status !== MediaPlayer.Buffered)
-            return;
-
-        if (event.key === Qt.Key_Space) {
-            if (content.videoPlayer.mediaPlayer.playbackState === MediaPlayer.PlayingState)
-                content.videoPlayer.mediaPlayer.pause()
-            else if (content.videoPlayer.mediaPlayer.playbackState === MediaPlayer.PausedState
-                     || content.videoPlayer.mediaPlayer.playbackState === MediaPlayer.StoppedState)
-                content.videoPlayer.mediaPlayer.play()
-        } else if (event.key === Qt.Key_Left) {
-            content.videoPlayer.mediaPlayer.seek(Math.max(0, content.videoPlayer.mediaPlayer.position - 30000));
-            return;
-        } else if (event.key === Qt.Key_Right) {
-            content.videoPlayer.mediaPlayer.seek(Math.min(content.videoPlayer.mediaPlayer.duration, content.videoPlayer.mediaPlayer.position + 30000));
-            return;
-        }
-    }
-
-    function hideToolBars() {
-        if (!controlBar.isMouseAbove && content.videoPlayer.isPlaying)
-            controlBar.hide();
-    }
-
-}
diff --git a/basicsuite/qt5-everywhere/demos/video/qt5_video_jens.png b/basicsuite/qt5-everywhere/demos/video/qt5_video_jens.png
deleted file mode 100644
index 84f3bce..0000000
--- a/basicsuite/qt5-everywhere/demos/video/qt5_video_jens.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/qt5_video_kenneth.png b/basicsuite/qt5-everywhere/demos/video/qt5_video_kenneth.png
deleted file mode 100644
index eecb297..0000000
--- a/basicsuite/qt5-everywhere/demos/video/qt5_video_kenneth.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/qt5_video_lars.png b/basicsuite/qt5-everywhere/demos/video/qt5_video_lars.png
deleted file mode 100644
index 51e0701..0000000
--- a/basicsuite/qt5-everywhere/demos/video/qt5_video_lars.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/qt5_video_samuel.png b/basicsuite/qt5-everywhere/demos/video/qt5_video_samuel.png
deleted file mode 100644
index 1ed97c1..0000000
--- a/basicsuite/qt5-everywhere/demos/video/qt5_video_samuel.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/qt5_video_simon.png b/basicsuite/qt5-everywhere/demos/video/qt5_video_simon.png
deleted file mode 100644
index 583c564..0000000
--- a/basicsuite/qt5-everywhere/demos/video/qt5_video_simon.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/qt5_video_thiago.png b/basicsuite/qt5-everywhere/demos/video/qt5_video_thiago.png
deleted file mode 100644
index abf8522..0000000
--- a/basicsuite/qt5-everywhere/demos/video/qt5_video_thiago.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/demos/video/qt5_videos.xml b/basicsuite/qt5-everywhere/demos/video/qt5_videos.xml
deleted file mode 100644
index 420e476..0000000
--- a/basicsuite/qt5-everywhere/demos/video/qt5_videos.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<videolist>

-    <item>

-        <title>Lars Knoll: The Making of Qt 5</title>

-        <thumbnail>qt5_video_lars.png</thumbnail>

-        <link>http://download.qt-project.org/learning/videos/Lars_Knoll_The_Making_of_Qt_5.mp4</link>

-    </item>

-    <item>

-        <title>Qt 5: Jens Bache-Wiig on Qt 5 and Qt Quick</title>

-        <thumbnail>qt5_video_jens.png</thumbnail>

-        <link>http://download.qt-project.org/learning/videos/Qt5_Jens_Bache-Wiig_on_Qt5_Qt_Quick.mp4</link>

-    </item>

-    <item>

-        <title>Qt 5: Simon Hausmann on Qt WebKit</title>

-        <thumbnail>qt5_video_simon.png</thumbnail>

-        <link>http://download.qt-project.org/learning/videos/Qt_5_Simon_Hausmann_on_Qt_WebKit.mp4</link>

-    </item>

-    <item>

-        <title>Qt 5: Qt Developer Kenneth Christiansen on Qt WebKit</title>

-        <thumbnail>qt5_video_kenneth.png</thumbnail>

-        <link>http://download.qt-project.org/learning/videos/Qt5_Kenneth_Christiansen_on_Qt_WebKit.mp4</link>

-    </item>

-    <item>

-        <title>Qt 5: Thiago Macieira on Qt Core</title>

-        <thumbnail>qt5_video_thiago.png</thumbnail>

-        <link>http://download.qt-project.org/learning/videos/Qt5_Thiago_Macieira_on_Qt_Core.mp4</link>

-    </item>

-    <item>

-        <title>Qt 5: Samuel Rodal on Qt GUI, Qt Quick and Qt Open GL</title>

-        <thumbnail>qt5_video_samuel.png</thumbnail>

-        <link>http://download.qt-project.org/learning/videos/Qt5_Samuel_Rodal_on_Qt_GUI_OpenGL.mp4</link>

-    </item>

-</videolist>

diff --git a/basicsuite/qt5-everywhere/engine.js b/basicsuite/qt5-everywhere/engine.js
deleted file mode 100644
index fdc9a5b..0000000
--- a/basicsuite/qt5-everywhere/engine.js
+++ /dev/null
@@ -1,302 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-var positions = [
-            {x:-1100,  y:-1650, gid: 0, url: "demos/rssnews/rssnews.qml", device: 3, name: "Rss Reader"},
-            {x:-2100, y:-1550, gid: 0, url: "demos/gridrssnews/main.qml", device: 7, name: "Rss Reader"},
-
-            {x:1300,  y:-1600, gid: 1, url: "demos/canvasclock/canvasClock.qml", device: 4, name: "Canvas\n Clock"},
-            {x:2020,  y:-1520, gid: 1, url: "demos/heartmonitor/main.qml", device: 5, name: "  Heart\nMonitor"},
-
-            {x:1000,  y:-300, gid: 2, url: "demos/calqlatr/Calqlatr.qml", device: 0, name: "Calqlatr"},
-            {x:-500,  y:-250,  gid: 2, url: "demos/touchgallery/main.qml", device: 2, name: "Widget\nGallery"},
-            {x:200,   y:-200, gid: 2, url: "demos/photosurface/photosurface.qml", device: 6, name: " Photo\nSurface"},
-
-            {x:-1800, y:0,   gid: 3, url: "demos/maroon/Maroon.qml", device: 1, name: "Maroon in\n Trouble"},
-            {x:-2500, y:100, gid: 3, url: "demos/samegame/samegame.qml", device: 1, name: "SameGame"},
-
-            {x:1200,  y:1200, gid: 5, url: "demos/shaders/main.qml", device: 6, name: "Shaders"},
-            {x:2200,  y:1400, gid: 5, url: "demos/particledemo/particledemo.qml", device: 7, name: "Particle\n  Paint"},
-
-            {x:-800,  y:1180, gid: 4, url: "demos/video/main.qml", device: 8, name: "Video"},
-            {x:-1600, y:1500, gid: 4, url: "demos/radio/radio.qml", device: 4, name: "Internet\n  Radio"}
-        ]
-
-var groupPositions = [
-            {x:-2880, y:-2100, width: 2400, height: 1200, textX: 50, textY: 50, name: "Feeds"},
-            {x:700, y:-2100, width: 1700, height: 1200, textX: 50, textY: 50, name: "Canvas"},
-            {x:-900, y:-800, width: 2650, height: 1300, textX: 50, textY: 50, name: "Applications"},
-            {x:-3000, y:-500, width: 1750, height: 1150, textX: 50, textY: 50, name: "Games"},
-            {x:-2200, y:850, width: 2050, height: 1150, textX: 50, textY: 150, name: "Multimedia"},
-            {x:510, y:600, width: 2450, height: 1500, textX: 50, textY: 50, name: "Particles & Shaders"}
-        ]
-
-var imageSources = ["phone1.png","phone2.png", "phone3.png","tablet1.png", "car_device.png", "medical_device.png", "laptop1.png", "laptop2.png", "tv.png"]
-var widths = [300, 360, 366, 758, 625, 600, 918, 923, 800]
-var heights = [605, 706, 720, 564, 386, 488, 600, 600, 638]
-var scales = [0.8, 0.8, 0.6, 0.9, 1.0, 1.0, 0.9, 1.0, 1.0]
-var demoWidths = [269, 322, 322, 642, 480, 482, 688, 691, 726]
-var demoHeights = [404, 482, 482, 402, 320, 322, 431, 432, 456]
-var maskHorizontalOffsets = [1, 1, 1, 1, -52, 1, 1, 1, 1]
-var maskVerticalOffsets = [20, 32, 15, 24, 15, 45, 59, 57, 56]
-var navigationList = [1,0,2,3,4,6,5,7,8,12,11,9,10]
-var groupNavigationList = [0,1,2,3,4,5]
-var currentDemoIndex = -1
-var currentGroupIndex = -1
-var objects = []
-var groups = []
-
-function initSlides(){
-    positions.forEach(function(pos){
-        createSlide(pos.x,pos.y, pos.gid, pos.url, pos.device, pos.name)
-    })
-}
-
-function createSlide(x,y,gid,url,device,name){
-    var component = Qt.createComponent("Slide.qml")
-    if (component.status === Component.Ready){
-        var object=component.createObject(canvas)
-        object.device = device
-        object.imageSource = "images/" + imageSources[device]
-        object.width = widths[device]
-        object.height = heights[device]
-        object.scale = scales[device]
-        object.demoWidth = demoWidths[device]
-        object.demoHeight = demoHeights[device]
-        object.maskVerticalOffset = maskVerticalOffsets[device]
-        object.maskHorizontalOffset = maskHorizontalOffsets[device]
-        object.uid = objects.length
-        object.gid = gid
-        object.name = name
-        object.x = x-object.width/2
-        object.y = y-object.height/2
-        object.createElements();
-
-        if (url){
-            object.url = url;
-        }
-        objects.push(object)
-    }
-}
-
-function initGroups(){
-    groupPositions.forEach(function(pos){
-        createGroup(pos.x, pos.y, pos.width, pos.height, pos.textX, pos.textY, pos.textSource, pos.name)
-    })
-}
-
-function createGroup(x,y,width,height,textX,textY,textSource,name){
-    var component = Qt.createComponent("Group.qml")
-    if (component.status === Component.Ready){
-        var object=component.createObject(canvas)
-        object.uid = groups.length
-        object.x = x
-        object.y = y
-        object.width = width
-        object.height = height
-        object.textX = textX
-        object.textY = textY
-        object.name = name
-
-        groups.push(object)
-    }
-}
-
-function loadCurrentDemo(){
-
-    // Load current demo and release all others possible running demos
-    if (currentDemoIndex != -1) {
-        for (var i=0; i < objects.length; i++){
-            if (currentDemoIndex == i){
-                objects[navigationList[currentDemoIndex]].loadDemo();
-            }
-        }
-    }
-}
-
-function releaseDemos()
-{
-    for (var i=0; i < objects.length; i++)
-        objects[i].releaseDemo();
-}
-
-function getCurrent()
-{
-    if (currentDemoIndex < 0 || currentDemoIndex >= objects.length)
-        return null;
-
-    return selectTarget(navigationList[currentDemoIndex]);
-}
-
-function getNext()
-{
-    currentDemoIndex++;
-    if (currentDemoIndex >= objects.length)
-        currentDemoIndex = 0;
-
-    return selectTarget(navigationList[currentDemoIndex]);
-}
-
-function getPrevious()
-{
-    currentDemoIndex--;
-    if (currentDemoIndex < 0)
-        currentDemoIndex = objects.length-1;
-
-    return selectTarget(navigationList[currentDemoIndex]);
-}
-
-function selectTarget(uid){
-
-    var idx = -1;
-
-    for (var i=0; i < objects.length; i++){
-        if (uid >= 0 && objects[i].uid === uid){
-            idx = i;
-        } else {
-            objects[i].releaseDemo();
-        }
-    }
-    if (idx !== -1){
-        currentDemoIndex = navigationList.indexOf(idx)
-        currentGroupIndex = objects[idx].gid
-        return {"x": positions[idx].x,
-            "y":  positions[idx].y,
-            "targetScale": objects[idx].targetScale,
-            "navState": 2}
-    }
-
-    return null;
-}
-
-function getPosition(idx){
-    return {"x": positions[idx].x, "y":  positions[idx].y}
-}
-
-function getCurrentGroup()
-{
-    if (currentGroupIndex < 0 || currentGroupIndex >= groups.length)
-        return null;
-
-    return selectGroup(groupNavigationList[currentGroupIndex]);
-}
-
-function getNextGroup()
-{
-    currentGroupIndex++;
-    if (currentGroupIndex >= groups.length)
-        currentGroupIndex = 0;
-
-    return selectGroup(groupNavigationList[currentGroupIndex]);
-}
-
-function getPreviousGroup()
-{
-    currentGroupIndex--;
-    if (currentGroupIndex < 0)
-        currentGroupIndex = groups.length-1;
-
-    return selectGroup(groupNavigationList[currentGroupIndex]);
-}
-
-function selectGroup(id){
-
-    var idx = -1;
-
-    for (var i=0; i < groups.length; i++){
-        if (id >= 0 && groups[i].uid === id){
-            idx = i;
-            break;
-        }
-    }
-
-    if (idx !== -1){
-        currentGroupIndex = groupNavigationList.indexOf(idx)
-        return {"x": groupPositions[idx].x + groupPositions[idx].width/2,
-            "y":  groupPositions[idx].y + groupPositions[idx].height/2,
-            "targetScale": groups[idx].targetScale,
-            "navState": 1}
-    }
-
-    return null;
-}
-
-function boundingBox(){
-    var minX = 0, maxX = 0, minY = 0, maxY = 0;
-
-    for (var i=0; i<objects.length; i++){
-        var scale = objects[i].scale;
-        var w2 = objects[i].width/2;
-        var h2 = objects[i].height/2;
-        var left = (objects[i].x - w2)*scale;
-        var right = (objects[i].x + w2)*scale;
-        var top = (objects[i].y - h2)*scale;
-        var bottom = (objects[i].y + h2)*scale;
-
-        if (left < minX)
-            minX = left;
-        else if (right > maxX)
-            maxX = right;
-
-        if (top < minY)
-            minY = top;
-        else if (bottom > maxY)
-            maxY = bottom;
-    }
-
-    return {"x": minX, "y": minY, "width": maxX-minX, "height": maxY-minY, "centerX": (minX+maxX)/2, "centerY": (minY+maxY)/2};
-}
-
-function scaleToBox(destWidth, destHeight, sourceWidth, sourceHeight)
-{
-    return Math.min(destWidth / sourceWidth, destHeight / sourceHeight);
-}
-
-function updateObjectScales(destWidth, destHeight)
-{
-    for (var i=0; i<objects.length; i++)
-        objects[i].targetScale = scaleToBox(destWidth, destHeight, objects[i].targetWidth(), objects[i].targetHeight());
-}
-
-function updateGroupScales(destWidth, destHeight)
-{
-    for (var i=0; i<groups.length; i++)
-        groups[i].targetScale = scaleToBox(destWidth, destHeight, groups[i].width, groups[i].height);
-}
diff --git a/basicsuite/qt5-everywhere/fonts/OFL.txt b/basicsuite/qt5-everywhere/fonts/OFL.txt
deleted file mode 100644
index 5e51e46..0000000
--- a/basicsuite/qt5-everywhere/fonts/OFL.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-Copyright (c) 2010-2012 Patrick Wagesreiter (mail@patrickwagesreiter.at)

-This Font Software is licensed under the SIL Open Font License, Version 1.1.

-This license is copied below, and is also available with a FAQ at:

-http://scripts.sil.org/OFL

-

-

------------------------------------------------------------

-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007

------------------------------------------------------------

-

-PREAMBLE

-The goals of the Open Font License (OFL) are to stimulate worldwide

-development of collaborative font projects, to support the font creation

-efforts of academic and linguistic communities, and to provide a free and

-open framework in which fonts may be shared and improved in partnership

-with others.

-

-The OFL allows the licensed fonts to be used, studied, modified and

-redistributed freely as long as they are not sold by themselves. The

-fonts, including any derivative works, can be bundled, embedded, 

-redistributed and/or sold with any software provided that any reserved

-names are not used by derivative works. The fonts and derivatives,

-however, cannot be released under any other type of license. The

-requirement for fonts to remain under this license does not apply

-to any document created using the fonts or their derivatives.

-

-DEFINITIONS

-"Font Software" refers to the set of files released by the Copyright

-Holder(s) under this license and clearly marked as such. This may

-include source files, build scripts and documentation.

-

-"Reserved Font Name" refers to any names specified as such after the

-copyright statement(s).

-

-"Original Version" refers to the collection of Font Software components as

-distributed by the Copyright Holder(s).

-

-"Modified Version" refers to any derivative made by adding to, deleting,

-or substituting -- in part or in whole -- any of the components of the

-Original Version, by changing formats or by porting the Font Software to a

-new environment.

-

-"Author" refers to any designer, engineer, programmer, technical

-writer or other person who contributed to the Font Software.

-

-PERMISSION & CONDITIONS

-Permission is hereby granted, free of charge, to any person obtaining

-a copy of the Font Software, to use, study, copy, merge, embed, modify,

-redistribute, and sell modified and unmodified copies of the Font

-Software, subject to the following conditions:

-

-1) Neither the Font Software nor any of its individual components,

-in Original or Modified Versions, may be sold by itself.

-

-2) Original or Modified Versions of the Font Software may be bundled,

-redistributed and/or sold with any software, provided that each copy

-contains the above copyright notice and this license. These can be

-included either as stand-alone text files, human-readable headers or

-in the appropriate machine-readable metadata fields within text or

-binary files as long as those fields can be easily viewed by the user.

-

-3) No Modified Version of the Font Software may use the Reserved Font

-Name(s) unless explicit written permission is granted by the corresponding

-Copyright Holder. This restriction only applies to the primary font name as

-presented to the users.

-

-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font

-Software shall not be used to promote, endorse or advertise any

-Modified Version, except to acknowledge the contribution(s) of the

-Copyright Holder(s) and the Author(s) or with their explicit written

-permission.

-

-5) The Font Software, modified or unmodified, in part or in whole,

-must be distributed entirely under this license, and must not be

-distributed under any other license. The requirement for fonts to

-remain under this license does not apply to any document created

-using the Font Software.

-

-TERMINATION

-This license becomes null and void if any of the above conditions are

-not met.

-

-DISCLAIMER

-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE

-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL

-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM

-OTHER DEALINGS IN THE FONT SOFTWARE.

diff --git a/basicsuite/qt5-everywhere/fonts/PatrickHandSC-Regular.ttf b/basicsuite/qt5-everywhere/fonts/PatrickHandSC-Regular.ttf
deleted file mode 100644
index 49dfe40..0000000
--- a/basicsuite/qt5-everywhere/fonts/PatrickHandSC-Regular.ttf
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/box.png b/basicsuite/qt5-everywhere/images/box.png
deleted file mode 100644
index b702861..0000000
--- a/basicsuite/qt5-everywhere/images/box.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/box_open.png b/basicsuite/qt5-everywhere/images/box_open.png
deleted file mode 100644
index 910f2ac..0000000
--- a/basicsuite/qt5-everywhere/images/box_open.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/btn_help.png b/basicsuite/qt5-everywhere/images/btn_help.png
deleted file mode 100644
index 6888b1a..0000000
--- a/basicsuite/qt5-everywhere/images/btn_help.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/btn_home.png b/basicsuite/qt5-everywhere/images/btn_home.png
deleted file mode 100644
index e66d531..0000000
--- a/basicsuite/qt5-everywhere/images/btn_home.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/btn_next.png b/basicsuite/qt5-everywhere/images/btn_next.png
deleted file mode 100644
index c6f897e..0000000
--- a/basicsuite/qt5-everywhere/images/btn_next.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/btn_previous.png b/basicsuite/qt5-everywhere/images/btn_previous.png
deleted file mode 100644
index efae81b..0000000
--- a/basicsuite/qt5-everywhere/images/btn_previous.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/car_device.png b/basicsuite/qt5-everywhere/images/car_device.png
deleted file mode 100644
index 7f6fa07..0000000
--- a/basicsuite/qt5-everywhere/images/car_device.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character0.png b/basicsuite/qt5-everywhere/images/character0.png
deleted file mode 100644
index 11a1b35..0000000
--- a/basicsuite/qt5-everywhere/images/character0.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character1.png b/basicsuite/qt5-everywhere/images/character1.png
deleted file mode 100644
index 4f09ee6..0000000
--- a/basicsuite/qt5-everywhere/images/character1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character10.png b/basicsuite/qt5-everywhere/images/character10.png
deleted file mode 100644
index 2039664..0000000
--- a/basicsuite/qt5-everywhere/images/character10.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character2.png b/basicsuite/qt5-everywhere/images/character2.png
deleted file mode 100644
index e7a841b..0000000
--- a/basicsuite/qt5-everywhere/images/character2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character3.png b/basicsuite/qt5-everywhere/images/character3.png
deleted file mode 100644
index edad45f..0000000
--- a/basicsuite/qt5-everywhere/images/character3.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character4.png b/basicsuite/qt5-everywhere/images/character4.png
deleted file mode 100644
index c343f50..0000000
--- a/basicsuite/qt5-everywhere/images/character4.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character5.png b/basicsuite/qt5-everywhere/images/character5.png
deleted file mode 100644
index 65e00f7..0000000
--- a/basicsuite/qt5-everywhere/images/character5.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character6.png b/basicsuite/qt5-everywhere/images/character6.png
deleted file mode 100644
index 05ab8f5..0000000
--- a/basicsuite/qt5-everywhere/images/character6.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character7.png b/basicsuite/qt5-everywhere/images/character7.png
deleted file mode 100644
index 700a46a..0000000
--- a/basicsuite/qt5-everywhere/images/character7.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character8.png b/basicsuite/qt5-everywhere/images/character8.png
deleted file mode 100644
index 3580062..0000000
--- a/basicsuite/qt5-everywhere/images/character8.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/character9.png b/basicsuite/qt5-everywhere/images/character9.png
deleted file mode 100644
index 298242e..0000000
--- a/basicsuite/qt5-everywhere/images/character9.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/cloud1.png b/basicsuite/qt5-everywhere/images/cloud1.png
deleted file mode 100644
index 474feea..0000000
--- a/basicsuite/qt5-everywhere/images/cloud1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/cloud2.png b/basicsuite/qt5-everywhere/images/cloud2.png
deleted file mode 100644
index ccd811d..0000000
--- a/basicsuite/qt5-everywhere/images/cloud2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/hand.png b/basicsuite/qt5-everywhere/images/hand.png
deleted file mode 100644
index 97cc9da..0000000
--- a/basicsuite/qt5-everywhere/images/hand.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/highlight_mask.png b/basicsuite/qt5-everywhere/images/highlight_mask.png
deleted file mode 100644
index 6297142..0000000
--- a/basicsuite/qt5-everywhere/images/highlight_mask.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/island.png b/basicsuite/qt5-everywhere/images/island.png
deleted file mode 100644
index 8e99f28..0000000
--- a/basicsuite/qt5-everywhere/images/island.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/laptop1.png b/basicsuite/qt5-everywhere/images/laptop1.png
deleted file mode 100644
index 48317c3..0000000
--- a/basicsuite/qt5-everywhere/images/laptop1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/laptop2.png b/basicsuite/qt5-everywhere/images/laptop2.png
deleted file mode 100644
index b17c39e..0000000
--- a/basicsuite/qt5-everywhere/images/laptop2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/man1.png b/basicsuite/qt5-everywhere/images/man1.png
deleted file mode 100644
index 71b651e..0000000
--- a/basicsuite/qt5-everywhere/images/man1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/medical_device.png b/basicsuite/qt5-everywhere/images/medical_device.png
deleted file mode 100644
index 50814a6..0000000
--- a/basicsuite/qt5-everywhere/images/medical_device.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/mountain.png b/basicsuite/qt5-everywhere/images/mountain.png
deleted file mode 100644
index 210aa5f..0000000
--- a/basicsuite/qt5-everywhere/images/mountain.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/particle-smoke.png b/basicsuite/qt5-everywhere/images/particle-smoke.png
deleted file mode 100644
index b27f954..0000000
--- a/basicsuite/qt5-everywhere/images/particle-smoke.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/phone1.png b/basicsuite/qt5-everywhere/images/phone1.png
deleted file mode 100644
index ba7d1e0..0000000
--- a/basicsuite/qt5-everywhere/images/phone1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/phone2.png b/basicsuite/qt5-everywhere/images/phone2.png
deleted file mode 100644
index df997d1..0000000
--- a/basicsuite/qt5-everywhere/images/phone2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/phone3.png b/basicsuite/qt5-everywhere/images/phone3.png
deleted file mode 100644
index 66cb130..0000000
--- a/basicsuite/qt5-everywhere/images/phone3.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/stones.png b/basicsuite/qt5-everywhere/images/stones.png
deleted file mode 100644
index 61e500b..0000000
--- a/basicsuite/qt5-everywhere/images/stones.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/tablet1.png b/basicsuite/qt5-everywhere/images/tablet1.png
deleted file mode 100644
index 5a80680..0000000
--- a/basicsuite/qt5-everywhere/images/tablet1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/tree1.png b/basicsuite/qt5-everywhere/images/tree1.png
deleted file mode 100644
index 7a24e41..0000000
--- a/basicsuite/qt5-everywhere/images/tree1.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/tree2.png b/basicsuite/qt5-everywhere/images/tree2.png
deleted file mode 100644
index cdfd87d..0000000
--- a/basicsuite/qt5-everywhere/images/tree2.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/images/tv.png b/basicsuite/qt5-everywhere/images/tv.png
deleted file mode 100644
index 1454cde..0000000
--- a/basicsuite/qt5-everywhere/images/tv.png
+++ /dev/null
diff --git a/basicsuite/qt5-everywhere/main.qml b/basicsuite/qt5-everywhere/main.qml
index cf77887..1d8b86a 100644
--- a/basicsuite/qt5-everywhere/main.qml
+++ b/basicsuite/qt5-everywhere/main.qml
@@ -1,242 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+import QtQuick 2.2
 
-import QtQuick 2.0
-import "engine.js" as Engine
-import "style.js" as Style
-
-Rectangle{
-    id: app
-    clip: true
-    focus: true
-    width: 800
-    height: 1280
-
-    property real homeScaleFactor: .2
-    property int homeCenterX: 0
-    property int homeCenterY: 0
-    property real minScaleFactor: .04
-    property real maxScaleFactor: 1
-    property real tapLimitX : 2
-    property real tapLimitY : 1
-    property int navigationState: 0 //home, group, slide, dirty
-    property bool useGroups: true
-
-    function calculateScales(){
-        if (app.width > 0 && app.height > 0){
-            var bbox = Engine.boundingBox();
-            app.homeScaleFactor = Engine.scaleToBox(app.width*0.85, app.height*0.85, bbox.width, bbox.height);
-            app.homeCenterX = bbox.centerX;
-            app.homeCenterY = bbox.centerY;
-            app.minScaleFactor = app.homeScaleFactor / 10;
-            app.maxScaleFactor = app.homeScaleFactor * 20;
-            Engine.updateObjectScales(app.width*0.9, app.height*0.9);
-            Engine.updateGroupScales(app.width, app.height);
-            tapLimitX = Math.max(1,app.width * 0.02);
-            tapLimitY = Math.max(1,app.height * 0.02);
-
-
-            var target = Engine.getCurrentGroup()
-            if (app.useGroups && navigationState == 1) {
-                if (target !== null)
-                    canvas.goTo(target, true)
-                else
-                    canvas.goHome()
-            }
-            else if (navigationState == 2) {
-                target = Engine.getCurrent()
-                if (target !== null)
-                    canvas.goTo(target, true)
-                else
-                    canvas.goHome()
-            }
-            else
-                canvas.goHome()
-
-            navigationPanel.checkOrientation()
-        }
-    }
-
-    function selectTarget(uid) {
-        return Engine.selectTarget(uid)
-    }
-
-    function selectGroup(uid) {
-        return Engine.selectGroup(uid)
-    }
-
-    function getCurrentGroup() {
-        return Engine.getCurrentGroup()
-    }
-
-    function getNext() {
-        if (app.useGroups && app.navigationState == 1)
-            return Engine.getNextGroup()
-        else
-            return Engine.getNext()
-    }
-
-    function getPrevious() {
-        if (app.useGroups && app.navigationState == 1)
-            return Engine.getPreviousGroup()
-        else
-            return Engine.getPrevious()
-    }
-
-    onWidthChanged: calculateScales();
-    onHeightChanged: calculateScales();
-
-    FontLoader {
-        id: fontLoader
-        source: "fonts/PatrickHandSC-Regular.ttf"
-    }
-
-    gradient: Gradient {
-        GradientStop { position: 0.0; color: "#89d4ff" }
-        GradientStop { position: 1.0; color: "#f3fbff" }
-    }
-
-    Cloud { id: cloud1; sourceImage: "images/cloud1.png"}
-    Cloud { id: cloud2; sourceImage: "images/cloud1.png"}
-    Cloud { id: cloud3; sourceImage: "images/cloud1.png"}
-    Cloud { id: cloud4; sourceImage: "images/cloud2.png"}
-    Cloud { id: cloud5; sourceImage: "images/cloud2.png"}
-    Cloud { id: cloud6; sourceImage: "images/cloud2.png"}
-
-    WorldMouseArea { id: worldMouseArea }
-    WorldCanvas { id:canvas }
-    NavigationPanel{ id: navigationPanel }
-
-    HelpScreen {
-        id: helpscreen
-        visible: false
-    }
-    function getPosition(index){
-        return Engine.getPosition(index)
-    }
-
-    QuitDialog {
-        id: quitDialog
-        visible: false
-
-        onYes: Qt.quit()
-        onNo: visible = false
-    }
-
-    SmoothedAnimation {
-        id: zoomAnimation
-        target: canvas;
-        property: "scalingFactor";
-        duration: Style.APP_ANIMATION_DELAY
-        velocity: -1
-        to:canvas.zoomInTarget
-
-        onRunningChanged: {
-            if (!running) {
-                if (app.navigationState === 2)
-                    Engine.loadCurrentDemo();
-                else
-                    Engine.releaseDemos();
-            }
-        }
-    }
-
-    SequentialAnimation {
-        id: navigationAnimation
-
-        property int animCounter: 0
-
-        function restartAnimation() {
-            navigationAnimation.animCounter++;
-            restart();
-        }
-
-        NumberAnimation {
-            id: zoomOutAnimation
-            target: canvas;
-            property: "scalingFactor";
-            duration: Style.APP_ANIMATION_DELAY/2;
-            to: app.homeScaleFactor*1.3
-            easing.type: Easing.OutCubic
-        }
-
-        NumberAnimation {
-            id: zoomInAnimation
-            target: canvas;
-            property: "scalingFactor";
-            duration: Style.APP_ANIMATION_DELAY/2;
-            to: canvas.zoomInTarget
-            easing.type: Easing.InCubic
-        }
-
-        onRunningChanged: {
-            if (!running)
-                animCounter--
-
-            if (animCounter === 0 && navigationState === 2)
-                Engine.loadCurrentDemo();
-        }
-    }
-
-    Keys.onReleased: {
-        // Handle back-key
-        if (event.key === Qt.Key_Back) {
-            event.accepted = true;
-
-            if (app.navigationState !== 0)
-                canvas.goBack();
-            else
-                quitDialog.visible = true
-        }
-    }
-
-    Component.onCompleted: {
-        if (app.useGroups)
-            Engine.initGroups()
-
-        Engine.initSlides()
-        cloud1.start();
-        cloud2.start();
-        cloud3.start();
-        cloud4.start();
-        cloud5.start();
-        cloud6.start();
-    }
+Loader {
+    source: "qml/QtDemo/main.qml"
 }
diff --git a/basicsuite/qt5-everywhere/preview_l.jpg b/basicsuite/qt5-everywhere/preview_l.jpg
index 577a64c..055e887 100644
--- a/basicsuite/qt5-everywhere/preview_l.jpg
+++ b/basicsuite/qt5-everywhere/preview_l.jpg
diff --git a/basicsuite/qt5-everywhere/qt5-everywhere.pro b/basicsuite/qt5-everywhere/qt5-everywhere.pro
index 245d838..c7fe2d7 100644
--- a/basicsuite/qt5-everywhere/qt5-everywhere.pro
+++ b/basicsuite/qt5-everywhere/qt5-everywhere.pro
@@ -1,5 +1,14 @@
-TEMPLATE = subdirs
-CONFIG += ordered
-SUBDIRS += \
-    demos \
-    app.pro
+TARGET = qt5-everywhere
+
+include(../shared/shared.pri)
+b2qtdemo_deploy_defaults()
+
+content.files = \
+    *.qml \
+    qml \
+
+content.path = $$DESTPATH
+
+OTHER_FILES += $${content.files}
+
+INSTALLS += target content
diff --git a/basicsuite/qt5-everywhere/style.js b/basicsuite/qt5-everywhere/style.js
deleted file mode 100644
index 6f09c42..0000000
--- a/basicsuite/qt5-everywhere/style.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-var APP_WIDTH = 800
-var APP_HEIGHT = 1280
-
-var APP_ANIMATION_DELAY = 1000
-
-var LOGO_WIDTH = 800 //1006
-var LOGO_HEIGHT = 960 //1200
-
-var FONT_FAMILY = "Patrick Hand SC"
diff --git a/basicsuite/qt5-particlesdemo/doc/src/emitters.qdoc b/basicsuite/qt5-particlesdemo/doc/src/emitters.qdoc
index b65f933..2a53ef1 100644
--- a/basicsuite/qt5-particlesdemo/doc/src/emitters.qdoc
+++ b/basicsuite/qt5-particlesdemo/doc/src/emitters.qdoc
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/basicsuite/qt5-particlesdemo/preview_l.jpg b/basicsuite/qt5-particlesdemo/preview_l.jpg
index fa0db59..f611937 100644
--- a/basicsuite/qt5-particlesdemo/preview_l.jpg
+++ b/basicsuite/qt5-particlesdemo/preview_l.jpg
diff --git a/basicsuite/sensorexplorer/doc/src/sensor_explorer.qdoc b/basicsuite/sensorexplorer/doc/src/sensor_explorer.qdoc
index c9921a1..25aa34f 100644
--- a/basicsuite/sensorexplorer/doc/src/sensor_explorer.qdoc
+++ b/basicsuite/sensorexplorer/doc/src/sensor_explorer.qdoc
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Free Documentation License Usage
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/basicsuite/sensorexplorer/imports/explorer.cpp b/basicsuite/sensorexplorer/imports/explorer.cpp
index f9edc90..5ca644f 100644
--- a/basicsuite/sensorexplorer/imports/explorer.cpp
+++ b/basicsuite/sensorexplorer/imports/explorer.cpp
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/sensorexplorer/imports/explorer.h b/basicsuite/sensorexplorer/imports/explorer.h
index d9d9546..1eee6c0 100644
--- a/basicsuite/sensorexplorer/imports/explorer.h
+++ b/basicsuite/sensorexplorer/imports/explorer.h
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/sensorexplorer/imports/main.cpp b/basicsuite/sensorexplorer/imports/main.cpp
index 3a8f506..106ca93 100644
--- a/basicsuite/sensorexplorer/imports/main.cpp
+++ b/basicsuite/sensorexplorer/imports/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the QtSensors module of the Qt Toolkit.
diff --git a/basicsuite/sensorexplorer/imports/propertyinfo.cpp b/basicsuite/sensorexplorer/imports/propertyinfo.cpp
index 0481d4d..b8af5c5 100644
--- a/basicsuite/sensorexplorer/imports/propertyinfo.cpp
+++ b/basicsuite/sensorexplorer/imports/propertyinfo.cpp
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/sensorexplorer/imports/propertyinfo.h b/basicsuite/sensorexplorer/imports/propertyinfo.h
index 72ce640..9bcd07e 100644
--- a/basicsuite/sensorexplorer/imports/propertyinfo.h
+++ b/basicsuite/sensorexplorer/imports/propertyinfo.h
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/sensorexplorer/imports/sensoritem.cpp b/basicsuite/sensorexplorer/imports/sensoritem.cpp
index 2a64d6c..ec8eb06 100644
--- a/basicsuite/sensorexplorer/imports/sensoritem.cpp
+++ b/basicsuite/sensorexplorer/imports/sensoritem.cpp
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/sensorexplorer/imports/sensoritem.h b/basicsuite/sensorexplorer/imports/sensoritem.h
index b17d8ed..a78af9d 100644
--- a/basicsuite/sensorexplorer/imports/sensoritem.h
+++ b/basicsuite/sensorexplorer/imports/sensoritem.h
@@ -11,8 +11,8 @@
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** conditions see http://www.qt.io/licensing.  For further information
+** use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
diff --git a/basicsuite/sensorexplorer/preview_l.jpg b/basicsuite/sensorexplorer/preview_l.jpg
index b0469e5..59809ea 100644
--- a/basicsuite/sensorexplorer/preview_l.jpg
+++ b/basicsuite/sensorexplorer/preview_l.jpg
diff --git a/basicsuite/sensors/Accelbubble.qml b/basicsuite/sensors/Accelbubble.qml
index fa42770..cff693b 100644
--- a/basicsuite/sensors/Accelbubble.qml
+++ b/basicsuite/sensors/Accelbubble.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/sensors/Light.qml b/basicsuite/sensors/Light.qml
index 24f3bd9..c92dabc 100644
--- a/basicsuite/sensors/Light.qml
+++ b/basicsuite/sensors/Light.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/sensors/main.qml b/basicsuite/sensors/main.qml
index d6e0e9d..71af99d 100644
--- a/basicsuite/sensors/main.qml
+++ b/basicsuite/sensors/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/sensors/preview_l.jpg b/basicsuite/sensors/preview_l.jpg
index d87d757..9d0d88c 100644
--- a/basicsuite/sensors/preview_l.jpg
+++ b/basicsuite/sensors/preview_l.jpg
diff --git a/basicsuite/shared/SharedMain.qml b/basicsuite/shared/SharedMain.qml
index 98ca779..301ccb8 100644
--- a/basicsuite/shared/SharedMain.qml
+++ b/basicsuite/shared/SharedMain.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of Qt Enterprise Embedded.
 **
@@ -12,11 +12,11 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 **
 ****************************************************************************/
 import QtQuick 2.0
-import QtQuick.Enterprise.VirtualKeyboard 1.1
+import QtQuick.Enterprise.VirtualKeyboard 1.2
 
 Item {
     id: root
@@ -26,7 +26,6 @@ Item {
         anchors.top: parent.top
         anchors.right: parent.right
         anchors.bottom: inputPanel.top
-
         source: "main.qml"
     }
 
diff --git a/basicsuite/shared/engine.cpp b/basicsuite/shared/engine.cpp
index da021e5..09132c1 100644
--- a/basicsuite/shared/engine.cpp
+++ b/basicsuite/shared/engine.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of Qt Enterprise Embedded.
 **
@@ -12,7 +12,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 **
 ****************************************************************************/
 #include "engine.h"
@@ -32,4 +32,6 @@ DummyEngine::DummyEngine(QObject *parent)
     float high = 20;
     float screenSizeCM = qMax<float>(qMin(m_screenSize.width(), m_screenSize.height()) / m_dpcm, low);
     m_dpcm *= (screenSizeCM - low) / (high - low) * 0.5 + 0.5;
+    m_screenWidth = m_screenSize.width();
+    m_screenHeight = m_screenSize.height();
 }
diff --git a/basicsuite/shared/engine.h b/basicsuite/shared/engine.h
index 43713c8..1c637a7 100644
--- a/basicsuite/shared/engine.h
+++ b/basicsuite/shared/engine.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of Qt Enterprise Embedded.
 **
@@ -12,7 +12,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 **
 ****************************************************************************/
 #ifndef ENGINE_H
@@ -23,11 +23,6 @@
 #include <QString>
 #include <QUrl>
 
-class QQmlEngine;
-class QQuickItem;
-class FpsCounter;
-class QQuickWindow;
-
 /*!
     A simplified version of the one used by b2qt-launcher
 */
@@ -42,11 +37,15 @@ public:
     Q_INVOKABLE int smallFontSize() const { return qMax<int>(m_dpcm * 0.4, 10); }
     Q_INVOKABLE int fontSize() const { return qMax<int>(m_dpcm * 0.6, 14); }
     Q_INVOKABLE int titleFontSize() const { return qMax<int>(m_dpcm * 0.9, 20); }
-    Q_INVOKABLE int centimeter() const { return m_dpcm; }
+    Q_INVOKABLE int centimeter(int val = 1) const { return (m_dpcm * val); }
+    Q_INVOKABLE int mm(int val) const { return (int)(m_dpcm * val * 0.1); }
+    Q_INVOKABLE int screenWidth() const { return m_screenWidth; }
+    Q_INVOKABLE int screenHeight() const { return m_screenHeight; }
 
 private:
     QSize m_screenSize;
     qreal m_dpcm;
+    int m_screenWidth, m_screenHeight;
 };
 
 #endif // ENGINE_H
diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp
index 00284b3..9ddb61b 100644
--- a/basicsuite/shared/main.cpp
+++ b/basicsuite/shared/main.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of Qt Enterprise Embedded.
 **
@@ -12,7 +12,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 **
 ****************************************************************************/
 #include <QtCore/QDebug>
diff --git a/basicsuite/shared/main_landscape.qml b/basicsuite/shared/main_landscape.qml
index 46b7fc5..e5bf510 100644
--- a/basicsuite/shared/main_landscape.qml
+++ b/basicsuite/shared/main_landscape.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
+** For any questions to Digia, please use contact form at http://www.qt.io
 **
 ** This file is part of Qt Enterprise Embedded.
 **
@@ -12,15 +12,14 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
+** contact form at http://www.qt.io
 **
 ****************************************************************************/
 import QtQuick 2.0
 
 Item {
-    width: 800
-    height: 1280
-
+    width: engine.screenWidth()
+    height: engine.screenHeight()
     SharedMain {
         anchors.centerIn: parent
         width: parent.height
diff --git a/basicsuite/textinput/ScrollBar.qml b/basicsuite/textinput/ScrollBar.qml
index b4753f2..1f2f90e 100644
--- a/basicsuite/textinput/ScrollBar.qml
+++ b/basicsuite/textinput/ScrollBar.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/textinput/TextArea.qml b/basicsuite/textinput/TextArea.qml
index cf84689..c54273e 100644
--- a/basicsuite/textinput/TextArea.qml
+++ b/basicsuite/textinput/TextArea.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/textinput/TextBase.qml b/basicsuite/textinput/TextBase.qml
index 0fcf294..68dc8d7 100644
--- a/basicsuite/textinput/TextBase.qml
+++ b/basicsuite/textinput/TextBase.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/textinput/TextField.qml b/basicsuite/textinput/TextField.qml
index f25dc49..f09d851 100644
--- a/basicsuite/textinput/TextField.qml
+++ b/basicsuite/textinput/TextField.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/textinput/main.qml b/basicsuite/textinput/main.qml
index db407c2..77855e4 100644
--- a/basicsuite/textinput/main.qml
+++ b/basicsuite/textinput/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/textinput/preview_l.jpg b/basicsuite/textinput/preview_l.jpg
index 7e453b8..d0d0833 100644
--- a/basicsuite/textinput/preview_l.jpg
+++ b/basicsuite/textinput/preview_l.jpg
diff --git a/basicsuite/webengine/content/index.html b/basicsuite/webengine/content/index.html
index fda8caa..98c6df3 100644
--- a/basicsuite/webengine/content/index.html
+++ b/basicsuite/webengine/content/index.html
@@ -25,7 +25,7 @@
     </head>
     <body bgcolor="#AAAAAA">
         <div style="text-align: center; padding-top: 100px;">
-            <div class="bookmark"><a href="http://qt.digia.com">http://qt.digia.com</a></div>
+            <div class="bookmark"><a href="http://www.qt.io">http://www.qt.io</a></div>
             <div class="bookmark"><a href="http://qt-project.org/doc/qt-5">http://qt-project.org/doc/qt-5</a></div>
             <div class="bookmark"><a href="http://www.google.com">http://www.google.com</a></div>
 <!--        <div class="example"><a href="../content/webgl/helloqt.html"><img class="example_image" src="../content/webgl/screenshot.png"></a></div> -->
diff --git a/basicsuite/webengine/main.qml b/basicsuite/webengine/main.qml
index 39ac91d..d0b58c9 100644
--- a/basicsuite/webengine/main.qml
+++ b/basicsuite/webengine/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/basicsuite/webengine/preview_l.jpg b/basicsuite/webengine/preview_l.jpg
index 963258a..9474ed3 100644
--- a/basicsuite/webengine/preview_l.jpg
+++ b/basicsuite/webengine/preview_l.jpg
diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc
index 0a61968..b5e6d26 100644
--- a/doc/b2qt-demos.qdoc
+++ b/doc/b2qt-demos.qdoc
@@ -3,7 +3,7 @@
 ** Copyright (C) 2014 Digia Plc
 ** All rights reserved.
 ** For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of Qt Enterprise Embedded.
 **
@@ -13,7 +13,7 @@
 ** a written agreement between you and Digia.
 **
 ** If you have questions regarding the use of this file, please use
-** the contact form at http://qt.digia.com/
+** the contact form at http://www.qt.io
 **
 ****************************************************************************/
 
@@ -32,16 +32,13 @@
 
 /*!
     \example about-b2qt
-    \title About Boot to Qt
+    \title About Qt Enterprise Embedded
     \ingroup b2qt-demos
-    \brief Displays information about the Boot to Qt software stack.
+    \brief Displays information about Qt Enterprise Embedded.
 
     \image b2qt-demo-about-b2qt.jpg
 
-    The \e {About Boot to Qt} demo provides an introduction to what Boot to Qt is all about.
-
-    It talks briefly about how the software stack is built up, rough hardware requirements
-    and how Boot to Qt differs from the more traditional Qt editions.
+    A demo that provides an introduction to what Qt Enterprise Embedded is all about.
 */
 
 /*!
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf
index dfa494a..caee6ba 100644
--- a/doc/b2qt-demos.qdocconf
+++ b/doc/b2qt-demos.qdocconf
@@ -6,7 +6,7 @@ sourceencoding               = UTF-8
 
 project                      = QtEnterpriseEmbeddedDemos
 description                  = Qt Enterprise Embedded Examples and Demos
-version                      = 3.1.1
+version                      = 3.2.0
 
 sourcedirs                   = .
 imagedirs                   += images
@@ -21,7 +21,7 @@ exampledirs                  = ../basicsuite
 qhp.projects                 = QtEnterpriseEmbeddedDemos
 
 qhp.QtEnterpriseEmbeddedDemos.file                = b2qt-demos.qhp
-qhp.QtEnterpriseEmbeddedDemos.namespace           = com.digia.b2qt-demos.311
+qhp.QtEnterpriseEmbeddedDemos.namespace           = com.digia.b2qt-demos.320
 qhp.QtEnterpriseEmbeddedDemos.virtualFolder       = b2qt-demos
 qhp.QtEnterpriseEmbeddedDemos.indexTitle          = Qt Enterprise Embedded Examples and Demos
 qhp.QtEnterpriseEmbeddedDemos.indexRoot           =
diff --git a/doc/images/b2qt-demo.png b/doc/images/b2qt-demo.png
deleted file mode 100644
index e798ae2..0000000
--- a/doc/images/b2qt-demo.png
+++ /dev/null
diff --git a/experimental/Overlay Tester/main.qml b/experimental/Overlay Tester/main.qml
index e7ae0af..c6f9433 100644
--- a/experimental/Overlay Tester/main.qml
+++ b/experimental/Overlay Tester/main.qml
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
+** http://www.qt.io
 **
 ** This file is part of the examples of the Qt Enterprise Embedded.
 **
diff --git a/experimental/qt5-intro-android/Button.qml b/experimental/qt5-intro-android/Button.qml
deleted file mode 100644
index 6d6bf6e..0000000
--- a/experimental/qt5-intro-android/Button.qml
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-
-    id: root;
-
-    border.width: (pressed ? 1.5 : 1) * height / 20;
-    border.color: Qt.rgba(1, 1, 1, 0.4);
-    radius: height / 4;
-
-    antialiasing: true
-
-    gradient: Gradient {
-        GradientStop { position: 0; color: Qt.rgba(0.5, 0.5, 0.5, pressed ? 0.7 : 0.5); }
-        GradientStop { position: 1; color: Qt.rgba(0.2, 0.2, 0.2, pressed ? 0.7 : 0.5); }
-    }
-
-    Behavior on color { ColorAnimation { duration: 100 } }
-
-    property bool pressed;
-    property alias label: textItem.text;
-
-    Text {
-        id: textItem
-        anchors.centerIn: parent
-        color: "white"
-        font.pixelSize: parent.height / 3;
-        font.bold: true
-    }
-
-    MouseArea {
-        id: mouse
-        anchors.fill: parent
-        onPressed: root.pressed = !root.pressed;
-
-    }
-
-}
diff --git a/experimental/qt5-intro-android/CameraSlide.qml b/experimental/qt5-intro-android/CameraSlide.qml
deleted file mode 100644
index 564b467..0000000
--- a/experimental/qt5-intro-android/CameraSlide.qml
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtMultimedia 5
-import "presentation"
-
-import QtGraphicalEffects 1.0
-
-Slide {
-
-    id: slide
-
-    title: "Qt Multimedia - Camera"
-
-    Camera {
-         id: camera
-         Component.onCompleted: camera.stop();
-     }
-
-     VideoOutput {
-         id: videoOut
-         anchors.fill: parent
-         source: camera
-         layer.enabled: true;
-         layer.effect: ZoomBlur {
-             samples: 16
-             length: button.pressed ? parent.height / 5 : 0
-             Behavior on length {
-                 NumberAnimation { duration: 250 }
-             }
-         }
-     }
-
-     onVisibleChanged: {
-         if (slide.visible)
-             camera.start();
-         else
-             camera.stop();
-     }
-
-     Button {
-         id: button
-         anchors.bottom: videoOut.bottom
-         anchors.horizontalCenter: videoOut.horizontalCenter
-         anchors.bottomMargin: height / 2;
-//         anchors.bottom: slide.top;
-//         anchors.right: slide.right;
-//         anchors.bottomMargin: height;
-         label: pressed ? "Remove Effect" : "Zoom Effect";
-         width: height * 4;
-         height: parent.height * 0.1
-     }
-
-}
diff --git a/experimental/qt5-intro-android/CanvasSlide.qml b/experimental/qt5-intro-android/CanvasSlide.qml
deleted file mode 100644
index 6bd97ff..0000000
--- a/experimental/qt5-intro-android/CanvasSlide.qml
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "presentation"
-
-Slide {
-    id: slide
-
-    title: "Qt Quick -  Canvas"
-
-    shouldTimeout: false
-
-    Rectangle {
-        height: parent.height
-        width: parent.width * 0.45
-        anchors.right: parent.right;
-        antialiasing: true
-        radius: slide.height * 0.03;
-        color: Qt.rgba(0.0, 0.0, 0.0, 0.2);
-        Canvas {
-            id:canvas
-            anchors.fill: parent;
-
-            renderTarget: Canvas.Image;
-            antialiasing: true;
-            onPaint: {
-                eval(editor.text);
-            }
-        }
-    }
-
-    Rectangle {
-        height: parent.height
-        width: parent.width * 0.45
-        anchors.left: parent.left
-        antialiasing: true
-        radius: slide.height * 0.03;
-        color: Qt.rgba(0.0, 0.0, 0.0, 0.2);
-
-        clip: true;
-
-        TextEdit {
-            id: editor
-            anchors.fill: parent;
-            anchors.margins: 10
-
-            font.pixelSize: 16
-            color: "white"
-            font.family: "courier"
-            font.bold: true
-
-            text:
-"var ctx = canvas.getContext('2d');
-ctx.save();
-ctx.clearRect(0, 0, canvas.width, canvas.height);
-ctx.strokeStyle = 'palegreen'
-ctx.fillStyle = 'limegreen';
-ctx.lineWidth = 5;
-
-ctx.beginPath();
-ctx.moveTo(100, 100);
-ctx.lineTo(300, 100);
-ctx.lineTo(100, 200);
-ctx.closePath();
-ctx.fill();
-ctx.stroke();
-
-ctx.fillStyle = 'aquamarine'
-ctx.font = '20px sansserif'
-ctx.fillText('HTML Canvas API!', 100, 300);
-ctx.fillText('Imperative Drawing!', 100, 340);
-
-ctx.restore();
-"
-                onTextChanged: canvas.requestPaint();
-
-                onCursorRectangleChanged: {
-                    emitter.burst(10)
-
-                }
-
-                ParticleSystem {
-                    id: sys1
-                    running: slide.visible
-                }
-
-                ImageParticle {
-                    system: sys1
-                    source: "images/particle.png"
-                    color: "white"
-                    colorVariation: 0.2
-                    alpha: 0
-                }
-
-                Emitter {
-                    id: emitter
-                    system: sys1
-
-                    x: editor.cursorRectangle.x - editor.cursorRectangle.height / 2;
-                    y: editor.cursorRectangle.y
-                    width: editor.cursorRectangle.height
-                    height: editor.cursorRectangle.height
-                    enabled: false
-
-                    lifeSpan: 1000
-
-                    velocity: PointDirection { xVariation: 30; yVariation: 30; }
-                    acceleration: PointDirection {xVariation: 30; yVariation: 30; y: 100 }
-
-                    endSize: 0
-
-                    size: 4
-                    sizeVariation: 2
-                }
-
-        }
-
-    }
-}
diff --git a/experimental/qt5-intro-android/DemoMain.qml b/experimental/qt5-intro-android/DemoMain.qml
deleted file mode 100644
index 6c3ab5c..0000000
--- a/experimental/qt5-intro-android/DemoMain.qml
+++ /dev/null
@@ -1,139 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-     id: demoMain;
-
-    property bool useDropShadow: true;
-    property bool useSwirls: true;
-    property bool useSimpleGradient: false;
-    property bool autorun: false;
-
-    width: 1280
-    height: 720
-
-    NoisyGradient {
-        anchors.fill: parent;
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: Qt.rgba(0.64 * 0.6, 0.82 * 0.6, 0.15 * 0.6) }
-            GradientStop { position: 1.0; color: "black" }
-        }
-        visible: !parent.useSimpleGradient
-    }
-
-    Rectangle {
-        anchors.fill: parent;
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: Qt.rgba(0.64, 0.82, 0.15) }
-            GradientStop { position: 1.0; color: "black" }
-        }
-        visible: parent.useSimpleGradient;
-    }
-
-    Rectangle {
-        id: colorTable
-        width: 1
-        height: 46
-        color: "transparent"
-
-        Column {
-            spacing: 2
-            y: 1
-            Rectangle { width: 1; height: 10; color: "white" }
-            Rectangle { width: 1; height: 10; color: Qt.rgba(0.64 * 1.4, 0.82 * 1.4, 0.15 * 1.4, 1); }
-            Rectangle { width: 1; height: 10; color: Qt.rgba(0.64, 0.82, 0.15); }
-            Rectangle { width: 1; height: 10; color: Qt.rgba(0.64 * 0.7, 0.82 * 0.7, 0.15 * 0.7); }
-        }
-
-        layer.enabled: true
-        layer.smooth: true
-        visible: false;
-    }
-
-
-    Swirl
-    {
-        x: 0;
-        width: parent.width
-        height: Math.min(parent.height, parent.width) * 0.2
-        anchors.bottom: parent.bottom;
-        amplitude: height * 0.2;
-        colorTable: colorTable;
-        speed: 0.2;
-        opacity: 0.3
-        visible: parent.useSwirls;
-    }
-
-    Timer {
-        interval: 20000
-        running: parent.autorun
-        repeat: true
-
-        onTriggered: {
-            var from = slides.currentSlide;
-            var to = from == slides.slides.length - 1 ? 1 : from + 1;
-            slides.switchSlides(slides.slides[from], slides.slides[to], true);
-            slides.currentSlide = to;
-	}
-    }
-
-    SlideDeck {
-        id: slides
-        titleColor: "white"
-        textColor: "white"
-        anchors.fill: parent
-        layer.enabled: parent.useDropShadow
-        layer.effect: DropShadow {
-            horizontalOffset: slides.width * 0.005;
-            verticalOffset: slides.width * 0.005;
-            radius: 16.0
-            samples: 16
-            fast: true
-            color: Qt.rgba(0.0, 0.0, 0.0, 0.7);
-        }
-    }
-
-
-
-}
diff --git a/experimental/qt5-intro-android/EffectsSlide.qml b/experimental/qt5-intro-android/EffectsSlide.qml
deleted file mode 100644
index 0355284..0000000
--- a/experimental/qt5-intro-android/EffectsSlide.qml
+++ /dev/null
@@ -1,203 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-import "presentation"
-
-Slide {
-    id: slide
-
-    title: "Qt Graphical Effects"
-    writeInText: "The Qt Graphical Effects module includes a wide range of effects:"
-
-    property real t;
-    SequentialAnimation on t {
-        NumberAnimation { from: 0; to: 1; duration: 5000; easing.type: Easing.InOutCubic }
-        NumberAnimation { from: 1; to: 0; duration: 5000; easing.type: Easing.InOutCubic }
-        loops: Animation.Infinite
-        running: slide.visible;
-    }
-
-    SequentialAnimation {
-        PropertyAction { target: grid; property: "opacity"; value: 0 }
-        PauseAnimation { duration: 1500 }
-        NumberAnimation { target: grid; property: "opacity"; to: 1; duration: 2000; easing.type: Easing.InOutCubic }
-        running: slide.visible;
-    }
-
-    Grid {
-        id: grid;
-
-        opacity: 0;
-
-        width: parent.width
-        height: parent.height * 0.84
-        anchors.bottom: parent.bottom;
-
-        property real cw: width / columns
-        property real ch: height / rows;
-
-        property int fontSize: slide.baseFontSize * 0.5
-
-        columns: 4
-        rows: 2
-
-        Item {
-            width: grid.cw
-            height: grid.ch
-            Text { text: "Original"; color: "white"; font.pixelSize: grid.fontSize; anchors.horizontalCenter: noEffect.horizontalCenter }
-            Image {
-                id: noEffect;
-                source: "images/butterfly.png"
-                width: grid.cw * 0.9
-                fillMode: Image.PreserveAspectFit
-            }
-        }
-
-        Column {
-            Glow {
-                id: glowEffect
-                radius: 4
-                samples: 4
-                spread: slide.t
-                source: noEffect
-                width: grid.cw * 0.9
-                height: width;
-                Text { text: "Glow"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; }
-            }
-        }
-
-        Column {
-            InnerShadow {
-                id: innerShadowEffect
-                radius: slide.t * 16;
-                samples: 16
-                color: "black"
-                source: noEffect
-                width: grid.cw * 0.9
-                height: width;
-                Text { text: "InnerShadow"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; }
-            }
-        }
-
-        Column {
-            GaussianBlur {
-                id: blurEffect
-                radius: slide.t * samples;
-                samples: 8
-                source: noEffect
-                width: grid.cw * 0.9
-                height: width;
-                Text { text: "GaussianBlur"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; }
-            }
-        }
-
-        Column {
-            ThresholdMask {
-                id: thresholdEffect
-                maskSource: Image { source: "images/fog.png" }
-                threshold: slide.t * 0.5 + 0.2;
-                spread: 0.2
-                source: noEffect
-                width: grid.cw * 0.9
-                height: width;
-                Text { text: "ThresholdMask"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; }
-            }
-        }
-
-        Column {
-            BrightnessContrast {
-                id: brightnessEffect
-                brightness: Math.sin(slide.t * 2 * Math.PI) * 0.5;
-                contrast: Math.sin(slide.t * 4 * Math.PI) * 0.5;
-                source: noEffect
-                width: grid.cw * 0.9
-                height: width;
-                Text { text: "BrightnessContrast"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; }
-            }
-        }
-
-        Column {
-            Colorize {
-                id: colorizeEffect
-                hue: slide.t
-                source: noEffect
-                width: grid.cw * 0.9
-                height: width;
-                Text { text: "Colorize"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; }
-            }
-        }
-
-        Column {
-            OpacityMask {
-
-                Item {
-                    id: maskSource;
-                    anchors.fill: parent;
-                    Rectangle {
-                        anchors.fill: parent;
-                        opacity: slide.t;
-                    }
-
-                    Text {
-                        text: "Qt 5"
-                        font.pixelSize: parent.height * 0.15
-                        font.bold: true;
-                        font.underline: true;
-                        anchors.centerIn: parent;
-                        rotation: 70
-                    }
-                    visible: false;
-                }
-
-                id: opacityMaskEffect
-                source: noEffect
-                maskSource: maskSource;
-                width: grid.cw * 0.9
-                height: width;
-                Text { text: "OpacityMask"; color: "white"; font.pixelSize: grid.fontSize; anchors.top: parent.top; anchors.horizontalCenter: parent.horizontalCenter; }
-            }
-        }
-    }
-
-}
diff --git a/experimental/qt5-intro-android/ExamplesSlide.qml b/experimental/qt5-intro-android/ExamplesSlide.qml
deleted file mode 100644
index dd70c21..0000000
--- a/experimental/qt5-intro-android/ExamplesSlide.qml
+++ /dev/null
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "presentation"
-
-Slide
-{
-    id: slide
-
-    title: "Qt Quick 2 Interactive Demos"
-    shouldTimeout: false
-
-    Row {
-        id: exampleRow
-        anchors.centerIn: parent
-        height: parent.height
-        width: item1.width + spacing * 3 + (item2.visible ? item2.width : 0) + (item3.visible ? item3.width : 0)
-
-        spacing: Math.max(10, (width - 320 * 3) / 2)
-
-        Item {
-            id: item1
-            width: 320
-            height: 480
-            clip: true
-            MouseArea {
-                anchors.fill: parent
-
-                Loader {
-                    id: load1
-                }
-            }
-
-        }
-
-        Item {
-            id: item2
-            width: 320
-            height: 480
-            visible: masterWidth > masterHeight
-            clip: true;
-            MouseArea {
-                anchors.fill: parent
-                Loader {
-                    id: load2
-                }
-            }
-        }
-
-        Item {
-            id: item3
-            width: 320
-            height: 480
-            visible: masterWidth > masterHeight
-            clip: true;
-            MouseArea {
-                Loader {
-                    id: load3
-                }
-                anchors.fill: parent
-            }
-        }
-    }      
-
-    Text {
-        id: showMore
-        text: "Rotate the device for more"
-        color: textColor
-        anchors.top: exampleRow.bottom
-        font.family: slides[currentSlide].fontFamily
-        font.pixelSize: slides[currentSlide].fontSize * 0.6
-        visible: masterWidth < masterHeight
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-
-    onVisibleChanged: {
-        if (visible) {
-            load1.source = "maroon/Maroon.qml"
-            load2.source = "samegame/Samegame.qml"
-            load3.source = "calqlatr/Calqlatr.qml"
-        } else {
-            load1.source = ""
-            load2.source = ""
-            load3.source = ""
-        }
-    }
-}
diff --git a/experimental/qt5-intro-android/FontSlide.qml b/experimental/qt5-intro-android/FontSlide.qml
deleted file mode 100644
index ce98779..0000000
--- a/experimental/qt5-intro-android/FontSlide.qml
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "presentation"
-
-Slide {
-    id: fontSlide;
-    title: "Qt Quick -  Fonts"
-    writeInText: "The default font rendering in Qt Quick 2.0 uses distance fields, making\nit possible to do fully transformable text with subpixel positioning and\nsubpixel antialiasing.
-
-Native font rendering is also an option for applications that want to look native."
-
-    Rectangle {
-        id: textRoot
-        anchors.centerIn: parent
-        anchors.horizontalCenterOffset: parent.width * 0.2
-        anchors.verticalCenterOffset: parent.width * 0.1
-
-        width: 120
-        height: 40
-
-        color: "transparent"
-        border.color: "white"
-        border.width: 1
-
-        Text {
-            anchors.centerIn: parent
-
-            text: "Awesome!"
-            color: "white"
-
-            font.pixelSize: 20;
-
-            SequentialAnimation on scale {
-                NumberAnimation { to: 4; duration: 2508; easing.type: Easing.OutElastic }
-                NumberAnimation { to: 1; duration: 2508; easing.type: Easing.OutElastic }
-                PauseAnimation { duration: 1000 }
-                loops: Animation.Infinite
-                running: fontSlide.visible
-            }
-
-            NumberAnimation on rotation { from: 0; to: 360; duration: 10000; loops: Animation.Infinite; easing.type: Easing.InOutCubic; running: fontSlide.visible }
-        }
-    }
-
-    ShaderEffectSource {
-        width: textRoot.width
-        height: textRoot.height
-        sourceItem: textRoot
-        anchors.bottom: parent.bottom;
-        anchors.left: parent.left;
-        smooth: false
-        transformOrigin: Item.BottomLeft;
-
-        visible: true
-
-        scale: 4;
-    }
-
-}
diff --git a/experimental/qt5-intro-android/NoisyGradient.qml b/experimental/qt5-intro-android/NoisyGradient.qml
deleted file mode 100644
index 904f14e..0000000
--- a/experimental/qt5-intro-android/NoisyGradient.qml
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-ShaderEffect {
-
-    id: effectRoot;
-
-    width: 1280
-    height: 720
-
-    property Gradient gradient: Gradient {
-        GradientStop { position: 0; color: "white" }
-        GradientStop { position: 0.4; color: "blue" }
-        GradientStop { position: 1.0; color: "black" }
-    }
-
-    Rectangle {
-        id: colorTable
-        width: 1
-        height: 128;
-
-        gradient: effectRoot.gradient;
-
-        layer.enabled: true
-        layer.smooth: true
-
-        visible: false;
-    }
-
-    property variant source: colorTable;
-
-    blending: false;
-
-    fragmentShader:"
-                #ifdef GL_ES
-                precision lowp float;
-                #endif
-
-                uniform lowp sampler2D source;
-                uniform lowp float qt_Opacity;
-                varying highp vec2 qt_TexCoord0;
-
-                // Noise function from: http://stackoverflow.com/questions/4200224/random-noise-functions-for-glsl
-                float rand(vec2 n) {
-                    return 0.5 + 0.5 * fract(sin(dot(n.xy, vec2(12.9898, 78.233))) * 43758.5453);
-                }
-
-                void main() {
-                    lowp float len = clamp(length(vec2(0.5, 0.0) - qt_TexCoord0), 0.0, 1.0);
-                    gl_FragColor = texture2D(source, vec2(0, len)) * qt_Opacity + rand(qt_TexCoord0) * 0.05;
-                }
-"
-}
diff --git a/experimental/qt5-intro-android/NormalMapGenerator.qml b/experimental/qt5-intro-android/NormalMapGenerator.qml
deleted file mode 100644
index c6f55c7..0000000
--- a/experimental/qt5-intro-android/NormalMapGenerator.qml
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-ShaderEffect {
-    id: effectRoot;
-
-    property alias source: blurShader.source;
-
-    GaussianBlur
-    {
-        id: blurShader;
-        width: source != undefined ? source.width : 0
-        height: source != undefined ? source.height : 0
-        samples: 8
-        radius: 8
-
-        layer.enabled: true;
-        layer.smooth: true;
-
-        visible: false;
-    }
-
-    width: 256
-    height: 128
-
-    property variant tex: blurShader;
-    property size pixelSize: Qt.size(1 / blurShader.width, 1 / blurShader.height);
-
-    fragmentShader: "
-        #ifdef GL_ES
-        precision lowp float;
-        #endif
-
-        uniform lowp float qt_Opacity;
-        uniform lowp sampler2D tex;
-        uniform highp vec2 pixelSize;
-        varying highp vec2 qt_TexCoord0;
-        void main() {
-
-            lowp vec2 xps = vec2(pixelSize.x, 0.0);
-            vec3 vx = vec3(1, 0, texture2D(tex, qt_TexCoord0 + xps).x - texture2D(tex, qt_TexCoord0 - xps).x);
-
-            lowp vec2 yps = vec2(0.0, pixelSize.y);
-            vec3 vy = vec3(0, 1, texture2D(tex, qt_TexCoord0 + yps).x - texture2D(tex, qt_TexCoord0 - yps).x);
-
-            vec3 n = normalize(cross(vx, vy)) * 0.5 + 0.5;
-
-            gl_FragColor = vec4(n, 1);
-        }
-    "
-
-}
diff --git a/experimental/qt5-intro-android/OpacityTransitionPresentation.qml b/experimental/qt5-intro-android/OpacityTransitionPresentation.qml
deleted file mode 100644
index 1573c66..0000000
--- a/experimental/qt5-intro-android/OpacityTransitionPresentation.qml
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-import "presentation"
-
-Presentation {
-
-    id: deck
-
-    width: 1280
-    height: 720
-
-    property bool inTransition: false;
-
-    property variant fromSlide;
-    property variant toSlide;
-
-    property int transitionTime: 500;
-
-    SequentialAnimation {
-        id: forwardTransition
-        PropertyAction { target: deck; property: "inTransition"; value: true }
-        PropertyAction { target: toSlide; property: "visible"; value: true }
-        ParallelAnimation {
-            NumberAnimation { target: fromSlide; property: "opacity"; from: 1; to: 0; duration: deck.transitionTime; easing.type: Easing.OutQuart }
-            NumberAnimation { target: fromSlide; property: "scale"; from: 1; to: 1.1; duration: deck.transitionTime; easing.type: Easing.InOutQuart }
-            NumberAnimation { target: toSlide; property: "opacity"; from: 0; to: 1; duration: deck.transitionTime; easing.type: Easing.InQuart }
-            NumberAnimation { target: toSlide; property: "scale"; from: 0.7; to: 1; duration: deck.transitionTime; easing.type: Easing.InOutQuart }
-        }
-        PropertyAction { target: fromSlide; property: "visible"; value: false }
-        PropertyAction { target: fromSlide; property: "scale"; value: 1 }
-        PropertyAction { target: deck; property: "inTransition"; value: false }
-    }
-    SequentialAnimation {
-        id: backwardTransition
-        running: false
-        PropertyAction { target: deck; property: "inTransition"; value: true }
-        PropertyAction { target: toSlide; property: "visible"; value: true }
-        ParallelAnimation {
-            NumberAnimation { target: fromSlide; property: "opacity"; from: 1; to: 0; duration: 1; easing.type: Easing.OutQuart }
-            NumberAnimation { target: fromSlide; property: "scale"; from: 1; to: 0.7; duration: 1; easing.type: Easing.InOutQuart }
-            NumberAnimation { target: toSlide; property: "opacity"; from: 0; to: 1; duration: 1; easing.type: Easing.InQuart }
-            NumberAnimation { target: toSlide; property: "scale"; from: 1.1; to: 1; duration: 1; easing.type: Easing.InOutQuart }
-        }
-        PropertyAction { target: fromSlide; property: "visible"; value: false }
-        PropertyAction { target: fromSlide; property: "scale"; value: 1 }
-        PropertyAction { target: deck; property: "inTransition"; value: false }
-    }
-
-    function switchSlides(from, to, forward)
-    {
-        if (deck.inTransition)
-            return false
-
-        deck.fromSlide = from
-        deck.toSlide = to
-
-        if (forward)
-            forwardTransition.running = true
-        else
-            backwardTransition.running = true
-
-        return true
-    }
-}
diff --git a/experimental/qt5-intro-android/ParticleSlide.qml b/experimental/qt5-intro-android/ParticleSlide.qml
deleted file mode 100644
index 4dadcae..0000000
--- a/experimental/qt5-intro-android/ParticleSlide.qml
+++ /dev/null
@@ -1,87 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "presentation"
-
-Slide
-{
-    id: slide
-
-    title: "Qt Quick -  Particle System"
-    shouldTimeout: false
-
-    Row {
-        anchors.fill: parent
-
-        SequentialAnimation on opacity {
-            running: slide.visible;
-            PropertyAction { value: 0 }
-            PauseAnimation { duration: 2000; }
-            NumberAnimation { to: 1; duration: 1000 }
-        }
-
-        spacing: (width - 320 * 3) / 2
-
-        Loader {
-            id: load1
-        }
-
-        Loader {
-            id: load2
-        }
-
-        Loader {
-            id: load3
-        }
-    }
-
-    onVisibleChanged: {
-        if (visible) {
-            load1.source = "particles/velocityfrommotion.qml"
-            load2.source = "particles/customemitter.qml"
-            load3.source = "particles/emitmask.qml"
-        } else {
-            load1.source = ""
-            load2.source = ""
-            load3.source = ""
-        }
-    }
-}
diff --git a/experimental/qt5-intro-android/README b/experimental/qt5-intro-android/README
deleted file mode 100644
index 6b3f927..0000000
--- a/experimental/qt5-intro-android/README
+++ /dev/null
@@ -1,51 +0,0 @@
-This project contains quick tour of Qt 5.0, primarily focusing on its
-graphical capabilities.
-
-
-
-------------------------------------------------------------------------
- Requirements:
-
- - Qt 5, including QtDeclarative, QtGraphicalEffects and QtMultimedia.
-   Commercial URL: http://qt.digia.com 
-   Open Source URL: http://qt-project.org
-
- - The QML Presentation System: 
-   URL: https://qt.gitorious.org/qt-labs/qml-presentation-system
-   git: git clone https://git.gitorious.org/qt-labs/qml-presentation-system.git
-
- - A movie file called 'bunny.mov' in the same directory as the
-   main.qml file.  The demo will run without, but the Video slide will
-   not show anything.
-
-
-
-------------------------------------------------------------------------
- Running:
-
-To run the demo, start it using the Qt Quick 2.0 'qmlscene' tool. 
-
-> qmlscene main.qml
-
-The demo includes a slightly fancy fullscreen gradient and a rather
-computationally intensive drop shadow which can be too much for
-low-end GPUs. On these systems, one could try to use the 'lofi'
-launcher instead.
-
-> qmlscene main_lofi.qml
-
-It is possible to tweak the parameters of the main file also.
-
-
-
-------------------------------------------------------------------------
- Troubleshooting:
-
-For a -developer-build of Qt, the webkit plugin and QtWebProcess will
-be located inside the qtwebkit module, rather than inside QtBase, the plugin
-must be added to the QML import path and the path to QtWebProcess must be
-added to PATH for the demo to run.
-
-The slides have been written for the resolution 1280x720. When resized
-some of the spacing and content will look a bit odd. Any patches to 
-fix this will be welcomed :)
\ No newline at end of file
diff --git a/experimental/qt5-intro-android/ShaderSlide.qml b/experimental/qt5-intro-android/ShaderSlide.qml
deleted file mode 100644
index 52a9247..0000000
--- a/experimental/qt5-intro-android/ShaderSlide.qml
+++ /dev/null
@@ -1,197 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "presentation"
-
-
-Slide {
-    id: slide
-
-    title: "Qt Quick - ShaderEffect"
-
-    writeInText: "Harness the raw power of the graphics processor. The ShaderEffect\nelement lets you write GLSL inline in your QML files."
-
-    Image {
-        id: sourceItem
-        source: "images/ally.png"
-        visible: false
-    }
-
-    SequentialAnimation {
-        id: kickoffAnimation
-
-        // setup
-        PropertyAction { target: rotationAnimation; property: "running"; value: false }
-        PropertyAction { target: timeAnimation; property: "running"; value: false }
-        PropertyAction { target: shader; property: "amp"; value: 0 }
-        PropertyAction { target: shader; property: "xrot"; value: 0 }
-        PropertyAction { target: shader; property: "zrot"; value: 0 }
-        PropertyAction { target: shader; property: "time"; value: 0 }
-        PropertyAction { target: shader; property: "scale"; value: 1; }
-        PropertyAction { target: rotationAnimation; property: "running"; value: false }
-        PropertyAction { target: timeAnimation; property: "running"; value: false }
-        // short pause
-        PauseAnimation { duration: 2000 }
-        // get started...
-        ParallelAnimation {
-            NumberAnimation { target: shader; property: "xrot"; to: 2 * Math.PI / 8; duration: 1000; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: shader; property: "amp"; to: 0.1; duration: 1000; easing.type: Easing.InOutCubic }
-//            NumberAnimation { target: shader; property: "scale"; to: 1.5; duration: 1000; easing.type: Easing.InOutCubic }
-            PropertyAction { target: rotationAnimation; property: "running"; value: true }
-            PropertyAction { target: timeAnimation; property: "running"; value: true }
-        }
-
-        running: slide.visible;
-    }
-
-
-    ShaderEffect {
-        id: shader
-        width: height
-        height: Math.min(parent.height, parent.width)
-        anchors.centerIn: parent;
-        anchors.verticalCenterOffset: Math.min(slide.height, slide.width) * 0.1
-
-        blending: true
-
-        mesh: "50x50"
-
-        property variant size: Qt.size(width, height);
-
-        property variant source: sourceItem;
-
-        property real amp: 0
-
-        property real xrot: 0; // 2 * Math.PI / 8;
-//        NumberAnimation on xrot { from: 0; to: Math.PI * 2; duration: 3000; loops: Animation.Infinite }
-
-        property real zrot: 0
-        NumberAnimation on zrot {
-            id: rotationAnimation
-            from: 0;
-            to: Math.PI * 2;
-            duration: 20000;
-            loops: Animation.Infinite
-            easing.type: Easing.InOutCubic
-            running: false;
-        }
-
-        property real time: 0
-        NumberAnimation on time {
-            id: timeAnimation
-            from: 0;
-            to: Math.PI * 2;
-            duration: 3457;
-            loops: Animation.Infinite
-            running: false;
-        }
-
-        vertexShader: "
-        attribute highp vec4 qt_Vertex;
-        attribute highp vec2 qt_MultiTexCoord0;
-        uniform highp mat4 qt_Matrix;
-        uniform highp float xrot;
-        uniform highp float zrot;
-        uniform highp vec2 size;
-        uniform highp float time;
-        uniform highp float amp;
-        varying lowp vec2 v_TexCoord;
-        varying lowp float v_light;
-        void main() {
-            highp float xcosa = cos(xrot);
-            highp float xsina = sin(xrot);
-
-            highp mat4 xrot = mat4(1, 0, 0, 0,
-                                   0, xcosa, xsina, 0,
-                                   0, -xsina, xcosa, 0,
-                                   0, 0, 0, 1);
-
-            highp float zcosa = cos(zrot);
-            highp float zsina = sin(zrot);
-
-            highp mat4 zrot = mat4(zcosa, zsina, 0, 0,
-                                   -zsina, zcosa, 0, 0,
-                                   0, 0, 1, 0,
-                                   0, 0, 0, 1);
-
-            highp float near = 2.;
-            highp float far = 6.;
-            highp float fmn = far - near;
-
-            highp mat4 proj = mat4(near, 0, 0, 0,
-                                   0, near, 0, 0,
-                                   0, 0, -(far + near) / fmn, -1.,
-                                   0, 0, -2. * far * near / fmn, 1);
-
-            highp mat4 model = mat4(2, 0, 0, 0,
-                                    0, 2, 0, 0,
-                                    0, 0, 2, 0,
-                                    0, -.5, -4, 1);
-
-            vec4 nLocPos = vec4(qt_Vertex.xy * 2.0 / size - 1.0, 0, 1);
-            nLocPos.z = cos(nLocPos.x * 5. + time) * amp;
-
-            vec4 pos = proj * model * xrot * zrot * nLocPos;
-            pos = vec4(pos.xyx/pos.w, 1);
-
-            gl_Position = qt_Matrix * vec4((pos.xy + 1.0) / 2.0 * size , 0, 1);
-
-            v_TexCoord = qt_MultiTexCoord0;
-
-
-            v_light = dot(normalize(vec3(-sin(nLocPos.x * 5.0 + time) * 5.0 * amp, 0, -1)), vec3(0, 0, -1));
-        }
-        "
-
-        fragmentShader: "
-            uniform lowp sampler2D source;
-            uniform lowp float qt_Opacity;
-            varying highp vec2 v_TexCoord;
-            varying lowp float v_light;
-            void main() {
-                highp vec4 c = texture2D(source, v_TexCoord);
-                gl_FragColor = (vec4(pow(v_light, 16.0)) * 0.3 + c) * qt_Opacity;
-            }
-        "
-
-    }
-
-}
diff --git a/experimental/qt5-intro-android/SlideDeck.qml b/experimental/qt5-intro-android/SlideDeck.qml
deleted file mode 100644
index be173fd..0000000
--- a/experimental/qt5-intro-android/SlideDeck.qml
+++ /dev/null
@@ -1,254 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-import "presentation"
-
-OpacityTransitionPresentation {
-    id: presentation
-
-    width: 1280
-    height: 720
-
-    transitionTime: 1000
-
-
-    /********************************************************************************
-     *
-     * Introduction
-     *
-     */
-
-/*
-    Rectangle {
-        id: openingSlideBlackout
-        color: "black"
-        anchors.fill: parent;
-        Behavior on opacity { NumberAnimation { duration: 1000 } }
-    }
-
-    onCurrentSlideChanged: {
-        if (currentSlide < 2)
-            openingSlideBlackout.opacity = 1;
-        else
-            openingSlideBlackout.opacity = 0;
-    }
-
-
-    Slide {
-
-    }
-*/
-
-    Slide {
-        id: introSlide
-
-        centeredText: "The following is a quick tour of what is new in Qt 5.
-
-It is an application written with Qt Quick, based on Qt 5."
-
-        + (masterWidth < masterHeight ? "
-
-For an optimal experience, try watching it in the landscape orientation.
-
-" : " ")
-
-+ "We hope you will enjoy Qt 5 as much as we have enjoyed creating it.
-
-[tap to advance]"
-
-//        Image {
-//            source: "images/qt-logo.png"
-//            opacity: 0.4
-//            z: -1
-//            anchors.centerIn: parent
-//        }
-    }
-
-    Slide {
-        centeredText: "Introducing"
-        fontScale: 2
-        timeout: 2000
-    }
-
-    Slide {
-        centeredText: "Qt 5"
-        fontScale: 4;
-        timeout: 2000
-    }
-
-
-    Slide {
-        writeInText: "OpenGL-based scene graph for Qt Quick 2.0 - providing velvet animations, particles and impressive graphical effects
-
-Multimedia support
-
-Preliminary support for Android and iOS"
-    }
-
-    Slide {
-        writeInText: "C++ language features - template-based connect(), C++11 support
-
-Connectivity and Networking - DNS lookup, improved IPv6 support
-
-JSON Support - Fast parser and writer, binary format support"
-    }
-
-    Slide {
-        writeInText: "Modularization of the Qt libraries - sanitizing our codebase and simplifying deployment
-
-Qt Platform Abstraction - Unifying the Qt codebase across platforms, minimizing the porting effort for new platforms
-
-Wayland support - Wayland-compatible Qt backend and compositor framework"
-    }
-
-    Slide {
-         title: "Qt for Android"
-         writeInText:
- "
-Qt 5.1 allows you to write Android apps using Qt Quick or Qt Widgets.
-
-We support QML media player functionality, as well as a set of commonly used sensors in QtSensors.
-
-With Qt Creator you can develop your apps, deploy them directly to a device, and debug them on the device.
- "
-     }
-
- Slide {
-     writeInText:
- "For this preliminary release, we are focusing on the developer experience, working to enable Qt developers to easily run and test their applications on Android devices.
-
-You can easily deploy your app to an app store with Qt 5.1, but we recommend waiting until Qt 5.2 for an even smoother experience."
-     }
-
-
-    /********************************************************************************
-     *
-     * Qt Quick Graphics Stack
-     *
-     */
-    ExamplesSlide { }
-
-    FontSlide { }
-    // CanvasSlide { }
-    ParticleSlide { }
-    ShaderSlide { }
-
-
-
-    /********************************************************************************
-     *
-     * Qt Graphical Effects
-     *
-     */
-
-    EffectsSlide {}
-
-//    /********************************************************************************
-//     *
-//     * Multimedia
-//     *
-//     */
-
-//    Slide {
-//        title: "Qt Multimedia"
-//        writeInText: "The Qt Multimedia module is implemented on all our major platforms, including Windows, Mac OS X and Linux.
-
-//It contains both a C++ API for use with existing Qt Widgets based applications and a QML API for use with Qt Quick 2.0.
-
-//The features include recording and playback of video and audio and also use of camera.
-
-//It also integrates nicely with the Qt Graphical Effects module."
-//    }
-
-    VideoSlide { }
-//    CameraSlide { }
-
-
-
-
-    /********************************************************************************
-     *
-     * WebKit
-     *
-     */
-
-//    WebkitSlide { }
-
-
-
-    /********************************************************************************
-     *
-     * The End
-     *
-     */
-
-    Slide {
-        title: "Links"
-        contentFormat: Text.RichText
-        content: [
-            "Qt Project: <a style=\"color: #ffffff\" href=\"http://qt-project.org\">qt-project.org</a>",
-            "Qt by Digia: <a style=\"color: #ffffff\" href=\"http://qt.digia.com\">qt.digia.com</a>",
-            "Follow us on Twitter",
-            "  <a style=\"color: #ffffff\" href=\"https://twitter.com/qtproject\">@QtProject</a>",
-            "  <a style=\"color: #ffffff\" href=\"https://twitter.com/QtbyDigia\">@QtByDigia</a>",
-            "Find us on Facebook:",
-            "  <a style=\"color: #ffffff\" href=\"https://www.facebook.com/QtProject\">Qt Project</a>",
-            "  <a style=\"color: #ffffff\" href=\"https://www.facebook.com/Qt\">Qt by Digia</a>",
-                 ];
-
-        Image {
-            z: -1
-            opacity: 0.7
-            source: "images/qt-logo.png"
-            width: parent.width / 3
-            anchors.top: parent.top
-            anchors.right: parent.right
-            anchors.rightMargin: parent.width * 0.15
-            fillMode: Image.PreserveAspectFit
-            visible: parent.masterWidth > parent.masterHeight
-        }
-
-    }
-
-}
diff --git a/experimental/qt5-intro-android/Swirl.qml b/experimental/qt5-intro-android/Swirl.qml
deleted file mode 100644
index 710f04b..0000000
--- a/experimental/qt5-intro-android/Swirl.qml
+++ /dev/null
@@ -1,116 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-ShaderEffect {
-    id: shader
-
-    width: 400
-    height: 300
-
-    property real speed: 1
-
-    property color d: Qt.rgba(Math.random() * 0.7,
-                              Math.random() * 0.5,
-                              Math.random() * 0.7,
-                              Math.random() * 0.5)
-    property real tx
-    NumberAnimation on tx { from: 0; to: Math.PI * 2; duration: (Math.random() * 30 + 30) * 1000 / speed; loops: Animation.Infinite }
-    property real ty
-    NumberAnimation on ty { from: 0; to: Math.PI * 2; duration: (Math.random() * 30 + 30) * 1000 / speed; loops: Animation.Infinite }
-    property real tz
-    NumberAnimation on tz { from: 0; to: Math.PI * 2; duration: (Math.random() * 30 + 30) * 1000 / speed; loops: Animation.Infinite }
-    property real tw
-    NumberAnimation on tw { from: 0; to: Math.PI * 2; duration: (Math.random() * 30 + 30) * 1000 / speed; loops: Animation.Infinite }
-
-    property real amplitude: height / 2
-
-    property variant colorTable: ShaderEffectSource { sourceItem: Rectangle { width: 4; height: 4; color: "green" } }
-
-    fragmentShader: "
-    uniform lowp float qt_Opacity;
-    uniform lowp sampler2D colorTable;
-    varying highp vec2 qt_TexCoord0;
-    varying lowp float xx;
-
-    void main() {
-        gl_FragColor = texture2D(colorTable, qt_TexCoord0);
-        gl_FragColor.xyz += xx * 0.1;
-        gl_FragColor *= qt_Opacity;
-    }
-    "
-
-    vertexShader: "
-    uniform lowp vec4 d;
-    uniform highp float tx;
-    uniform highp float ty;
-    uniform highp float tz;
-    uniform highp float tw;
-    uniform highp float amplitude;
-    uniform highp mat4 qt_Matrix;
-    attribute highp vec4 qt_Vertex;
-    attribute highp vec2 qt_MultiTexCoord0;
-    varying highp vec2 qt_TexCoord0;
-    varying lowp float xx;
-    void main() {
-        highp vec4 pos = qt_Vertex;
-
-        highp float y = sin(-tx       + d.x * qt_MultiTexCoord0.x * 57. + 12. * d.y)
-                      + sin(ty * 2.0 + d.z * qt_MultiTexCoord0.x * 21. + 5. * d.w)
-                      + sin(tz * 4.0 + d.y * qt_MultiTexCoord0.x * 13. + 7.0 * d.x)
-                      + sin(-ty * 8.0 + d.w * qt_MultiTexCoord0.x * 29. + 15. * d.z);
-        highp float x = sin(-tx       + d.x * qt_MultiTexCoord0.x * 213. + 15. * d.y)
-                      + sin(ty * 2.0 + d.z * qt_MultiTexCoord0.x * 107. + 12. * d.w)
-                      + sin(tz * 4.0 + d.y * qt_MultiTexCoord0.x * 13. + 5. * d.x)
-                      + sin(-ty * 8.0 + d.w * qt_MultiTexCoord0.x * 15. + 7. * d.z);
-        xx = x;
-
-        pos.xy += vec2(x * sin(qt_MultiTexCoord0.x * 3.14152) * 0.3,
-                       y * (1.0 - qt_MultiTexCoord0.y)) * amplitude;
-
-        gl_Position = qt_Matrix * pos;
-        qt_TexCoord0 = qt_MultiTexCoord0;
-    }
-    "
-
-    mesh: GridMesh { resolution: Qt.size(width / 10, 4) }
-
-}
diff --git a/experimental/qt5-intro-android/VideoSlide.qml b/experimental/qt5-intro-android/VideoSlide.qml
deleted file mode 100644
index 51d70d0..0000000
--- a/experimental/qt5-intro-android/VideoSlide.qml
+++ /dev/null
@@ -1,123 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtMultimedia 5
-import "presentation"
-
-import QtGraphicalEffects 1.0
-
-Slide {
-
-    id: slide
-
-    title: "Qt Multimedia - Video"
-    focus: true
-    shouldTimeout: false
-
-    Video {
-        id: video
-
-        anchors.fill: parent
-        source: videoPath
-        autoLoad: true
-        volume: presentation.masterVolume
-
-        layer.enabled: true;
-        layer.smooth: true;
-        layer.effect: Displace {
-            displacementSource: normalMap
-            displacement: button.pressed ? 1.0 : 0.0
-            Behavior on displacement {
-                NumberAnimation { duration: 1000 }
-            }
-        }
-    }
-
-    Rectangle {
-        id: theItem;
-        width: 256
-        height: 128
-        color: "transparent"
-        Text {
-            id: label
-            color: "white"
-            text: "Qt 5"
-//            font.family: "Times New Roman"
-            font.bold: true;
-            font.pixelSize: 80
-            anchors.centerIn: parent
-        }
-        visible: false;
-    }
-
-    Keys.onPressed: {
-        console.debug("abc: " + event.key)
-    }
-
-    NormalMapGenerator {
-        anchors.left: theItem.right
-        width: 256
-        height: 128
-        id: normalMap
-        source: theItem;
-        visible: false
-    }
-
-    centeredText: video.hasVideo ? "" : "'" + video.source + "' is not found or cannot be played: " + video.errorString
-
-     onVisibleChanged: {
-         if (slide.visible)
-             video.play();
-         else
-             video.pause();
-     }
-
-     Button {
-         id: button
-         anchors.bottom: video.bottom
-         anchors.horizontalCenter: video.horizontalCenter
-         anchors.bottomMargin: height / 2;
-         label: pressed ? "Remove Effect" : "Displacement Effect";
-         width: height * 4;
-         height: parent.height * 0.1
-     }
-
-}
diff --git a/experimental/qt5-intro-android/WebKitSlideContent.qml b/experimental/qt5-intro-android/WebKitSlideContent.qml
deleted file mode 100644
index ceb103f..0000000
--- a/experimental/qt5-intro-android/WebKitSlideContent.qml
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: For any questions to Digia, please use the contact form at
-** http://qt.digia.com/
-**
-** This file is part of the examples of the Qt Enterprise Embedded.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import QtWebKit 3.0
-
-Item {
-    id: slide
-
-    anchors.fill: parent;
-
-    WebView {
-        id: browser
-        anchors.fill: parent
-        url: editor.text
-
-    // This works around rendering bugs in webkit. CSS animations
-    // and webGL content gets a bad offset, but this hack
-    // clips it so it is not visible. Not ideal, but it kinda works
-    // for now.
-        layer.enabled: true
-        layer.smooth: true
-    }
-
-    Rectangle {
-        border.width: 2
-        border.color: "black"
-        opacity: 0.5
-        color: "black"
-        anchors.fill: editor
-        anchors.margins: -editor.height * 0.2;
-
-        radius: -anchors.margins
-        antialiasing: true
-    }
-
-    TextInput {
-        id: editor
-        anchors.top: browser.bottom;
-        anchors.horizontalCenter: browser.horizontalCenter
-        font.pixelSize: slide.height * 0.05;
-        text: "http://qt.digia.com"
-        onAccepted: browser.reload();
-        color: "white"
-
-        onCursorPositionChanged: {
-            var rect = positionToRectangle(cursorPosition);
-            emitter.x = rect.x;
-            emitter.y = rect.y;
-            emitter.width = rect.width;
-            emitter.height = rect.height;
-            emitter.burst(10);
-        }
-
-        ParticleSystem {
-            id: sys1
-            running: slide.visible
-        }
-
-        ImageParticle {
-            system: sys1
-            source: "images/particle.png"
-            color: "white"
-            colorVariation: 0.2
-            alpha: 0
-        }
-
-        Emitter {
-            id: emitter
-            system: sys1
-
-            enabled: false
-
-            lifeSpan: 2000
-
-            velocity: PointDirection { xVariation: 30; yVariation: 30; }
-            acceleration: PointDirection {xVariation: 30; yVariation: 30; y: 100 }
-
-            endSize: 0
-
-            size: 8
-            sizeVariation: 2
-        }
-    }
-
-}
diff --git a/experimental/qt5-intro-android/WidgetsSlide.qml b/experimental/qt5-intro-android/WidgetsSlide.qml
deleted file mode 100644
index 20f0770..0000000
--- a/experimental/qt5-intro-android/WidgetsSlide.qml
+++ /dev/null
@@ -1,152 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "presentation"
-
-Slide {
-    id: slide
-
-    writeInText: "The Qt Widgets are working better than ever with accessibility\nimprovements and retina display support."
-
-    property int slamTime: 800;
-    property int waitTime: 500;
-
-    y: parent.height * 0.1
-
-    SequentialAnimation {
-        id: widgetAnimation
-        ScriptAction { script: {
-                boxesImage.opacity = 0;
-                mainwindowsImage.opacity = 0;
-                chipsWindow.opacity = 0;
-                stylesWindow.opacity = 0;
-            }
-        }
-        PauseAnimation { duration: 3000 }
-        ParallelAnimation {
-            NumberAnimation { target: boxesImage; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.OutBack }
-            NumberAnimation { target: boxesImage; property: "rotation"; from: 20; to: 10; duration: slide.slamTime; easing.type: Easing.OutBack }
-            NumberAnimation { target: boxesImage; property: "scale"; from: 2; to: 1.5; duration: slide.slamTime; easing.type: Easing.OutBack }
-        }
-        PauseAnimation { duration: slide.waitTime }
-        ParallelAnimation {
-            NumberAnimation { target: mainwindowsImage; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.OutBack }
-            NumberAnimation { target: mainwindowsImage; property: "rotation"; from: -35; to: -20; duration: slide.slamTime; easing.type: Easing.OutBack}
-            NumberAnimation { target: mainwindowsImage; property: "scale"; from: 2; to: 1.5; duration: slide.slamTime; easing.type: Easing.OutBack }
-        }
-        PauseAnimation { duration: slide.waitTime }
-        ParallelAnimation {
-            NumberAnimation { target: chipsWindow; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: chipsWindow; property: "rotation"; from: 10; to: 25; duration: slide.slamTime; easing.type: Easing.OutBack}
-            NumberAnimation { target: chipsWindow; property: "scale"; from: 2.5; to: 1.6; duration: slide.slamTime; easing.type: Easing.OutBack }
-        }
-        PauseAnimation { duration: slide.waitTime }
-        ParallelAnimation {
-            NumberAnimation { target: stylesWindow; property: "opacity"; from: 0; to: 1; duration: slide.slamTime; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: stylesWindow; property: "rotation"; from: 30; to: -15; duration: slide.slamTime; easing.type: Easing.OutBack}
-            NumberAnimation { target: stylesWindow; property: "scale"; from: 1.8; to: 1.4; duration: slide.slamTime; easing.type: Easing.OutBack }
-        }
-        running: false
-    }
-
-    onVisibleChanged: {
-        widgetAnimation.running = slide.visible;
-    }
-
-    Row {
-        x: slide.width * 0.05
-        y: slide.height * 0.65;
-        width: parent.width
-        Image {
-            id: boxesImage;
-            source: "images/widgets_boxes.png"
-            fillMode: Image.PreserveAspectFit
-            width: slide.width * .2
-            antialiasing: true
-            opacity: 0;
-            y: -slide.height * 0.2
-            rotation: 10
-            scale: 1.5;
-        }
-        Image {
-            id: mainwindowsImage
-            source: "images/widgets_mainwindows.png"
-            fillMode: Image.PreserveAspectFit
-            width: slide.width * .2
-	    antialiasing: true
-            opacity: 0
-        }
-        Image {
-            id: chipsWindow
-            source: "images/widgets_chips.png"
-            fillMode: Image.PreserveAspectFit
-            width: slide.width * .2
-            x: slide.width * -0.05
-            y: -slide.height * 0.2
-            antialiasing: true
-            opacity: 0
-        }
-
-        Image {
-            id: stylesWindow
-            source: "images/widgets_styles_fusion.png"
-            fillMode: Image.PreserveAspectFit
-            width: slide.width * .2
-
-            x: slide.width * 1
-            y: -slide.height * 0.1
-            antialiasing: true
-            opacity: 0
-
-            Image {
-                source: "images/widgets_styles_macstyle.png"
-                fillMode: Image.PreserveAspectFit
-                width: slide.width * .2
-
-                x: parent.width * 0.3
-                y: parent.width * 0.1
-                rotation: -20
-                antialiasing: true
-            }
-        }
-    }
-}
-
diff --git a/experimental/qt5-intro-android/android.pro b/experimental/qt5-intro-android/android.pro
deleted file mode 100644
index 8de4a94..0000000
--- a/experimental/qt5-intro-android/android.pro
+++ /dev/null
@@ -1,159 +0,0 @@
-TARGET = qt5launchdemo
-QT += quick multimedia sql
-
-SOURCES += \
-    main.cpp
-
-RESOURCES += \
-    main.qrc
-
-OTHER_FILES += \
-    calqlatr/Calqlatr.qml \
-    calqlatr/content/Button.qml \
-    calqlatr/content/StyleLabel.qml \
-    calqlatr/content/NumberPad.qml \
-    calqlatr/content/Display.qml \
-    calqlatr/content/calculator.js \
-    calqlatr/content/audio/touch.wav \
-    calqlatr/content/images/touch-white.png \
-    calqlatr/content/images/touch-green.png \
-    calqlatr/content/images/settings-selected-b.png \
-    calqlatr/content/images/settings-selected-a.png \
-    calqlatr/content/images/paper-grip.png \
-    calqlatr/content/images/paper-edge-right.png \
-    calqlatr/content/images/paper-edge-left.png \
-    calqlatr/content/images/logo.png \
-    calqlatr/content/images/icon-settings.png \
-    calqlatr/content/images/icon-close.png \
-    calqlatr/content/images/icon-back.png \
-    images/widgets_styles_macstyle.png \
-    images/widgets_styles_fusion.png \
-    images/widgets_mainwindows.png \
-    images/widgets_chips.png \
-    images/widgets_boxes.png \
-    images/qt-logo.png \
-    images/particle.png \
-    images/fog.png \
-    images/displace.png \
-    images/butterfly.png \
-    images/ally.png \
-    maroon/Maroon.qml \
-    maroon/content/SoundEffect.qml \
-    maroon/content/NewGameScreen.qml \
-    maroon/content/InfoBar.qml \
-    maroon/content/GameOverScreen.qml \
-    maroon/content/GameCanvas.qml \
-    maroon/content/BuildButton.qml \
-    maroon/content/logic.js \
-    android/res/values-zh-rTW/strings.xml \
-    android/res/values-et/strings.xml \
-    android/res/values-nb/strings.xml \
-    android/res/values-ro/strings.xml \
-    android/res/values/libs.xml \
-    android/res/values/strings.xml \
-    android/res/layout/splash.xml \
-    android/res/values-fr/strings.xml \
-    android/res/values-pl/strings.xml \
-    android/res/values-ja/strings.xml \
-    android/res/values-el/strings.xml \
-    android/res/values-pt-rBR/strings.xml \
-    android/res/values-es/strings.xml \
-    android/res/values-ms/strings.xml \
-    android/res/values-id/strings.xml \
-    android/res/values-fa/strings.xml \
-    android/res/values-zh-rCN/strings.xml \
-    android/res/values-de/strings.xml \
-    android/res/values-it/strings.xml \
-    android/res/values-rs/strings.xml \
-    android/res/values-ru/strings.xml \
-    android/res/values-nl/strings.xml \
-    android/version.xml \
-    android/AndroidManifest.xml \
-    android/src/org/qtproject/qt5/android/bindings/QtActivity.java \
-    android/src/org/qtproject/qt5/android/bindings/QtApplication.java \
-    android/src/org/kde/necessitas/ministro/IMinistro.aidl \
-    android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
-    android/res/values-zh-rTW/strings.xml \
-    android/res/values-et/strings.xml \
-    android/res/values-nb/strings.xml \
-    android/res/values-ro/strings.xml \
-    android/res/values/libs.xml \
-    android/res/values/strings.xml \
-    android/res/layout/splash.xml \
-    android/res/values-fr/strings.xml \
-    android/res/values-pl/strings.xml \
-    android/res/values-ja/strings.xml \
-    android/res/values-el/strings.xml \
-    android/res/values-pt-rBR/strings.xml \
-    android/res/values-es/strings.xml \
-    android/res/values-ms/strings.xml \
-    android/res/values-id/strings.xml \
-    android/res/values-fa/strings.xml \
-    android/res/values-zh-rCN/strings.xml \
-    android/res/values-de/strings.xml \
-    android/res/values-it/strings.xml \
-    android/res/values-rs/strings.xml \
-    android/res/values-ru/strings.xml \
-    android/res/values-nl/strings.xml \
-    android/version.xml \
-    android/AndroidManifest.xml \
-    android/src/org/qtproject/qt5/android/bindings/QtActivity.java \
-    android/src/org/qtproject/qt5/android/bindings/QtApplication.java \
-    android/src/org/kde/necessitas/ministro/IMinistro.aidl \
-    android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
-    android/res/values-zh-rTW/strings.xml \
-    android/res/values-et/strings.xml \
-    android/res/values-nb/strings.xml \
-    android/res/values-ro/strings.xml \
-    android/res/values/libs.xml \
-    android/res/values/strings.xml \
-    android/res/layout/splash.xml \
-    android/res/values-fr/strings.xml \
-    android/res/values-pl/strings.xml \
-    android/res/values-ja/strings.xml \
-    android/res/values-el/strings.xml \
-    android/res/values-pt-rBR/strings.xml \
-    android/res/values-es/strings.xml \
-    android/res/values-ms/strings.xml \
-    android/res/values-id/strings.xml \
-    android/res/values-fa/strings.xml \
-    android/res/values-zh-rCN/strings.xml \
-    android/res/values-de/strings.xml \
-    android/res/values-it/strings.xml \
-    android/res/values-rs/strings.xml \
-    android/res/values-ru/strings.xml \
-    android/res/values-nl/strings.xml \
-    android/version.xml \
-    android/AndroidManifest.xml \
-    android/src/org/qtproject/qt5/android/bindings/QtActivity.java \
-    android/src/org/qtproject/qt5/android/bindings/QtApplication.java \
-    android/src/org/kde/necessitas/ministro/IMinistro.aidl \
-    android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl \
-    description.txt \
-    README \
-    preview_l.jpg \
-    WidgetsSlide.qml \
-    WebKitSlideContent.qml \
-    WebkitSlide.qml \
-    VideoSlide.qml \
-    Swirl.qml \
-    SlideDeck.qml \
-    ShaderSlide.qml \
-    ParticleSlide.qml \
-    OpacityTransitionPresentation.qml \
-    NormalMapGenerator.qml \
-    NoisyGradient.qml \
-    main.qml \
-    main_hifi.qml \
-    FontSlide.qml \
-    ExamplesSlide.qml \
-    EffectsSlide.qml \
-    DemoMain.qml \
-    CanvasSlide.qml \
-    CameraSlide.qml \
-    Button.qml \
-    presentation/SlideCounter.qml \
-    presentation/Slide.qml \
-    presentation/Presentation.qml \
-    presentation/CodeSlide.qml \
-    presentation/Clock.qml
diff --git a/experimental/qt5-intro-android/android/AndroidManifest.xml b/experimental/qt5-intro-android/android/AndroidManifest.xml
deleted file mode 100644
index 002dae0..0000000
--- a/experimental/qt5-intro-android/android/AndroidManifest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<manifest android:versionCode="2" android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android" package="com.digia.Qt5Intro" android:installLocation="preferExternal">
-    <application android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name" android:icon="@drawable/icon">
-        <activity android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name" android:configChanges="orientation|locale|fontScale|keyboard|keyboardHidden">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-            <meta-data android:resource="@array/qt_sources" android:name="android.app.qt_sources_resource_id"/>
-            <meta-data android:value="@string/repository" android:name="android.app.repository"/>
-            <meta-data android:resource="@array/qt_libs" android:name="android.app.qt_libs_resource_id"/>
-            <meta-data android:resource="@array/bundled_libs" android:name="android.app.bundled_libs_resource_id"/>
-            <meta-data android:value="qt5launchdemo" android:name="android.app.lib_name"/>
-            <!-- Deploy Qt libs as part of package -->
-            <meta-data android:value="1" android:name="android.app.bundle_local_qt_libs"/>
-            <meta-data android:resource="@array/bundled_in_lib" android:name="android.app.bundled_in_lib_resource_id"/>
-            <meta-data android:resource="@array/bundled_in_assets" android:name="android.app.bundled_in_assets_resource_id"/>
-            <!-- Run with local libs -->
-            <meta-data android:value="1" android:name="android.app.use_local_qt_libs"/>
-            <meta-data android:value="/data/local/tmp/qt/" android:name="android.app.libs_prefix"/>
-            <meta-data android:value="libs/libgnustl_shared.so:plugins/mediaservice/libandroidmediaplayer.so:lib/libQt5MultimediaQuick_p.so:lib/libQt5QuickParticles.so:plugins/platforms/android/libqtforandroidGL.so:" android:name="android.app.load_local_libs"/>
-            <meta-data android:value="jar/QtAndroid-bundled.jar:jar/QtMultimedia-bundled.jar:" android:name="android.app.load_local_jars"/>
-            <meta-data android:value="org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer:" android:name="android.app.static_init_classes"/>
-            <!--  Messages maps -->
-            <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
-            <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
-            <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
-            <!--  Messages maps -->
-            <!-- Splash screen -->
-            <meta-data android:resource="@layout/splash" android:name="android.app.splash_screen"/>
-            <!-- Splash screen -->
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="10"/>
-    <supports-screens android:anyDensity="true" android:normalScreens="true" android:smallScreens="true" android:largeScreens="true"/>
-</manifest>
diff --git a/experimental/qt5-intro-android/android/build.xml b/experimental/qt5-intro-android/android/build.xml
deleted file mode 100644
index 2395774..0000000
--- a/experimental/qt5-intro-android/android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Qt 5 Intro" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/experimental/qt5-intro-android/android/local.properties b/experimental/qt5-intro-android/android/local.properties
deleted file mode 100644
index cd7b9ef..0000000
--- a/experimental/qt5-intro-android/android/local.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/eblomfel/android-sdk-linux
diff --git a/experimental/qt5-intro-android/android/project.properties b/experimental/qt5-intro-android/android/project.properties
deleted file mode 100644
index b7c2081..0000000
--- a/experimental/qt5-intro-android/android/project.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-10
diff --git a/experimental/qt5-intro-android/android/res/drawable-hdpi/icon.png b/experimental/qt5-intro-android/android/res/drawable-hdpi/icon.png
deleted file mode 100644
index 379cfab..0000000
--- a/experimental/qt5-intro-android/android/res/drawable-hdpi/icon.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/android/res/drawable-ldpi/icon.png b/experimental/qt5-intro-android/android/res/drawable-ldpi/icon.png
deleted file mode 100644
index 587c0ca..0000000
--- a/experimental/qt5-intro-android/android/res/drawable-ldpi/icon.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/android/res/drawable-mdpi/icon.png b/experimental/qt5-intro-android/android/res/drawable-mdpi/icon.png
deleted file mode 100644
index d93a564..0000000
--- a/experimental/qt5-intro-android/android/res/drawable-mdpi/icon.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/android/res/layout/splash.xml b/experimental/qt5-intro-android/android/res/layout/splash.xml
deleted file mode 100644
index 6b0d492..0000000
--- a/experimental/qt5-intro-android/android/res/layout/splash.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_gravity="center"
-    >
-    <ImageView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:scaleType="fitXY"
-        />
-</LinearLayout>
diff --git a/experimental/qt5-intro-android/android/res/values-de/strings.xml b/experimental/qt5-intro-android/android/res/values-de/strings.xml
deleted file mode 100644
index 320d9ec..0000000
--- a/experimental/qt5-intro-android/android/res/values-de/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Ministro-Dienst wurde nicht gefunden.\nAnwendung kann nicht gestartet werden</string>
-    <string name="ministro_needed_msg">Diese Anwendung benötigt den Ministro-Dienst. Möchten Sie ihn installieren?</string>
-    <string name="fatal_error_msg">In Ihrer Anwendung ist ein schwerwiegender Fehler aufgetreten, sie kann nicht fortgesetzt werden</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-el/strings.xml b/experimental/qt5-intro-android/android/res/values-el/strings.xml
deleted file mode 100644
index 3cab212..0000000
--- a/experimental/qt5-intro-android/android/res/values-el/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Δεν ήταν δυνατή η εύρεση της υπηρεσίας Ministro. Δεν είναι δυνατή η εκκίνηση της εφαρμογής.</string>
-    <string name="ministro_needed_msg">Η εφαρμογή απαιτεί την υπηρεσία Ministro. Να εγκατασταθεί η υπηρεσία?</string>
-    <string name="fatal_error_msg">Παρουσιάστηκε ένα κρίσιμο σφάλμα και η εφαρμογή δεν μπορεί να συνεχίσει.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-es/strings.xml b/experimental/qt5-intro-android/android/res/values-es/strings.xml
deleted file mode 100644
index cf0b54d..0000000
--- a/experimental/qt5-intro-android/android/res/values-es/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Servicio Ministro inesistente. Imposible ejecutar la aplicación.</string>
-    <string name="ministro_needed_msg">Esta aplicación requiere el servicio Ministro. Instalarlo?</string>
-    <string name="fatal_error_msg">La aplicación ha causado un error grave y no es posible continuar.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-et/strings.xml b/experimental/qt5-intro-android/android/res/values-et/strings.xml
deleted file mode 100644
index d55a3c1..0000000
--- a/experimental/qt5-intro-android/android/res/values-et/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Ei suuda leida Ministro teenust.\nProgrammi ei saa käivitada.</string>
-    <string name="ministro_needed_msg">See programm vajab Ministro teenust.\nKas soovite paigaldada?</string>
-    <string name="fatal_error_msg">Programmiga juhtus fataalne viga.\nKahjuks ei saa jätkata.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-fa/strings.xml b/experimental/qt5-intro-android/android/res/values-fa/strings.xml
deleted file mode 100644
index a8d1b87..0000000
--- a/experimental/qt5-intro-android/android/res/values-fa/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">سرویس Ministro را پیدا نمی‌کند. برنامه نمی‌تواند آغاز شود.</string>
-    <string name="ministro_needed_msg">این نرم‌افزار به سرویس Ministro احتیاج دارد. آیا دوست دارید آن را نصب کنید؟</string>
-    <string name="fatal_error_msg">خطایی اساسی در برنامه‌تان رخ داد و اجرای برنامه نمی‌تواند ادامه یابد.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-fr/strings.xml b/experimental/qt5-intro-android/android/res/values-fr/strings.xml
deleted file mode 100644
index efc0fb6..0000000
--- a/experimental/qt5-intro-android/android/res/values-fr/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Le service Ministro est introuvable.\nL\'application ne peut pas démarrer.</string>
-    <string name="ministro_needed_msg">Cette application requiert le service Ministro. Voulez-vous l\'installer?</string>
-    <string name="fatal_error_msg">Votre application a rencontré une erreur fatale et ne peut pas continuer.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-id/strings.xml b/experimental/qt5-intro-android/android/res/values-id/strings.xml
deleted file mode 100644
index aaa5bda..0000000
--- a/experimental/qt5-intro-android/android/res/values-id/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Layanan Ministro tidak bisa ditemukan.\nAplikasi tidak bisa dimulai.</string>
-    <string name="ministro_needed_msg">Aplikasi ini membutuhkan layanan Ministro. Apakah Anda ingin menginstalnya?</string>
-    <string name="fatal_error_msg">Aplikasi Anda mengalami kesalahan fatal dan tidak dapat melanjutkan.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-it/strings.xml b/experimental/qt5-intro-android/android/res/values-it/strings.xml
deleted file mode 100644
index 4773419..0000000
--- a/experimental/qt5-intro-android/android/res/values-it/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Servizio Ministro inesistente. Impossibile eseguire \nl\'applicazione.</string>
-    <string name="ministro_needed_msg">Questa applicazione richiede il servizio Ministro.Installarlo?</string>
-    <string name="fatal_error_msg">L\'applicazione ha provocato un errore grave e non puo\' continuare.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-ja/strings.xml b/experimental/qt5-intro-android/android/res/values-ja/strings.xml
deleted file mode 100644
index ba1cfda..0000000
--- a/experimental/qt5-intro-android/android/res/values-ja/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Ministroサービスが見つかりません。\nアプリケーションが起動できません。</string>
-    <string name="ministro_needed_msg">このアプリケーションにはMinistroサービスが必要です。 インストールしてもよろしいですか？</string>
-    <string name="fatal_error_msg">アプリケーションで致命的なエラーが発生したため続行できません。</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-ms/strings.xml b/experimental/qt5-intro-android/android/res/values-ms/strings.xml
deleted file mode 100644
index 6e3952e..0000000
--- a/experimental/qt5-intro-android/android/res/values-ms/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Tidak jumpa servis Ministro.\nAplikasi tidak boleh dimulakan.</string>
-    <string name="ministro_needed_msg">Aplikasi ini memerlukan servis Ministro. Adakah anda ingin pasang servis itu?</string>
-    <string name="fatal_error_msg">Aplikasi anda menemui ralat muat dan tidak boleh diteruskan.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-nb/strings.xml b/experimental/qt5-intro-android/android/res/values-nb/strings.xml
deleted file mode 100644
index 8a550e9..0000000
--- a/experimental/qt5-intro-android/android/res/values-nb/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Kan ikke finne tjenesten Ministro. Applikasjonen kan ikke starte.</string>
-    <string name="ministro_needed_msg">Denne applikasjonen krever tjenesten Ministro. Vil du installere denne?</string>
-    <string name="fatal_error_msg">Applikasjonen fikk en kritisk feil og kan ikke fortsette</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-nl/strings.xml b/experimental/qt5-intro-android/android/res/values-nl/strings.xml
deleted file mode 100644
index 8a45a72..0000000
--- a/experimental/qt5-intro-android/android/res/values-nl/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">De Ministro service is niet gevonden.\nDe applicatie kan niet starten.</string>
-    <string name="ministro_needed_msg">Deze applicatie maakt gebruik van de Ministro service. Wilt u deze installeren?</string>
-    <string name="fatal_error_msg">Er is een fatale fout in de applicatie opgetreden. De applicatie kan niet verder gaan.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-pl/strings.xml b/experimental/qt5-intro-android/android/res/values-pl/strings.xml
deleted file mode 100644
index 9fefc92..0000000
--- a/experimental/qt5-intro-android/android/res/values-pl/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Usługa Ministro nie została znaleziona.\nAplikacja nie może zostać uruchomiona.</string>
-    <string name="ministro_needed_msg">Aplikacja wymaga usługi Ministro. Czy chcesz ją zainstalować?</string>
-    <string name="fatal_error_msg">Wystąpił błąd krytyczny. Aplikacja zostanie zamknięta.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-pt-rBR/strings.xml b/experimental/qt5-intro-android/android/res/values-pt-rBR/strings.xml
deleted file mode 100644
index 67ac3f9..0000000
--- a/experimental/qt5-intro-android/android/res/values-pt-rBR/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Não foi possível encontrar o serviço Ministro.\nA aplicação não pode iniciar.</string>
-    <string name="ministro_needed_msg">Essa aplicação requer o serviço Ministro. Gostaria de instalá-lo?</string>
-    <string name="fatal_error_msg">Sua aplicação encontrou um erro fatal e não pode continuar.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-ro/strings.xml b/experimental/qt5-intro-android/android/res/values-ro/strings.xml
deleted file mode 100644
index f88a442..0000000
--- a/experimental/qt5-intro-android/android/res/values-ro/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Serviciul Ministro nu poate fi găsit.\nAplicaţia nu poate porni.</string>
-    <string name="ministro_needed_msg">Această aplicaţie necesită serviciul Ministro.\nDoriţi să-l instalaţi?</string>
-    <string name="fatal_error_msg">Aplicaţia dumneavoastră a întâmpinat o eroare fatală şi nu poate continua.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-rs/strings.xml b/experimental/qt5-intro-android/android/res/values-rs/strings.xml
deleted file mode 100644
index 3194ce9..0000000
--- a/experimental/qt5-intro-android/android/res/values-rs/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Ministro servise nije pronađen. Aplikacija ne može biti pokrenuta.</string>
-    <string name="ministro_needed_msg">Ova aplikacija zahteva Ministro servis. Želite li da ga instalirate?</string>
-    <string name="fatal_error_msg">Vaša aplikacija je naišla na fatalnu grešku i ne može nastaviti sa radom.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-ru/strings.xml b/experimental/qt5-intro-android/android/res/values-ru/strings.xml
deleted file mode 100644
index d3cee80..0000000
--- a/experimental/qt5-intro-android/android/res/values-ru/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">Сервис Ministro не найден.\nПриложение нельзя запустить.</string>
-    <string name="ministro_needed_msg">Этому приложению необходим сервис Ministro. Вы хотите его установить?</string>
-    <string name="fatal_error_msg">Ваше приложение столкнулось с фатальной ошибкой и не может более работать.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-zh-rCN/strings.xml b/experimental/qt5-intro-android/android/res/values-zh-rCN/strings.xml
deleted file mode 100644
index 2eb1269..0000000
--- a/experimental/qt5-intro-android/android/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">无法找到Ministro服务。\n应用程序无法启动。</string>
-    <string name="ministro_needed_msg">此应用程序需要Ministro服务。您想安装它吗？</string>
-    <string name="fatal_error_msg">您的应用程序遇到一个致命错误导致它无法继续。</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values-zh-rTW/strings.xml b/experimental/qt5-intro-android/android/res/values-zh-rTW/strings.xml
deleted file mode 100644
index f6e68ef..0000000
--- a/experimental/qt5-intro-android/android/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="ministro_not_found_msg">無法找到Ministro服務。\n應用程序無法啟動。</string>
-    <string name="ministro_needed_msg">此應用程序需要Ministro服務。您想安裝它嗎？</string>
-    <string name="fatal_error_msg">您的應用程序遇到一個致命錯誤導致它無法繼續。</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values/libs.xml b/experimental/qt5-intro-android/android/res/values/libs.xml
deleted file mode 100644
index d495eaa..0000000
--- a/experimental/qt5-intro-android/android/res/values/libs.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <array name="qt_sources">
-        <item>https://download.qt-project.org/ministro/android/qt5/latest</item>
-    </array>
-    <string name="repository">default</string>
-    <array name="bundled_libs"/>
-    <array name="bundled_in_lib">
-        <item>lib--Managed_by_Qt_Creator--plugins_platforms_libqminimalegl.so:plugins/platforms/libqminimalegl.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_platforms_libqoffscreen.so:plugins/platforms/libqoffscreen.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_platforms_libqeglfs.so:plugins/platforms/libqeglfs.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_platforms_android_libqtforandroid.so:plugins/platforms/android/libqtforandroid.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_platforms_android_libqtforandroidGL.so:plugins/platforms/android/libqtforandroidGL.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_platforms_libqminimal.so:plugins/platforms/libqminimal.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_imageformats_libqjpeg.so:plugins/imageformats/libqjpeg.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_imageformats_libqtiff.so:plugins/imageformats/libqtiff.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_imageformats_libqwbmp.so:plugins/imageformats/libqwbmp.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_imageformats_libqmng.so:plugins/imageformats/libqmng.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_imageformats_libqsvg.so:plugins/imageformats/libqsvg.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_imageformats_libqtga.so:plugins/imageformats/libqtga.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_imageformats_libqico.so:plugins/imageformats/libqico.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_imageformats_libqgif.so:plugins/imageformats/libqgif.so</item>
-        <item>libQt5MultimediaQuick_p.so:lib/libQt5MultimediaQuick_p.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_mediaservice_libqtmedia_audioengine.so:plugins/mediaservice/libqtmedia_audioengine.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_mediaservice_libandroidmediaplayer.so:plugins/mediaservice/libandroidmediaplayer.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_bearer_libqgenericbearer.so:plugins/bearer/libqgenericbearer.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick.2_libqtquick2plugin.so:qml/QtQuick.2/libqtquick2plugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtMultimedia_libdeclarative_multimedia.so:qml/QtMultimedia/libdeclarative_multimedia.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtSensors_libdeclarative_sensors.so:qml/QtSensors/libdeclarative_sensors.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_Qt_labs_folderlistmodel_libqmlfolderlistmodelplugin.so:qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtTest_libqmltestplugin.so:qml/QtTest/libqmltestplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_Layouts_libqquicklayoutsplugin.so:qml/QtQuick/Layouts/libqquicklayoutsplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_Dialogs_libdialogplugin.so:qml/QtQuick/Dialogs/libdialogplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_Particles.2_libparticlesplugin.so:qml/QtQuick/Particles.2/libparticlesplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_LocalStorage_libqmllocalstorageplugin.so:qml/QtQuick/LocalStorage/libqmllocalstorageplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_PrivateWidgets_libwidgetsplugin.so:qml/QtQuick/PrivateWidgets/libwidgetsplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_Controls_Private_libprivateplugin.so:qml/QtQuick/Controls/Private/libprivateplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_Controls_libplugin.so:qml/QtQuick/Controls/libplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_XmlListModel_libqmlxmllistmodelplugin.so:qml/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQuick_Window.2_libwindowplugin.so:qml/QtQuick/Window.2/libwindowplugin.so</item>
-        <item>lib--Managed_by_Qt_Creator--qml_QtQml_Models.2_libmodelsplugin.so:qml/QtQml/Models.2/libmodelsplugin.so</item>
-        <item>libQt5QuickParticles.so:lib/libQt5QuickParticles.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_accessible_libqtaccessiblequick.so:plugins/accessible/libqtaccessiblequick.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_accessible_libqtaccessiblewidgets.so:plugins/accessible/libqtaccessiblewidgets.so</item>
-        <item>lib--Managed_by_Qt_Creator--plugins_sqldrivers_libqsqlite.so:plugins/sqldrivers/libqsqlite.so</item>
-    </array>
-    <array name="bundled_in_assets">
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick.2/qmldir:qml/QtQuick.2/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick.2/plugins.qmltypes:qml/QtQuick.2/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtMultimedia/Video.qml:qml/QtMultimedia/Video.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtMultimedia/qmldir:qml/QtMultimedia/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtMultimedia/plugins.qmltypes:qml/QtMultimedia/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtSensors/qmldir:qml/QtSensors/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtSensors/plugins.qmltypes:qml/QtSensors/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/Qt/labs/presentation/SlideCounter.qml:qml/Qt/labs/presentation/SlideCounter.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/Qt/labs/presentation/CodeSlide.qml:qml/Qt/labs/presentation/CodeSlide.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/Qt/labs/presentation/qmldir:qml/Qt/labs/presentation/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/Qt/labs/presentation/Clock.qml:qml/Qt/labs/presentation/Clock.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/Qt/labs/presentation/Slide.qml:qml/Qt/labs/presentation/Slide.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/Qt/labs/presentation/Presentation.qml:qml/Qt/labs/presentation/Presentation.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/Qt/labs/folderlistmodel/qmldir:qml/Qt/labs/folderlistmodel/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/Qt/labs/folderlistmodel/plugins.qmltypes:qml/Qt/labs/folderlistmodel/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtTest/TestCase.qml:qml/QtTest/TestCase.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtTest/testlogger.js:qml/QtTest/testlogger.js</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtTest/qmldir:qml/QtTest/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtTest/plugins.qmltypes:qml/QtTest/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtTest/SignalSpy.qml:qml/QtTest/SignalSpy.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/private/GaussianInnerShadow.qml:qml/QtGraphicalEffects/private/GaussianInnerShadow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/private/FastInnerShadow.qml:qml/QtGraphicalEffects/private/FastInnerShadow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/private/SourceProxy.qml:qml/QtGraphicalEffects/private/SourceProxy.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qml:qml/QtGraphicalEffects/private/GaussianDirectionalBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/private/GaussianGlow.qml:qml/QtGraphicalEffects/private/GaussianGlow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/private/GaussianMaskedBlur.qml:qml/QtGraphicalEffects/private/GaussianMaskedBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/private/FastMaskedBlur.qml:qml/QtGraphicalEffects/private/FastMaskedBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/private/FastGlow.qml:qml/QtGraphicalEffects/private/FastGlow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/RectangularGlow.qml:qml/QtGraphicalEffects/RectangularGlow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/RadialBlur.qml:qml/QtGraphicalEffects/RadialBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/Glow.qml:qml/QtGraphicalEffects/Glow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/OpacityMask.qml:qml/QtGraphicalEffects/OpacityMask.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/GaussianBlur.qml:qml/QtGraphicalEffects/GaussianBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/ThresholdMask.qml:qml/QtGraphicalEffects/ThresholdMask.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/LinearGradient.qml:qml/QtGraphicalEffects/LinearGradient.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/Desaturate.qml:qml/QtGraphicalEffects/Desaturate.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/Blend.qml:qml/QtGraphicalEffects/Blend.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/DropShadow.qml:qml/QtGraphicalEffects/DropShadow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/InnerShadow.qml:qml/QtGraphicalEffects/InnerShadow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/ZoomBlur.qml:qml/QtGraphicalEffects/ZoomBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/Colorize.qml:qml/QtGraphicalEffects/Colorize.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/ColorOverlay.qml:qml/QtGraphicalEffects/ColorOverlay.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/qmldir:qml/QtGraphicalEffects/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/LevelAdjust.qml:qml/QtGraphicalEffects/LevelAdjust.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/RecursiveBlur.qml:qml/QtGraphicalEffects/RecursiveBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/BrightnessContrast.qml:qml/QtGraphicalEffects/BrightnessContrast.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/FastBlur.qml:qml/QtGraphicalEffects/FastBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/ConicalGradient.qml:qml/QtGraphicalEffects/ConicalGradient.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/MaskedBlur.qml:qml/QtGraphicalEffects/MaskedBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/HueSaturation.qml:qml/QtGraphicalEffects/HueSaturation.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/DirectionalBlur.qml:qml/QtGraphicalEffects/DirectionalBlur.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/Displace.qml:qml/QtGraphicalEffects/Displace.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/GammaAdjust.qml:qml/QtGraphicalEffects/GammaAdjust.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtGraphicalEffects/RadialGradient.qml:qml/QtGraphicalEffects/RadialGradient.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Layouts/qmldir:qml/QtQuick/Layouts/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Layouts/plugins.qmltypes:qml/QtQuick/Layouts/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/qml/TextField.qml:qml/QtQuick/Dialogs/qml/TextField.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/qml/qmldir:qml/QtQuick/Dialogs/qml/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/qml/Button.qml:qml/QtQuick/Dialogs/qml/Button.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/qml/ColorSlider.qml:qml/QtQuick/Dialogs/qml/ColorSlider.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/DefaultFileDialog.qml:qml/QtQuick/Dialogs/DefaultFileDialog.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/WidgetColorDialog.qml:qml/QtQuick/Dialogs/WidgetColorDialog.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/WidgetFileDialog.qml:qml/QtQuick/Dialogs/WidgetFileDialog.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/qmldir:qml/QtQuick/Dialogs/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/plugins.qmltypes:qml/QtQuick/Dialogs/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/DefaultColorDialog.qml:qml/QtQuick/Dialogs/DefaultColorDialog.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/images/crosshairs.png:qml/QtQuick/Dialogs/images/crosshairs.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/images/slider_handle.png:qml/QtQuick/Dialogs/images/slider_handle.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/images/sunken_frame.png:qml/QtQuick/Dialogs/images/sunken_frame.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/images/folder.png:qml/QtQuick/Dialogs/images/folder.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/images/copy.png:qml/QtQuick/Dialogs/images/copy.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/images/checkers.png:qml/QtQuick/Dialogs/images/checkers.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Dialogs/images/up.png:qml/QtQuick/Dialogs/images/up.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Particles.2/qmldir:qml/QtQuick/Particles.2/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Particles.2/plugins.qmltypes:qml/QtQuick/Particles.2/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/LocalStorage/qmldir:qml/QtQuick/LocalStorage/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/LocalStorage/plugins.qmltypes:qml/QtQuick/LocalStorage/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/PrivateWidgets/qmldir:qml/QtQuick/PrivateWidgets/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/PrivateWidgets/plugins.qmltypes:qml/QtQuick/PrivateWidgets/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/StackViewDelegate.qml:qml/QtQuick/Controls/StackViewDelegate.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Label.qml:qml/QtQuick/Controls/Label.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/StackView.qml:qml/QtQuick/Controls/StackView.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/ScrollView.qml:qml/QtQuick/Controls/ScrollView.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/SpinBox.qml:qml/QtQuick/Controls/SpinBox.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/RadioButton.qml:qml/QtQuick/Controls/RadioButton.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/ComboBox.qml:qml/QtQuick/Controls/ComboBox.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/ApplicationWindow.qml:qml/QtQuick/Controls/ApplicationWindow.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/SplitView.qml:qml/QtQuick/Controls/SplitView.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/TextField.qml:qml/QtQuick/Controls/TextField.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/FocusFrame.qml:qml/QtQuick/Controls/Private/FocusFrame.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/Style.qml:qml/QtQuick/Controls/Private/Style.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/StackView.js:qml/QtQuick/Controls/Private/StackView.js</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/ScrollBar.qml:qml/QtQuick/Controls/Private/ScrollBar.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/TabBar.qml:qml/QtQuick/Controls/Private/TabBar.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/Margins.qml:qml/QtQuick/Controls/Private/Margins.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/style.js:qml/QtQuick/Controls/Private/style.js</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/AbstractCheckable.qml:qml/QtQuick/Controls/Private/AbstractCheckable.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/qmldir:qml/QtQuick/Controls/Private/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/ModalPopupBehavior.qml:qml/QtQuick/Controls/Private/ModalPopupBehavior.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/StackViewSlideDelegate.qml:qml/QtQuick/Controls/Private/StackViewSlideDelegate.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/BasicButton.qml:qml/QtQuick/Controls/Private/BasicButton.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/Control.qml:qml/QtQuick/Controls/Private/Control.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Private/ScrollViewHelper.qml:qml/QtQuick/Controls/Private/ScrollViewHelper.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/ToolBar.qml:qml/QtQuick/Controls/ToolBar.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/TextArea.qml:qml/QtQuick/Controls/TextArea.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/qmldir:qml/QtQuick/Controls/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/GroupBox.qml:qml/QtQuick/Controls/GroupBox.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/plugins.qmltypes:qml/QtQuick/Controls/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/ScrollViewStyle.qml:qml/QtQuick/Controls/Styles/ScrollViewStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/TextFieldStyle.qml:qml/QtQuick/Controls/Styles/TextFieldStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/ToolBarStyle.qml:qml/QtQuick/Controls/Styles/ToolBarStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/SliderStyle.qml:qml/QtQuick/Controls/Styles/SliderStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/RadioButtonStyle.qml:qml/QtQuick/Controls/Styles/RadioButtonStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/CheckBoxStyle.qml:qml/QtQuick/Controls/Styles/CheckBoxStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/ComboBoxStyle.qml:qml/QtQuick/Controls/Styles/ComboBoxStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/MenuBarStyle.qml:qml/QtQuick/Controls/Styles/MenuBarStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/ButtonStyle.qml:qml/QtQuick/Controls/Styles/ButtonStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/ScrollViewStyle.qml:qml/QtQuick/Controls/Styles/Desktop/ScrollViewStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/TextFieldStyle.qml:qml/QtQuick/Controls/Styles/Desktop/TextFieldStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/ToolBarStyle.qml:qml/QtQuick/Controls/Styles/Desktop/ToolBarStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/SliderStyle.qml:qml/QtQuick/Controls/Styles/Desktop/SliderStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/RadioButtonStyle.qml:qml/QtQuick/Controls/Styles/Desktop/RadioButtonStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/CheckBoxStyle.qml:qml/QtQuick/Controls/Styles/Desktop/CheckBoxStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/ComboBoxStyle.qml:qml/QtQuick/Controls/Styles/Desktop/ComboBoxStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/MenuBarStyle.qml:qml/QtQuick/Controls/Styles/Desktop/MenuBarStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/ButtonStyle.qml:qml/QtQuick/Controls/Styles/Desktop/ButtonStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/FocusFrameStyle.qml:qml/QtQuick/Controls/Styles/Desktop/FocusFrameStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/MenuStyle.qml:qml/QtQuick/Controls/Styles/Desktop/MenuStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/TabViewStyle.qml:qml/QtQuick/Controls/Styles/Desktop/TabViewStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/TableViewStyle.qml:qml/QtQuick/Controls/Styles/Desktop/TableViewStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/SpinBoxStyle.qml:qml/QtQuick/Controls/Styles/Desktop/SpinBoxStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/ToolButtonStyle.qml:qml/QtQuick/Controls/Styles/Desktop/ToolButtonStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/GroupBoxStyle.qml:qml/QtQuick/Controls/Styles/Desktop/GroupBoxStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/ProgressBarStyle.qml:qml/QtQuick/Controls/Styles/Desktop/ProgressBarStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Desktop/StatusBarStyle.qml:qml/QtQuick/Controls/Styles/Desktop/StatusBarStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/Private/qmldir:qml/QtQuick/Controls/Styles/Private/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/qmldir:qml/QtQuick/Controls/Styles/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/FocusFrameStyle.qml:qml/QtQuick/Controls/Styles/FocusFrameStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/MenuStyle.qml:qml/QtQuick/Controls/Styles/MenuStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/TabViewStyle.qml:qml/QtQuick/Controls/Styles/TabViewStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/TableViewStyle.qml:qml/QtQuick/Controls/Styles/TableViewStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/SpinBoxStyle.qml:qml/QtQuick/Controls/Styles/SpinBoxStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/ToolButtonStyle.qml:qml/QtQuick/Controls/Styles/ToolButtonStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/GroupBoxStyle.qml:qml/QtQuick/Controls/Styles/GroupBoxStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/ProgressBarStyle.qml:qml/QtQuick/Controls/Styles/ProgressBarStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/arrow-down.png:qml/QtQuick/Controls/Styles/images/arrow-down.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/arrow-right.png:qml/QtQuick/Controls/Styles/images/arrow-right.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/groupbox.png:qml/QtQuick/Controls/Styles/images/groupbox.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/progress-indeterminate.png:qml/QtQuick/Controls/Styles/images/progress-indeterminate.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/button_down.png:qml/QtQuick/Controls/Styles/images/button_down.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/header.png:qml/QtQuick/Controls/Styles/images/header.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/arrow-left.png:qml/QtQuick/Controls/Styles/images/arrow-left.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/tab.png:qml/QtQuick/Controls/Styles/images/tab.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/focusframe.png:qml/QtQuick/Controls/Styles/images/focusframe.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/editbox.png:qml/QtQuick/Controls/Styles/images/editbox.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/arrow-right@2x.png:qml/QtQuick/Controls/Styles/images/arrow-right@2x.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/arrow-left@2x.png:qml/QtQuick/Controls/Styles/images/arrow-left@2x.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/arrow-down@2x.png:qml/QtQuick/Controls/Styles/images/arrow-down@2x.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/scrollbar-handle-horizontal.png:qml/QtQuick/Controls/Styles/images/scrollbar-handle-horizontal.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/scrollbar-handle-vertical.png:qml/QtQuick/Controls/Styles/images/scrollbar-handle-vertical.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/tab_selected.png:qml/QtQuick/Controls/Styles/images/tab_selected.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/arrow-up.png:qml/QtQuick/Controls/Styles/images/arrow-up.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/button.png:qml/QtQuick/Controls/Styles/images/button.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/images/arrow-up@2x.png:qml/QtQuick/Controls/Styles/images/arrow-up@2x.png</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Styles/StatusBarStyle.qml:qml/QtQuick/Controls/Styles/StatusBarStyle.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/MenuBar.qml:qml/QtQuick/Controls/MenuBar.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/TabView.qml:qml/QtQuick/Controls/TabView.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/ToolButton.qml:qml/QtQuick/Controls/ToolButton.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Tab.qml:qml/QtQuick/Controls/Tab.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Button.qml:qml/QtQuick/Controls/Button.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/CheckBox.qml:qml/QtQuick/Controls/CheckBox.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/TableViewColumn.qml:qml/QtQuick/Controls/TableViewColumn.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Menu.qml:qml/QtQuick/Controls/Menu.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/StatusBar.qml:qml/QtQuick/Controls/StatusBar.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/ProgressBar.qml:qml/QtQuick/Controls/ProgressBar.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/TableView.qml:qml/QtQuick/Controls/TableView.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/Slider.qml:qml/QtQuick/Controls/Slider.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Controls/StackViewTransition.qml:qml/QtQuick/Controls/StackViewTransition.qml</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/XmlListModel/qmldir:qml/QtQuick/XmlListModel/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/XmlListModel/plugins.qmltypes:qml/QtQuick/XmlListModel/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Window.2/qmldir:qml/QtQuick/Window.2/qmldir</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQuick/Window.2/plugins.qmltypes:qml/QtQuick/Window.2/plugins.qmltypes</item>
-        <item>--Managed_by_Qt_Creator--/qml/QtQml/Models.2/qmldir:qml/QtQml/Models.2/qmldir</item>
-    </array>
-    <array name="qt_libs">
-        <item>gnustl_shared</item>
-        <item>Qt5Core</item>
-        <item>Qt5V8</item>
-        <item>Qt5Gui</item>
-        <item>Qt5Network</item>
-        <item>Qt5Sql</item>
-        <item>Qt5Multimedia</item>
-        <item>Qt5Qml</item>
-        <item>Qt5Quick</item>
-    </array>
-</resources>
diff --git a/experimental/qt5-intro-android/android/res/values/strings.xml b/experimental/qt5-intro-android/android/res/values/strings.xml
deleted file mode 100644
index 7beee08..0000000
--- a/experimental/qt5-intro-android/android/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources>
-    <string name="app_name">Qt 5 Intro</string>
-    <string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
-    <string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
-    <string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>
-</resources>
diff --git a/experimental/qt5-intro-android/android/src/org/kde/necessitas/ministro/IMinistro.aidl b/experimental/qt5-intro-android/android/src/org/kde/necessitas/ministro/IMinistro.aidl
deleted file mode 100644
index 236a62f..0000000
--- a/experimental/qt5-intro-android/android/src/org/kde/necessitas/ministro/IMinistro.aidl
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-    Copyright (c) 2011-2013, BogDan Vatra <bogdan@kde.org>
-    Contact: http://www.qt-project.org/legal
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-package org.kde.necessitas.ministro;
-
-import org.kde.necessitas.ministro.IMinistroCallback;
-
-interface IMinistro
-{
-/**
-* Check/download required libs to run the application
-*
-* param callback  - interface used by Minsitro service to notify the client when the loader is ready
-* param parameters
-*            parameters fields:
-*                 * Key Name                   Key type         Explanations
-*                   "sources"                  StringArray      Sources list from where Ministro will download the libs. Make sure you are using ONLY secure locations.
-*                   "repository"               String           Overwrites the default Ministro repository. Possible values: default, stable, testing and unstable
-*                   "required.modules"         StringArray      Required modules by your application
-*                   "application.title"        String           Application name, used to show more informations to user
-*                   "qt.provider"              String           Qt libs provider, currently only "necessitas" is supported.
-*                   "minimum.ministro.api"     Integer          Minimum Ministro API level, used to check if Ministro service compatible with your application. Current API Level is 3 !
-*                   "minimum.qt.version"       Integer          Minimim Qt version (e.g. 0x040800, which means Qt 4.8.0, check http://qt-project.org/doc/qt-4.8/qtglobal.html#QT_VERSION)!
-*/
-    void requestLoader(in IMinistroCallback callback, in Bundle parameters);
-}
diff --git a/experimental/qt5-intro-android/android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl b/experimental/qt5-intro-android/android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl
deleted file mode 100644
index 0bcb528..0000000
--- a/experimental/qt5-intro-android/android/src/org/kde/necessitas/ministro/IMinistroCallback.aidl
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-    Copyright (c) 2011-2013, BogDan Vatra <bogdan@kde.org>
-    Contact: http://www.qt-project.org/legal
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package org.kde.necessitas.ministro;
-
-oneway interface IMinistroCallback {
-/**
-* This method is called by the Ministro service back into the application which
-* implements this interface.
-*
-* param in - loaderParams
-*            loaderParams fields:
-*                 * Key Name                   Key type         Explanations
-*                 * "error.code"               Integer          See below
-*                 * "error.message"            String           Missing if no error, otherwise will contain the error message translated into phone language where available.
-*                 * "dex.path"                 String           The list of jar/apk files containing classes and resources, needed to be passed to application DexClassLoader
-*                 * "lib.path"                 String           The list of directories containing native libraries; may be missing, needed to be passed to application DexClassLoader
-*                 * "loader.class.name"        String           Loader class name.
-*
-* "error.code" field possible errors:
-*  - 0 no error.
-*  - 1 incompatible Ministro version. Ministro needs to be upgraded.
-*  - 2 not all modules could be satisfy.
-*  - 3 invalid parameters
-*  - 4 invalid qt version
-*  - 5 download canceled
-*
-* The parameter contains additional fields which are used by the loader to start your application, so it must be passed to the loader.
-*/
-
-    void loaderReady(in Bundle loaderParams);
-}
diff --git a/experimental/qt5-intro-android/android/src/org/qtproject/qt5/android/bindings/QtActivity.java b/experimental/qt5-intro-android/android/src/org/qtproject/qt5/android/bindings/QtActivity.java
deleted file mode 100644
index 8d129de..0000000
--- a/experimental/qt5-intro-android/android/src/org/qtproject/qt5/android/bindings/QtActivity.java
+++ /dev/null
@@ -1,1404 +0,0 @@
-/*
-    Copyright (c) 2012-2013, BogDan Vatra <bogdan@kde.org>
-    Contact: http://www.qt-project.org/legal
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package org.qtproject.qt5.android.bindings;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.FileOutputStream;
-import java.io.FileInputStream;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.kde.necessitas.ministro.IMinistro;
-import org.kde.necessitas.ministro.IMinistroCallback;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Configuration;
-import android.content.res.Resources.Theme;
-import android.content.res.AssetManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager.LayoutParams;
-import android.view.accessibility.AccessibilityEvent;
-import dalvik.system.DexClassLoader;
-
-//@ANDROID-11
-//QtCreator import android.app.Fragment;
-//QtCreator import android.view.ActionMode;
-//QtCreator import android.view.ActionMode.Callback;
-//@ANDROID-11
-
-public class QtActivity extends Activity
-{
-    private final static int MINISTRO_INSTALL_REQUEST_CODE = 0xf3ee; // request code used to know when Ministro instalation is finished
-    private static final int MINISTRO_API_LEVEL = 3; // Ministro api level (check IMinistro.aidl file)
-    private static final int NECESSITAS_API_LEVEL = 2; // Necessitas api level used by platform plugin
-    private static final int QT_VERSION = 0x050100; // This app requires at least Qt version 5.1.0
-
-    private static final String ERROR_CODE_KEY = "error.code";
-    private static final String ERROR_MESSAGE_KEY = "error.message";
-    private static final String DEX_PATH_KEY = "dex.path";
-    private static final String LIB_PATH_KEY = "lib.path";
-    private static final String LOADER_CLASS_NAME_KEY = "loader.class.name";
-    private static final String NATIVE_LIBRARIES_KEY = "native.libraries";
-    private static final String ENVIRONMENT_VARIABLES_KEY = "environment.variables";
-    private static final String APPLICATION_PARAMETERS_KEY = "application.parameters";
-    private static final String BUNDLED_LIBRARIES_KEY = "bundled.libraries";
-    private static final String BUNDLED_IN_LIB_RESOURCE_ID_KEY = "android.app.bundled_in_lib_resource_id";
-    private static final String BUNDLED_IN_ASSETS_RESOURCE_ID_KEY = "android.app.bundled_in_assets_resource_id";
-    private static final String MAIN_LIBRARY_KEY = "main.library";
-    private static final String STATIC_INIT_CLASSES_KEY = "static.init.classes";
-    private static final String NECESSITAS_API_LEVEL_KEY = "necessitas.api.level";
-
-    /// Ministro server parameter keys
-    private static final String REQUIRED_MODULES_KEY = "required.modules";
-    private static final String APPLICATION_TITLE_KEY = "application.title";
-    private static final String MINIMUM_MINISTRO_API_KEY = "minimum.ministro.api";
-    private static final String MINIMUM_QT_VERSION_KEY = "minimum.qt.version";
-    private static final String SOURCES_KEY = "sources";               // needs MINISTRO_API_LEVEL >=3 !!!
-                                                                       // Use this key to specify any 3rd party sources urls
-                                                                       // Ministro will download these repositories into their
-                                                                       // own folders, check http://community.kde.org/Necessitas/Ministro
-                                                                       // for more details.
-
-    private static final String REPOSITORY_KEY = "repository";         // use this key to overwrite the default ministro repsitory
-
-    private static final String APPLICATION_PARAMETERS = null; // use this variable to pass any parameters to your application,
-                                                               // the parameters must not contain any white spaces
-                                                               // and must be separated with "\t"
-                                                               // e.g "-param1\t-param2=value2\t-param3\tvalue3"
-
-    private static final String ENVIRONMENT_VARIABLES = "QT_USE_ANDROID_NATIVE_STYLE=0\t";
-                                                               // use this variable to add any environment variables to your application.
-                                                               // the env vars must be separated with "\t"
-                                                               // e.g. "ENV_VAR1=1\tENV_VAR2=2\t"
-                                                               // Currently the following vars are used by the android plugin:
-                                                               // * QT_USE_ANDROID_NATIVE_STYLE - 1 to use the android widget style if available,
-                                                               //   note that the android style plugin in Qt 5.1 is not fully functional.
-
-    private static final int INCOMPATIBLE_MINISTRO_VERSION = 1; // Incompatible Ministro version. Ministro needs to be upgraded.
-    private static final int BUFFER_SIZE = 1024;
-
-    private ActivityInfo m_activityInfo = null; // activity info object, used to access the libs and the strings
-    private DexClassLoader m_classLoader = null; // loader object
-    private String[] m_sources = {"https://download.qt-project.org/ministro/android/qt5/latest"}; // Make sure you are using ONLY secure locations
-    private String m_repository = "default"; // Overwrites the default Ministro repository
-                                                        // Possible values:
-                                                        // * default - Ministro default repository set with "Ministro configuration tool".
-                                                        // By default the stable version is used. Only this or stable repositories should
-                                                        // be used in production.
-                                                        // * stable - stable repository, only this and default repositories should be used
-                                                        // in production.
-                                                        // * testing - testing repository, DO NOT use this repository in production,
-                                                        // this repository is used to push a new release, and should be used to test your application.
-                                                        // * unstable - unstable repository, DO NOT use this repository in production,
-                                                        // this repository is used to push Qt snapshots.
-    private String[] m_qtLibs = null; // required qt libs
-
-    // this function is used to load and start the loader
-    private void loadApplication(Bundle loaderParams)
-    {
-        try {
-            final int errorCode = loaderParams.getInt(ERROR_CODE_KEY);
-            if (errorCode != 0) {
-                if (errorCode == INCOMPATIBLE_MINISTRO_VERSION) {
-                    downloadUpgradeMinistro(loaderParams.getString(ERROR_MESSAGE_KEY));
-                    return;
-                }
-
-                // fatal error, show the error and quit
-                AlertDialog errorDialog = new AlertDialog.Builder(QtActivity.this).create();
-                errorDialog.setMessage(loaderParams.getString(ERROR_MESSAGE_KEY));
-                errorDialog.setButton(getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        finish();
-                    }
-                });
-                errorDialog.show();
-                return;
-            }
-
-            // add all bundled Qt libs to loader params
-            ArrayList<String> libs = new ArrayList<String>();
-            if ( m_activityInfo.metaData.containsKey("android.app.bundled_libs_resource_id") )
-                libs.addAll(Arrays.asList(getResources().getStringArray(m_activityInfo.metaData.getInt("android.app.bundled_libs_resource_id"))));
-
-            String libName = null;
-            if ( m_activityInfo.metaData.containsKey("android.app.lib_name") ) {
-                libName = m_activityInfo.metaData.getString("android.app.lib_name");
-                loaderParams.putString(MAIN_LIBRARY_KEY, libName); //main library contains main() function
-            }
-
-            loaderParams.putStringArrayList(BUNDLED_LIBRARIES_KEY, libs);
-            loaderParams.putInt(NECESSITAS_API_LEVEL_KEY, NECESSITAS_API_LEVEL);
-
-            // load and start QtLoader class
-            m_classLoader = new DexClassLoader(loaderParams.getString(DEX_PATH_KEY), // .jar/.apk files
-                                               getDir("outdex", Context.MODE_PRIVATE).getAbsolutePath(), // directory where optimized DEX files should be written.
-                                               loaderParams.containsKey(LIB_PATH_KEY) ? loaderParams.getString(LIB_PATH_KEY) : null, // libs folder (if exists)
-                                               getClassLoader()); // parent loader
-
-            @SuppressWarnings("rawtypes")
-            Class loaderClass = m_classLoader.loadClass(loaderParams.getString(LOADER_CLASS_NAME_KEY)); // load QtLoader class
-            Object qtLoader = loaderClass.newInstance(); // create an instance
-            Method perpareAppMethod = qtLoader.getClass().getMethod("loadApplication",
-                                                                    Activity.class,
-                                                                    ClassLoader.class,
-                                                                    Bundle.class);
-            if (!(Boolean)perpareAppMethod.invoke(qtLoader, this, m_classLoader, loaderParams))
-                throw new Exception("");
-
-            QtApplication.setQtActivityDelegate(qtLoader);
-
-            // now load the application library so it's accessible from this class loader
-            if (libName != null)
-                System.loadLibrary(libName);
-
-            Method startAppMethod=qtLoader.getClass().getMethod("startApplication");
-            if (!(Boolean)startAppMethod.invoke(qtLoader))
-                throw new Exception("");
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            AlertDialog errorDialog = new AlertDialog.Builder(QtActivity.this).create();
-            if (m_activityInfo.metaData.containsKey("android.app.fatal_error_msg"))
-                errorDialog.setMessage(m_activityInfo.metaData.getString("android.app.fatal_error_msg"));
-            else
-                errorDialog.setMessage("Fatal error, your application can't be started.");
-
-            errorDialog.setButton(getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    finish();
-                }
-            });
-            errorDialog.show();
-        }
-    }
-
-    private ServiceConnection m_ministroConnection=new ServiceConnection() {
-        private IMinistro m_service = null;
-    @Override
-        public void onServiceConnected(ComponentName name, IBinder service)
-        {
-            m_service = IMinistro.Stub.asInterface(service);
-            try {
-                if (m_service!=null) {
-                    Bundle parameters= new Bundle();
-                    parameters.putStringArray(REQUIRED_MODULES_KEY, m_qtLibs);
-                    parameters.putString(APPLICATION_TITLE_KEY, (String)QtActivity.this.getTitle());
-                    parameters.putInt(MINIMUM_MINISTRO_API_KEY, MINISTRO_API_LEVEL);
-                    parameters.putInt(MINIMUM_QT_VERSION_KEY, QT_VERSION);
-                    parameters.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES);
-                    if (null!=APPLICATION_PARAMETERS)
-                        parameters.putString(APPLICATION_PARAMETERS_KEY, APPLICATION_PARAMETERS);
-                    parameters.putStringArray(SOURCES_KEY, m_sources);
-                    parameters.putString(REPOSITORY_KEY, m_repository);
-                    m_service.requestLoader(m_ministroCallback, parameters);
-                }
-            } catch (RemoteException e) {
-                    e.printStackTrace();
-            }
-        }
-
-    private IMinistroCallback m_ministroCallback = new IMinistroCallback.Stub() {
-        // this function is called back by Ministro.
-        @Override
-        public void loaderReady(final Bundle loaderParams) throws RemoteException {
-            runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    unbindService(m_ministroConnection);
-                    loadApplication(loaderParams);
-                }
-            });
-        }
-    };
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            m_service = null;
-        }
-    };
-
-    private void downloadUpgradeMinistro(String msg)
-    {
-        AlertDialog.Builder downloadDialog = new AlertDialog.Builder(this);
-        downloadDialog.setMessage(msg);
-        downloadDialog.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                try {
-                    Uri uri = Uri.parse("market://search?q=pname:org.kde.necessitas.ministro");
-                    Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                    startActivityForResult(intent, MINISTRO_INSTALL_REQUEST_CODE);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    ministroNotFound();
-                }
-            }
-        });
-
-        downloadDialog.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialogInterface, int i) {
-                QtActivity.this.finish();
-            }
-        });
-        downloadDialog.show();
-    }
-
-    private void ministroNotFound()
-    {
-        AlertDialog errorDialog = new AlertDialog.Builder(QtActivity.this).create();
-
-        if (m_activityInfo.metaData.containsKey("android.app.ministro_not_found_msg"))
-            errorDialog.setMessage(m_activityInfo.metaData.getString("android.app.ministro_not_found_msg"));
-        else
-            errorDialog.setMessage("Can't find Ministro service.\nThe application can't start.");
-
-        errorDialog.setButton(getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                finish();
-            }
-        });
-        errorDialog.show();
-    }
-
-    static private void copyFile(InputStream inputStream, OutputStream outputStream)
-        throws IOException
-    {
-        byte[] buffer = new byte[BUFFER_SIZE];
-
-        int count;
-        while ((count = inputStream.read(buffer)) > 0)
-            outputStream.write(buffer, 0, count);
-    }
-
-
-    private void copyAsset(String source, String destination)
-        throws IOException
-    {
-        // Already exists, we don't have to do anything
-        File destinationFile = new File(destination);
-        if (destinationFile.exists())
-            return;
-
-        File parentDirectory = destinationFile.getParentFile();
-        if (!parentDirectory.exists())
-            parentDirectory.mkdirs();
-
-        destinationFile.createNewFile();
-
-        AssetManager assetsManager = getAssets();
-        InputStream inputStream = assetsManager.open(source);
-        OutputStream outputStream = new FileOutputStream(destinationFile);
-        copyFile(inputStream, outputStream);
-    }
-
-    private static void createBundledBinary(String source, String destination)
-        throws IOException
-    {
-        // Already exists, we don't have to do anything
-        File destinationFile = new File(destination);
-        if (destinationFile.exists())
-            return;
-
-        File parentDirectory = destinationFile.getParentFile();
-        if (!parentDirectory.exists())
-            parentDirectory.mkdirs();
-
-        destinationFile.createNewFile();
-
-        InputStream inputStream = new FileInputStream(source);
-        OutputStream outputStream = new FileOutputStream(destinationFile);
-        copyFile(inputStream, outputStream);
-    }
-
-    private void extractBundledPluginsAndImports(String localPrefix)
-        throws IOException
-    {
-        ArrayList<String> libs = new ArrayList<String>();
-
-        {
-            String key = BUNDLED_IN_LIB_RESOURCE_ID_KEY;
-            java.util.Set<String> keys = m_activityInfo.metaData.keySet();
-            if (m_activityInfo.metaData.containsKey(key)) {
-                String[] list = getResources().getStringArray(m_activityInfo.metaData.getInt(key));
-
-                for (String bundledImportBinary : list) {
-                    String[] split = bundledImportBinary.split(":");
-                    String sourceFileName = localPrefix + "lib/" + split[0];
-                    String destinationFileName = localPrefix + split[1];
-                    createBundledBinary(sourceFileName, destinationFileName);
-                }
-            }
-        }
-
-        {
-            String key = BUNDLED_IN_ASSETS_RESOURCE_ID_KEY;
-            if (m_activityInfo.metaData.containsKey(key)) {
-                String[] list = getResources().getStringArray(m_activityInfo.metaData.getInt(key));
-
-                for (String fileName : list) {
-                    String[] split = fileName.split(":");
-                    String sourceFileName = split[0];
-                    String destinationFileName = localPrefix + split[1];
-                    copyAsset(sourceFileName, destinationFileName);
-                }
-            }
-
-        }
-    }
-
-    private void startApp(final boolean firstStart)
-    {
-        try {
-            if (m_activityInfo.metaData.containsKey("android.app.qt_sources_resource_id")) {
-                int resourceId = m_activityInfo.metaData.getInt("android.app.qt_sources_resource_id");
-                m_sources = getResources().getStringArray(resourceId);
-            }
-
-            if (m_activityInfo.metaData.containsKey("android.app.repository"))
-                m_repository = m_activityInfo.metaData.getString("android.app.repository");
-
-            if (m_activityInfo.metaData.containsKey("android.app.qt_libs_resource_id")) {
-                int resourceId = m_activityInfo.metaData.getInt("android.app.qt_libs_resource_id");
-                m_qtLibs = getResources().getStringArray(resourceId);
-            }
-
-            if (m_activityInfo.metaData.containsKey("android.app.use_local_qt_libs")
-                    && m_activityInfo.metaData.getInt("android.app.use_local_qt_libs") == 1) {
-                ArrayList<String> libraryList = new ArrayList<String>();
-
-
-                String localPrefix = "/data/local/tmp/qt/";
-                if (m_activityInfo.metaData.containsKey("android.app.libs_prefix"))
-                    localPrefix = m_activityInfo.metaData.getString("android.app.libs_prefix");
-
-                boolean bundlingQtLibs = false;
-                if (m_activityInfo.metaData.containsKey("android.app.bundle_local_qt_libs")
-                    && m_activityInfo.metaData.getInt("android.app.bundle_local_qt_libs") == 1) {
-                    localPrefix = getApplicationInfo().dataDir + "/";
-                    extractBundledPluginsAndImports(localPrefix);
-                    bundlingQtLibs = true;
-                }
-
-                if (m_qtLibs != null) {
-                    for (int i=0;i<m_qtLibs.length;i++) {
-                        libraryList.add(localPrefix
-                                        + "lib/lib"
-                                        + m_qtLibs[i]
-                                        + ".so");
-                    }
-                }
-
-                if (m_activityInfo.metaData.containsKey("android.app.load_local_libs")) {
-                    String[] extraLibs = m_activityInfo.metaData.getString("android.app.load_local_libs").split(":");
-                    for (String lib : extraLibs) {
-                        if (lib.length() > 0)
-                            libraryList.add(localPrefix + lib);
-                    }
-                }
-
-
-                String dexPaths = new String();
-                String pathSeparator = System.getProperty("path.separator", ":");
-                if (!bundlingQtLibs && m_activityInfo.metaData.containsKey("android.app.load_local_jars")) {
-                    String[] jarFiles = m_activityInfo.metaData.getString("android.app.load_local_jars").split(":");
-                    for (String jar:jarFiles) {
-                        if (jar.length() > 0) {
-                            if (dexPaths.length() > 0)
-                                dexPaths += pathSeparator;
-                            dexPaths += localPrefix + jar;
-                        }
-                    }
-                }
-
-                Bundle loaderParams = new Bundle();
-                loaderParams.putInt(ERROR_CODE_KEY, 0);
-                loaderParams.putString(DEX_PATH_KEY, dexPaths);
-                loaderParams.putString(LOADER_CLASS_NAME_KEY, "org.qtproject.qt5.android.QtActivityDelegate");
-                if (m_activityInfo.metaData.containsKey("android.app.static_init_classes")) {
-                    loaderParams.putStringArray(STATIC_INIT_CLASSES_KEY,
-                                                m_activityInfo.metaData.getString("android.app.static_init_classes").split(":"));
-                }
-                loaderParams.putStringArrayList(NATIVE_LIBRARIES_KEY, libraryList);
-                loaderParams.putString(ENVIRONMENT_VARIABLES_KEY, ENVIRONMENT_VARIABLES
-                                                                  + "\tQML2_IMPORT_PATH=" + localPrefix + "/qml"
-                                                                  + "\tQML_IMPORT_PATH=" + localPrefix + "/imports"
-                                                                  + "\tQT_PLUGIN_PATH=" + localPrefix + "/plugins");
-                loadApplication(loaderParams);
-                return;
-            }
-
-            try {
-                if (!bindService(new Intent(org.kde.necessitas.ministro.IMinistro.class.getCanonicalName()),
-                                 m_ministroConnection,
-                                 Context.BIND_AUTO_CREATE)) {
-                    throw new SecurityException("");
-                }
-            } catch (Exception e) {
-                if (firstStart) {
-                    String msg = "This application requires Ministro service. Would you like to install it?";
-                    if (m_activityInfo.metaData.containsKey("android.app.ministro_needed_msg"))
-                        msg = m_activityInfo.metaData.getString("android.app.ministro_needed_msg");
-                    downloadUpgradeMinistro(msg);
-                } else {
-                    ministroNotFound();
-                }
-            }
-        } catch (Exception e) {
-            Log.e(QtApplication.QtTAG, "Can't create main activity", e);
-        }
-    }
-
-
-
-    /////////////////////////// forward all notifications ////////////////////////////
-    /////////////////////////// Super class calls ////////////////////////////////////
-    /////////////// PLEASE DO NOT CHANGE THE FOLLOWING CODE //////////////////////////
-    //////////////////////////////////////////////////////////////////////////////////
-
-    @Override
-    public boolean dispatchKeyEvent(KeyEvent event)
-    {
-        if (QtApplication.m_delegateObject != null && QtApplication.dispatchKeyEvent != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchKeyEvent, event);
-        else
-            return super.dispatchKeyEvent(event);
-    }
-    public boolean super_dispatchKeyEvent(KeyEvent event)
-    {
-        return super.dispatchKeyEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event)
-    {
-        if (QtApplication.m_delegateObject != null && QtApplication.dispatchPopulateAccessibilityEvent != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchPopulateAccessibilityEvent, event);
-        else
-            return super.dispatchPopulateAccessibilityEvent(event);
-    }
-    public boolean super_dispatchPopulateAccessibilityEvent(AccessibilityEvent event)
-    {
-        return super_dispatchPopulateAccessibilityEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev)
-    {
-        if (QtApplication.m_delegateObject != null && QtApplication.dispatchTouchEvent != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchTouchEvent, ev);
-        else
-            return super.dispatchTouchEvent(ev);
-    }
-    public boolean super_dispatchTouchEvent(MotionEvent event)
-    {
-        return super.dispatchTouchEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean dispatchTrackballEvent(MotionEvent ev)
-    {
-        if (QtApplication.m_delegateObject != null && QtApplication.dispatchTrackballEvent != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchTrackballEvent, ev);
-        else
-            return super.dispatchTrackballEvent(ev);
-    }
-    public boolean super_dispatchTrackballEvent(MotionEvent event)
-    {
-        return super.dispatchTrackballEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-
-        if (QtApplication.m_delegateObject != null && QtApplication.onActivityResult != null) {
-            QtApplication.invokeDelegateMethod(QtApplication.onActivityResult, requestCode, resultCode, data);
-            return;
-        }
-        if (requestCode == MINISTRO_INSTALL_REQUEST_CODE)
-            startApp(false);
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-    public void super_onActivityResult(int requestCode, int resultCode, Intent data)
-    {
-        super.onActivityResult(requestCode, resultCode, data);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onApplyThemeResource(Theme theme, int resid, boolean first)
-    {
-        if (!QtApplication.invokeDelegate(theme, resid, first).invoked)
-            super.onApplyThemeResource(theme, resid, first);
-    }
-    public void super_onApplyThemeResource(Theme theme, int resid, boolean first)
-    {
-        super.onApplyThemeResource(theme, resid, first);
-    }
-    //---------------------------------------------------------------------------
-
-
-    @Override
-    protected void onChildTitleChanged(Activity childActivity, CharSequence title)
-    {
-        if (!QtApplication.invokeDelegate(childActivity, title).invoked)
-            super.onChildTitleChanged(childActivity, title);
-    }
-    public void super_onChildTitleChanged(Activity childActivity, CharSequence title)
-    {
-        super.onChildTitleChanged(childActivity, title);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig)
-    {
-        if (!QtApplication.invokeDelegate(newConfig).invoked)
-            super.onConfigurationChanged(newConfig);
-    }
-    public void super_onConfigurationChanged(Configuration newConfig)
-    {
-        super.onConfigurationChanged(newConfig);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onContentChanged()
-    {
-        if (!QtApplication.invokeDelegate().invoked)
-            super.onContentChanged();
-    }
-    public void super_onContentChanged()
-    {
-        super.onContentChanged();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(item);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onContextItemSelected(item);
-    }
-    public boolean super_onContextItemSelected(MenuItem item)
-    {
-        return super.onContextItemSelected(item);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onContextMenuClosed(Menu menu)
-    {
-        if (!QtApplication.invokeDelegate(menu).invoked)
-            super.onContextMenuClosed(menu);
-    }
-    public void super_onContextMenuClosed(Menu menu)
-    {
-        super.onContextMenuClosed(menu);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        if (QtApplication.m_delegateObject != null && QtApplication.onCreate != null) {
-            QtApplication.invokeDelegateMethod(QtApplication.onCreate, savedInstanceState);
-            return;
-        }
-
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        try {
-            m_activityInfo = getPackageManager().getActivityInfo(getComponentName(), PackageManager.GET_META_DATA);
-        } catch (NameNotFoundException e) {
-            e.printStackTrace();
-            finish();
-            return;
-        }
-
-        if (null == getLastNonConfigurationInstance()) {
-            // if splash screen is defined, then show it
-            if (m_activityInfo.metaData.containsKey("android.app.splash_screen") )
-                setContentView(m_activityInfo.metaData.getInt("android.app.splash_screen"));
-            startApp(true);
-        }
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo)
-    {
-        if (!QtApplication.invokeDelegate(menu, v, menuInfo).invoked)
-            super.onCreateContextMenu(menu, v, menuInfo);
-    }
-    public void super_onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo)
-    {
-        super.onCreateContextMenu(menu, v, menuInfo);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public CharSequence onCreateDescription()
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate();
-        if (res.invoked)
-            return (CharSequence)res.methodReturns;
-        else
-            return super.onCreateDescription();
-    }
-    public CharSequence super_onCreateDescription()
-    {
-        return super.onCreateDescription();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected Dialog onCreateDialog(int id)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(id);
-        if (res.invoked)
-            return (Dialog)res.methodReturns;
-        else
-            return super.onCreateDialog(id);
-    }
-    public Dialog super_onCreateDialog(int id)
-    {
-        return super.onCreateDialog(id);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(menu);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onCreateOptionsMenu(menu);
-    }
-    public boolean super_onCreateOptionsMenu(Menu menu)
-    {
-        return super.onCreateOptionsMenu(menu);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onCreatePanelMenu(int featureId, Menu menu)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(featureId, menu);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onCreatePanelMenu(featureId, menu);
-    }
-    public boolean super_onCreatePanelMenu(int featureId, Menu menu)
-    {
-        return super.onCreatePanelMenu(featureId, menu);
-    }
-    //---------------------------------------------------------------------------
-
-
-    @Override
-    public View onCreatePanelView(int featureId)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(featureId);
-        if (res.invoked)
-            return (View)res.methodReturns;
-        else
-            return super.onCreatePanelView(featureId);
-    }
-    public View super_onCreatePanelView(int featureId)
-    {
-        return super.onCreatePanelView(featureId);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onCreateThumbnail(Bitmap outBitmap, Canvas canvas)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(outBitmap, canvas);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onCreateThumbnail(outBitmap, canvas);
-    }
-    public boolean super_onCreateThumbnail(Bitmap outBitmap, Canvas canvas)
-    {
-        return super.onCreateThumbnail(outBitmap, canvas);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public View onCreateView(String name, Context context, AttributeSet attrs)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(name, context, attrs);
-        if (res.invoked)
-            return (View)res.methodReturns;
-        else
-            return super.onCreateView(name, context, attrs);
-    }
-    public View super_onCreateView(String name, Context context, AttributeSet attrs)
-    {
-        return super.onCreateView(name, context, attrs);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onDestroy()
-    {
-        super.onDestroy();
-        QtApplication.invokeDelegate();
-    }
-    //---------------------------------------------------------------------------
-
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event)
-    {
-        if (QtApplication.m_delegateObject != null && QtApplication.onKeyDown != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onKeyDown, keyCode, event);
-        else
-            return super.onKeyDown(keyCode, event);
-    }
-    public boolean super_onKeyDown(int keyCode, KeyEvent event)
-    {
-        return super.onKeyDown(keyCode, event);
-    }
-    //---------------------------------------------------------------------------
-
-
-    @Override
-    public boolean onKeyMultiple(int keyCode, int repeatCount, KeyEvent event)
-    {
-        if (QtApplication.m_delegateObject != null && QtApplication.onKeyMultiple != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onKeyMultiple, keyCode, repeatCount, event);
-        else
-            return super.onKeyMultiple(keyCode, repeatCount, event);
-    }
-    public boolean super_onKeyMultiple(int keyCode, int repeatCount, KeyEvent event)
-    {
-        return super.onKeyMultiple(keyCode, repeatCount, event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onKeyUp(int keyCode, KeyEvent event)
-    {
-        if (QtApplication.m_delegateObject != null  && QtApplication.onKeyDown != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onKeyUp, keyCode, event);
-        else
-            return super.onKeyUp(keyCode, event);
-    }
-    public boolean super_onKeyUp(int keyCode, KeyEvent event)
-    {
-        return super.onKeyUp(keyCode, event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onLowMemory()
-    {
-        if (!QtApplication.invokeDelegate().invoked)
-            super.onLowMemory();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onMenuItemSelected(int featureId, MenuItem item)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(featureId, item);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onMenuItemSelected(featureId, item);
-    }
-    public boolean super_onMenuItemSelected(int featureId, MenuItem item)
-    {
-        return super.onMenuItemSelected(featureId, item);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onMenuOpened(int featureId, Menu menu)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(featureId, menu);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onMenuOpened(featureId, menu);
-    }
-    public boolean super_onMenuOpened(int featureId, Menu menu)
-    {
-        return super.onMenuOpened(featureId, menu);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onNewIntent(Intent intent)
-    {
-        if (!QtApplication.invokeDelegate(intent).invoked)
-            super.onNewIntent(intent);
-    }
-    public void super_onNewIntent(Intent intent)
-    {
-        super.onNewIntent(intent);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(item);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onOptionsItemSelected(item);
-    }
-    public boolean super_onOptionsItemSelected(MenuItem item)
-    {
-        return super.onOptionsItemSelected(item);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onOptionsMenuClosed(Menu menu)
-    {
-        if (!QtApplication.invokeDelegate(menu).invoked)
-            super.onOptionsMenuClosed(menu);
-    }
-    public void super_onOptionsMenuClosed(Menu menu)
-    {
-        super.onOptionsMenuClosed(menu);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onPanelClosed(int featureId, Menu menu)
-    {
-        if (!QtApplication.invokeDelegate(featureId, menu).invoked)
-            super.onPanelClosed(featureId, menu);
-    }
-    public void super_onPanelClosed(int featureId, Menu menu)
-    {
-        super.onPanelClosed(featureId, menu);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onPause()
-    {
-        super.onPause();
-        QtApplication.invokeDelegate();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState)
-    {
-        super.onPostCreate(savedInstanceState);
-        QtApplication.invokeDelegate(savedInstanceState);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onPostResume()
-    {
-        super.onPostResume();
-        QtApplication.invokeDelegate();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog)
-    {
-        if (!QtApplication.invokeDelegate(id, dialog).invoked)
-            super.onPrepareDialog(id, dialog);
-    }
-    public void super_onPrepareDialog(int id, Dialog dialog)
-    {
-        super.onPrepareDialog(id, dialog);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(menu);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onPrepareOptionsMenu(menu);
-    }
-    public boolean super_onPrepareOptionsMenu(Menu menu)
-    {
-        return super.onPrepareOptionsMenu(menu);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onPreparePanel(int featureId, View view, Menu menu)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(featureId, view, menu);
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onPreparePanel(featureId, view, menu);
-    }
-    public boolean super_onPreparePanel(int featureId, View view, Menu menu)
-    {
-        return super.onPreparePanel(featureId, view, menu);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onRestart()
-    {
-        super.onRestart();
-        QtApplication.invokeDelegate();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onRestoreInstanceState(Bundle savedInstanceState)
-    {
-        if (!QtApplication.invokeDelegate(savedInstanceState).invoked)
-            super.onRestoreInstanceState(savedInstanceState);
-    }
-    public void super_onRestoreInstanceState(Bundle savedInstanceState)
-    {
-        super.onRestoreInstanceState(savedInstanceState);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onResume()
-    {
-        super.onResume();
-        QtApplication.invokeDelegate();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public Object onRetainNonConfigurationInstance()
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate();
-        if (res.invoked)
-            return res.methodReturns;
-        else
-            return super.onRetainNonConfigurationInstance();
-    }
-    public Object super_onRetainNonConfigurationInstance()
-    {
-        return super.onRetainNonConfigurationInstance();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onSaveInstanceState(Bundle outState)
-    {
-        if (!QtApplication.invokeDelegate(outState).invoked)
-            super.onSaveInstanceState(outState);
-    }
-    public void super_onSaveInstanceState(Bundle outState)
-    {
-        super.onSaveInstanceState(outState);
-
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onSearchRequested()
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate();
-        if (res.invoked)
-            return (Boolean)res.methodReturns;
-        else
-            return super.onSearchRequested();
-    }
-    public boolean super_onSearchRequested()
-    {
-        return super.onSearchRequested();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onStart()
-    {
-        super.onStart();
-        QtApplication.invokeDelegate();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onStop()
-    {
-        super.onStop();
-        QtApplication.invokeDelegate();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onTitleChanged(CharSequence title, int color)
-    {
-        if (!QtApplication.invokeDelegate(title, color).invoked)
-            super.onTitleChanged(title, color);
-    }
-    public void super_onTitleChanged(CharSequence title, int color)
-    {
-        super.onTitleChanged(title, color);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event)
-    {
-        if (QtApplication.m_delegateObject != null  && QtApplication.onTouchEvent != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onTouchEvent, event);
-        else
-            return super.onTouchEvent(event);
-    }
-    public boolean super_onTouchEvent(MotionEvent event)
-    {
-        return super.onTouchEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onTrackballEvent(MotionEvent event)
-    {
-        if (QtApplication.m_delegateObject != null  && QtApplication.onTrackballEvent != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onTrackballEvent, event);
-        else
-            return super.onTrackballEvent(event);
-    }
-    public boolean super_onTrackballEvent(MotionEvent event)
-    {
-        return super.onTrackballEvent(event);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onUserInteraction()
-    {
-        if (!QtApplication.invokeDelegate().invoked)
-            super.onUserInteraction();
-    }
-    public void super_onUserInteraction()
-    {
-        super.onUserInteraction();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onUserLeaveHint()
-    {
-        if (!QtApplication.invokeDelegate().invoked)
-            super.onUserLeaveHint();
-    }
-    public void super_onUserLeaveHint()
-    {
-        super.onUserLeaveHint();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onWindowAttributesChanged(LayoutParams params)
-    {
-        if (!QtApplication.invokeDelegate(params).invoked)
-            super.onWindowAttributesChanged(params);
-    }
-    public void super_onWindowAttributesChanged(LayoutParams params)
-    {
-        super.onWindowAttributesChanged(params);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onWindowFocusChanged(boolean hasFocus)
-    {
-        if (!QtApplication.invokeDelegate(hasFocus).invoked)
-            super.onWindowFocusChanged(hasFocus);
-    }
-    public void super_onWindowFocusChanged(boolean hasFocus)
-    {
-        super.onWindowFocusChanged(hasFocus);
-    }
-    //---------------------------------------------------------------------------
-
-    //////////////// Activity API 5 /////////////
-//@ANDROID-5
-    @Override
-    public void onAttachedToWindow()
-    {
-        if (!QtApplication.invokeDelegate().invoked)
-            super.onAttachedToWindow();
-    }
-    public void super_onAttachedToWindow()
-    {
-        super.onAttachedToWindow();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onBackPressed()
-    {
-        if (!QtApplication.invokeDelegate().invoked)
-            super.onBackPressed();
-    }
-    public void super_onBackPressed()
-    {
-        super.onBackPressed();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public void onDetachedFromWindow()
-    {
-        if (!QtApplication.invokeDelegate().invoked)
-            super.onDetachedFromWindow();
-    }
-    public void super_onDetachedFromWindow()
-    {
-        super.onDetachedFromWindow();
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    public boolean onKeyLongPress(int keyCode, KeyEvent event)
-    {
-        if (QtApplication.m_delegateObject != null  && QtApplication.onKeyLongPress != null)
-            return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onKeyLongPress, keyCode, event);
-        else
-            return super.onKeyLongPress(keyCode, event);
-    }
-    public boolean super_onKeyLongPress(int keyCode, KeyEvent event)
-    {
-        return super.onKeyLongPress(keyCode, event);
-    }
-    //---------------------------------------------------------------------------
-//@ANDROID-5
-
-//////////////// Activity API 8 /////////////
-//@ANDROID-8
-@Override
-    protected Dialog onCreateDialog(int id, Bundle args)
-    {
-        QtApplication.InvokeResult res = QtApplication.invokeDelegate(id, args);
-        if (res.invoked)
-            return (Dialog)res.methodReturns;
-        else
-            return super.onCreateDialog(id, args);
-    }
-    public Dialog super_onCreateDialog(int id, Bundle args)
-    {
-        return super.onCreateDialog(id, args);
-    }
-    //---------------------------------------------------------------------------
-
-    @Override
-    protected void onPrepareDialog(int id, Dialog dialog, Bundle args)
-    {
-        if (!QtApplication.invokeDelegate(id, dialog, args).invoked)
-            super.onPrepareDialog(id, dialog, args);
-    }
-    public void super_onPrepareDialog(int id, Dialog dialog, Bundle args)
-    {
-        super.onPrepareDialog(id, dialog, args);
-    }
-    //---------------------------------------------------------------------------
-//@ANDROID-8
-    //////////////// Activity API 11 /////////////
-
-//@ANDROID-11
-//QtCreator     @Override
-//QtCreator     public boolean dispatchKeyShortcutEvent(KeyEvent event)
-//QtCreator     {
-//QtCreator         if (QtApplication.m_delegateObject != null  && QtApplication.dispatchKeyShortcutEvent != null)
-//QtCreator             return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchKeyShortcutEvent, event);
-//QtCreator         else
-//QtCreator             return super.dispatchKeyShortcutEvent(event);
-//QtCreator     }
-//QtCreator     public boolean super_dispatchKeyShortcutEvent(KeyEvent event)
-//QtCreator     {
-//QtCreator         return super.dispatchKeyShortcutEvent(event);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//QtCreator 
-//QtCreator     @Override
-//QtCreator     public void onActionModeFinished(ActionMode mode)
-//QtCreator     {
-//QtCreator         if (!QtApplication.invokeDelegate(mode).invoked)
-//QtCreator             super.onActionModeFinished(mode);
-//QtCreator     }
-//QtCreator     public void super_onActionModeFinished(ActionMode mode)
-//QtCreator     {
-//QtCreator         super.onActionModeFinished(mode);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//QtCreator 
-//QtCreator     @Override
-//QtCreator     public void onActionModeStarted(ActionMode mode)
-//QtCreator     {
-//QtCreator         if (!QtApplication.invokeDelegate(mode).invoked)
-//QtCreator             super.onActionModeStarted(mode);
-//QtCreator     }
-//QtCreator     public void super_onActionModeStarted(ActionMode mode)
-//QtCreator     {
-//QtCreator         super.onActionModeStarted(mode);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//QtCreator 
-//QtCreator     @Override
-//QtCreator     public void onAttachFragment(Fragment fragment)
-//QtCreator     {
-//QtCreator         if (!QtApplication.invokeDelegate(fragment).invoked)
-//QtCreator             super.onAttachFragment(fragment);
-//QtCreator     }
-//QtCreator     public void super_onAttachFragment(Fragment fragment)
-//QtCreator     {
-//QtCreator         super.onAttachFragment(fragment);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//QtCreator 
-//QtCreator     @Override
-//QtCreator     public View onCreateView(View parent, String name, Context context, AttributeSet attrs)
-//QtCreator     {
-//QtCreator         QtApplication.InvokeResult res = QtApplication.invokeDelegate(parent, name, context, attrs);
-//QtCreator         if (res.invoked)
-//QtCreator             return (View)res.methodReturns;
-//QtCreator         else
-//QtCreator             return super.onCreateView(parent, name, context, attrs);
-//QtCreator     }
-//QtCreator     public View super_onCreateView(View parent, String name, Context context,
-//QtCreator             AttributeSet attrs) {
-//QtCreator         return super.onCreateView(parent, name, context, attrs);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//QtCreator 
-//QtCreator     @Override
-//QtCreator     public boolean onKeyShortcut(int keyCode, KeyEvent event)
-//QtCreator     {
-//QtCreator         if (QtApplication.m_delegateObject != null  && QtApplication.onKeyShortcut != null)
-//QtCreator             return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onKeyShortcut, keyCode,event);
-//QtCreator         else
-//QtCreator             return super.onKeyShortcut(keyCode, event);
-//QtCreator     }
-//QtCreator     public boolean super_onKeyShortcut(int keyCode, KeyEvent event)
-//QtCreator     {
-//QtCreator         return super.onKeyShortcut(keyCode, event);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//QtCreator 
-//QtCreator     @Override
-//QtCreator     public ActionMode onWindowStartingActionMode(Callback callback)
-//QtCreator     {
-//QtCreator         QtApplication.InvokeResult res = QtApplication.invokeDelegate(callback);
-//QtCreator         if (res.invoked)
-//QtCreator             return (ActionMode)res.methodReturns;
-//QtCreator         else
-//QtCreator             return super.onWindowStartingActionMode(callback);
-//QtCreator     }
-//QtCreator     public ActionMode super_onWindowStartingActionMode(Callback callback)
-//QtCreator     {
-//QtCreator         return super.onWindowStartingActionMode(callback);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//@ANDROID-11
-    //////////////// Activity API 12 /////////////
-
-//@ANDROID-12
-//QtCreator     @Override
-//QtCreator     public boolean dispatchGenericMotionEvent(MotionEvent ev)
-//QtCreator     {
-//QtCreator         if (QtApplication.m_delegateObject != null  && QtApplication.dispatchGenericMotionEvent != null)
-//QtCreator             return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.dispatchGenericMotionEvent, ev);
-//QtCreator         else
-//QtCreator             return super.dispatchGenericMotionEvent(ev);
-//QtCreator     }
-//QtCreator     public boolean super_dispatchGenericMotionEvent(MotionEvent event)
-//QtCreator     {
-//QtCreator         return super.dispatchGenericMotionEvent(event);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//QtCreator 
-//QtCreator     @Override
-//QtCreator     public boolean onGenericMotionEvent(MotionEvent event)
-//QtCreator     {
-//QtCreator         if (QtApplication.m_delegateObject != null  && QtApplication.onGenericMotionEvent != null)
-//QtCreator             return (Boolean) QtApplication.invokeDelegateMethod(QtApplication.onGenericMotionEvent, event);
-//QtCreator         else
-//QtCreator             return super.onGenericMotionEvent(event);
-//QtCreator     }
-//QtCreator     public boolean super_onGenericMotionEvent(MotionEvent event)
-//QtCreator     {
-//QtCreator         return super.onGenericMotionEvent(event);
-//QtCreator     }
-//QtCreator     //---------------------------------------------------------------------------
-//@ANDROID-12
-
-}
diff --git a/experimental/qt5-intro-android/android/src/org/qtproject/qt5/android/bindings/QtApplication.java b/experimental/qt5-intro-android/android/src/org/qtproject/qt5/android/bindings/QtApplication.java
deleted file mode 100644
index 4de1c83..0000000
--- a/experimental/qt5-intro-android/android/src/org/qtproject/qt5/android/bindings/QtApplication.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-    Copyright (c) 2012-2013, BogDan Vatra <bogdan@kde.org>
-    Contact: http://www.qt-project.org/legal
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions
-    are met:
-
-    1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package org.qtproject.qt5.android.bindings;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import android.app.Application;
-
-public class QtApplication extends Application
-{
-    public final static String QtTAG = "Qt";
-    public static Object m_delegateObject = null;
-    public static HashMap<String, ArrayList<Method>> m_delegateMethods= new HashMap<String, ArrayList<Method>>();
-    public static Method dispatchKeyEvent = null;
-    public static Method dispatchPopulateAccessibilityEvent = null;
-    public static Method dispatchTouchEvent = null;
-    public static Method dispatchTrackballEvent = null;
-    public static Method onKeyDown = null;
-    public static Method onKeyMultiple = null;
-    public static Method onKeyUp = null;
-    public static Method onTouchEvent = null;
-    public static Method onTrackballEvent = null;
-    public static Method onActivityResult = null;
-    public static Method onCreate = null;
-    public static Method onKeyLongPress = null;
-    public static Method dispatchKeyShortcutEvent = null;
-    public static Method onKeyShortcut = null;
-    public static Method dispatchGenericMotionEvent = null;
-    public static Method onGenericMotionEvent = null;
-
-    public static void setQtActivityDelegate(Object listener)
-    {
-        QtApplication.m_delegateObject = listener;
-
-        ArrayList<Method> delegateMethods = new ArrayList<Method>();
-        for (Method m : listener.getClass().getMethods()) {
-            if (m.getDeclaringClass().getName().startsWith("org.qtproject.qt5.android"))
-                delegateMethods.add(m);
-        }
-
-        ArrayList<Field> applicationFields = new ArrayList<Field>();
-        for (Field f : QtApplication.class.getFields()) {
-            if (f.getDeclaringClass().getName().equals(QtApplication.class.getName()))
-                applicationFields.add(f);
-        }
-
-        for (Method delegateMethod : delegateMethods) {
-            try {
-                QtActivity.class.getDeclaredMethod(delegateMethod.getName(), delegateMethod.getParameterTypes());
-                if (QtApplication.m_delegateMethods.containsKey(delegateMethod.getName())) {
-                    QtApplication.m_delegateMethods.get(delegateMethod.getName()).add(delegateMethod);
-                } else {
-                    ArrayList<Method> delegateSet = new ArrayList<Method>();
-                    delegateSet.add(delegateMethod);
-                    QtApplication.m_delegateMethods.put(delegateMethod.getName(), delegateSet);
-                }
-                for (Field applicationField:applicationFields) {
-                    if (applicationField.getName().equals(delegateMethod.getName())) {
-                        try {
-                            applicationField.set(null, delegateMethod);
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                        }
-                    }
-                }
-            } catch (Exception e) {
-            }
-        }
-    }
-
-    @Override
-    public void onTerminate() {
-        if (m_delegateObject != null && m_delegateMethods.containsKey("onTerminate"))
-            invokeDelegateMethod(m_delegateMethods.get("onTerminate").get(0));
-        super.onTerminate();
-    }
-
-    public static class InvokeResult
-    {
-        public boolean invoked = false;
-        public Object methodReturns = null;
-    }
-
-    private static int stackDeep=-1;
-    public static InvokeResult invokeDelegate(Object... args)
-    {
-        InvokeResult result = new InvokeResult();
-        if (m_delegateObject == null)
-            return result;
-        StackTraceElement[] elements = Thread.currentThread().getStackTrace();
-        if (-1 == stackDeep) {
-            String activityClassName = QtActivity.class.getCanonicalName();
-            for (int it=0;it<elements.length;it++)
-                if (elements[it].getClassName().equals(activityClassName)) {
-                    stackDeep = it;
-                    break;
-                }
-        }
-        final String methodName=elements[stackDeep].getMethodName();
-        if (-1 == stackDeep || !m_delegateMethods.containsKey(methodName))
-            return result;
-
-        for (Method m : m_delegateMethods.get(methodName)) {
-            if (m.getParameterTypes().length == args.length) {
-                result.methodReturns = invokeDelegateMethod(m, args);
-                result.invoked = true;
-                return result;
-            }
-        }
-        return result;
-    }
-
-    public static Object invokeDelegateMethod(Method m, Object... args)
-    {
-        try {
-            return m.invoke(m_delegateObject, args);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-}
diff --git a/experimental/qt5-intro-android/android/version.xml b/experimental/qt5-intro-android/android/version.xml
deleted file mode 100644
index e709357..0000000
--- a/experimental/qt5-intro-android/android/version.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<version value="5">
-    <ignore>
-        <file>AndroidManifest.xml</file>
-        <file>libs.xml</file>
-        <file>logo.png</file>
-        <file>icon.png</file>
-    </ignore>
-</version>
diff --git a/experimental/qt5-intro-android/calqlatr/Calqlatr.qml b/experimental/qt5-intro-android/calqlatr/Calqlatr.qml
deleted file mode 100644
index 7640fbd..0000000
--- a/experimental/qt5-intro-android/calqlatr/Calqlatr.qml
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "content"
-import "content/calculator.js" as CalcEngine
-
-
-Rectangle {
-    id: window
-    width: 320
-    height: 480
-    focus: true
-    color: "#272822"
-
-    onWidthChanged: controller.reload()
-
-    function operatorPressed(operator) { CalcEngine.operatorPressed(operator) }
-    function digitPressed(digit) { CalcEngine.digitPressed(digit) }
-
-    Item {
-        id: pad
-        width: window.width * 0.58
-        NumberPad { y: 10; anchors.horizontalCenter: parent.horizontalCenter }
-    }
-
-    AnimationController {
-        id: controller
-        animation: ParallelAnimation {
-            id: anim
-            NumberAnimation { target: display; property: "x"; duration: 400; from: -16; to: window.width - display.width; easing.type: Easing.InOutQuad }
-            NumberAnimation { target: pad; property: "x"; duration: 400; from: window.width - pad.width; to: 0; easing.type: Easing.InOutQuad }
-            SequentialAnimation {
-                NumberAnimation { target: pad; property: "scale"; duration: 200; from: 1; to: 0.97; easing.type: Easing.InOutQuad }
-                NumberAnimation { target: pad; property: "scale"; duration: 200; from: 0.97; to: 1; easing.type: Easing.InOutQuad }
-            }
-        }
-    }
-
-    Display {
-        id: display
-        x: -16
-        width: window.width * 0.42
-        height: parent.height
-
-        MouseArea {
-            property real startX: 0
-            property real oldP: 0
-            property bool rewind: false
-
-            anchors.fill: parent
-            onPositionChanged: {
-                var reverse = startX > window.width / 2
-                var mx = mapToItem(window, mouse.x).x
-                var p = Math.abs((mx - startX) / (window.width - display.width))
-                if (p < oldP)
-                    rewind = reverse ? false : true
-                else
-                    rewind = reverse ? true : false
-                controller.progress = reverse ? 1 - p : p
-                oldP = p
-            }
-            onPressed: startX = mapToItem(window, mouse.x).x
-            onReleased: {
-                if (rewind)
-                    controller.completeToBeginning()
-                else
-                    controller.completeToEnd()
-            }
-        }
-    }
-
-}
diff --git a/experimental/qt5-intro-android/calqlatr/content/Button.qml b/experimental/qt5-intro-android/calqlatr/content/Button.qml
deleted file mode 100644
index c355c2d..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/Button.qml
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    property alias text: textItem.text
-    property alias color: textItem.color
-
-    property bool operator: false
-
-    signal clicked
-
-    width: 30
-    height: 50
-
-    Text {
-        id: textItem
-        font.pixelSize: 48
-        wrapMode: Text.WordWrap
-        lineHeight: 0.75
-        color: "white"
-    }
-
-//    Rectangle {
-//        color: "red"
-//        opacity: 0.2
-//        anchors.fill: mouse
-//    }
-
-    MouseArea {
-        id: mouse
-        anchors.fill: parent
-        anchors.margins: -5
-        onClicked: {
-            //parent.clicked()
-            if (operator)
-                window.operatorPressed(parent.text)
-            else
-                window.digitPressed(parent.text)
-        }
-    }
-}
diff --git a/experimental/qt5-intro-android/calqlatr/content/Display.qml b/experimental/qt5-intro-android/calqlatr/content/Display.qml
deleted file mode 100644
index 3c1d9c0..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/Display.qml
+++ /dev/null
@@ -1,124 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    id: display
-
-    function displayOperator(operator)
-    {
-        listView.model.append({ "operator": operator, "operand": "" })
-    }
-
-    function newLine(operator, operand)
-    {
-        listView.model.append({ "operator": operator, "operand": operand })
-    }
-
-    function appendDigit(digit)
-    {
-        if (!listView.model.count)
-            listView.model.append({ "operator": "", "operand": "" })
-        var i = listView.model.count - 1;
-        listView.model.get(i).operand = listView.model.get(i).operand + digit;
-    }
-
-    Item {
-        id: theItem
-        width: parent.width + 32
-        height: parent.height
-
-        Rectangle {
-            id: rect
-            x: 16
-            color: "white"
-            height: parent.height
-            width: display.width - 16
-        }
-        Image {
-            anchors.right: rect.left
-            source: "images/paper-edge-left.png"
-            height: parent.height
-            fillMode: Image.TileVertically
-        }
-        Image {
-            anchors.left: rect.right
-            source: "images/paper-edge-right.png"
-            height: parent.height
-            fillMode: Image.TileVertically
-        }
-
-        Image {
-            source: "images/paper-grip.png"
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 20
-        }
-
-        ListView {
-            id: listView
-            x: 16; y: 30
-            width: display.width
-            height: display.height
-            delegate: Item {
-                height: 20
-                width: parent.width
-                Text {
-                    id: operator
-                    x: 8
-                    font.pixelSize: 18
-                    color: "#6da43d"
-                    text: model.operator
-                }
-                Text {
-                    id: operand
-                    font.pixelSize: 18
-                    anchors.right: parent.right
-                    anchors.rightMargin: 26
-                    text: model.operand
-                }
-            }
-            model: ListModel { }
-        }
-
-    }
-
-}
diff --git a/experimental/qt5-intro-android/calqlatr/content/NumberPad.qml b/experimental/qt5-intro-android/calqlatr/content/NumberPad.qml
deleted file mode 100644
index 853c763..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/NumberPad.qml
+++ /dev/null
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Grid {
-    columns: 3
-    columnSpacing: 32
-    rowSpacing: 16
-
-    Button { text: "7" }
-    Button { text: "8" }
-    Button { text: "9" }
-    Button { text: "4" }
-    Button { text: "5" }
-    Button { text: "6" }
-    Button { text: "1" }
-    Button { text: "2" }
-    Button { text: "3" }
-    Button { text: "0" }
-    Button { text: "." }
-    Button { text: " " }
-    Button { text: "±"; color: "#6da43d"; operator: true }
-    Button { text: "−"; color: "#6da43d"; operator: true }
-    Button { text: "+"; color: "#6da43d"; operator: true }
-    Button { text: " "; color: "#6da43d"; operator: true }
-    Button { text: "÷"; color: "#6da43d"; operator: true }
-    Button { text: "×"; color: "#6da43d"; operator: true }
-    Button { text: "C"; color: "#6da43d"; operator: true }
-    Button { text: " "; color: "#6da43d"; operator: true }
-    Button { text: "="; color: "#6da43d"; operator: true }
-}
diff --git a/experimental/qt5-intro-android/calqlatr/content/StyleLabel.qml b/experimental/qt5-intro-android/calqlatr/content/StyleLabel.qml
deleted file mode 100644
index 3bdea86..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/StyleLabel.qml
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Text {
-    width: 64
-    font.pixelSize: 14
-    font.bold: false
-    wrapMode: Text.WordWrap
-    lineHeight: 0.75
-    color: "#676764"
-}
diff --git a/experimental/qt5-intro-android/calqlatr/content/audio/touch.wav b/experimental/qt5-intro-android/calqlatr/content/audio/touch.wav
deleted file mode 100644
index 94cccb7..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/audio/touch.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/calculator.js b/experimental/qt5-intro-android/calqlatr/content/calculator.js
deleted file mode 100644
index 843ef39..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/calculator.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-var curVal = 0
-var memory = 0
-var lastOp = ""
-var previousOperator = ""
-var digits = ""
-
-function disabled(op) {
-    if (op == "." && digits.toString().search(/\./) != -1) {
-        return true
-    } else if (op == window.squareRoot &&  digits.toString().search(/-/) != -1) {
-        return true
-    } else {
-        return false
-    }
-}
-
-function digitPressed(op)
-{
-    if (disabled(op))
-        return
-    if (digits.toString().length >= 14)
-        return
-    if (lastOp.toString().length == 1 && ((lastOp >= "0" && lastOp <= "9") || lastOp == ".") ) {
-        digits = digits + op.toString()
-        display.appendDigit(op.toString())
-    } else {
-        digits = op
-        display.appendDigit(op.toString())
-    }
-    lastOp = op
-}
-
-function operatorPressed(op)
-{
-    if (disabled(op))
-        return
-    lastOp = op
-
-    if (previousOperator == "+") {
-        digits = Number(digits.valueOf()) + Number(curVal.valueOf())
-    } else if (previousOperator == "−") {
-        digits = Number(curVal) - Number(digits.valueOf())
-    } else if (previousOperator == "×") {
-        digits = Number(curVal) * Number(digits.valueOf())
-    } else if (previousOperator == "÷") {
-        digits = Number(Number(curVal) / Number(digits.valueOf())).toString()
-    } else if (previousOperator == "=") {
-    }
-
-    if (op == "+" || op == "−" || op == "×" || op == "÷") {
-        previousOperator = op
-        curVal = digits.valueOf()
-        display.displayOperator(previousOperator)
-        return
-    }
-
-    if (op == "=") {
-        display.newLine("=", digits.toString())
-    }
-
-    curVal = 0
-    previousOperator = ""
-
-    if (op == "1/x") {
-        digits = (1 / digits.valueOf()).toString()
-    } else if (op == "x^2") {
-        digits = (digits.valueOf() * digits.valueOf()).toString()
-    } else if (op == "Abs") {
-        digits = (Math.abs(digits.valueOf())).toString()
-    } else if (op == "Int") {
-        digits = (Math.floor(digits.valueOf())).toString()
-    } else if (op == window.plusminus) {
-        digits = (digits.valueOf() * -1).toString()
-    } else if (op == window.squareRoot) {
-        digits = (Math.sqrt(digits.valueOf())).toString()
-    } else if (op == "mc") {
-        memory = 0;
-    } else if (op == "m+") {
-        memory += digits.valueOf()
-    } else if (op == "mr") {
-        digits = memory.toString()
-    } else if (op == "m-") {
-        memory = digits.valueOf()
-    } else if (op == window.leftArrow) {
-        digits = digits.toString().slice(0, -1)
-        if (digits.length == 0) {
-            digits = "0"
-        }
-    } else if (op == "Off") {
-        Qt.quit();
-    } else if (op == "C") {
-        digits = "0"
-    } else if (op == "AC") {
-        curVal = 0
-        memory = 0
-        lastOp = ""
-        digits ="0"
-    }
-
-
-}
-
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/icon-back.png b/experimental/qt5-intro-android/calqlatr/content/images/icon-back.png
deleted file mode 100644
index 2989ee2..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/icon-back.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/icon-close.png b/experimental/qt5-intro-android/calqlatr/content/images/icon-close.png
deleted file mode 100644
index 3e21248..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/icon-close.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/icon-settings.png b/experimental/qt5-intro-android/calqlatr/content/images/icon-settings.png
deleted file mode 100644
index 98e662f..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/icon-settings.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/logo.png b/experimental/qt5-intro-android/calqlatr/content/images/logo.png
deleted file mode 100644
index 6bc6561..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/logo.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/paper-edge-left.png b/experimental/qt5-intro-android/calqlatr/content/images/paper-edge-left.png
deleted file mode 100644
index ca29a3a..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/paper-edge-left.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/paper-edge-right.png b/experimental/qt5-intro-android/calqlatr/content/images/paper-edge-right.png
deleted file mode 100644
index 7c2da7b..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/paper-edge-right.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/paper-grip.png b/experimental/qt5-intro-android/calqlatr/content/images/paper-grip.png
deleted file mode 100644
index 953c408..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/paper-grip.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/settings-selected-a.png b/experimental/qt5-intro-android/calqlatr/content/images/settings-selected-a.png
deleted file mode 100644
index e08ddfa..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/settings-selected-a.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/settings-selected-b.png b/experimental/qt5-intro-android/calqlatr/content/images/settings-selected-b.png
deleted file mode 100644
index d9aa7e3..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/settings-selected-b.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/touch-green.png b/experimental/qt5-intro-android/calqlatr/content/images/touch-green.png
deleted file mode 100644
index 64dbde6..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/touch-green.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/calqlatr/content/images/touch-white.png b/experimental/qt5-intro-android/calqlatr/content/images/touch-white.png
deleted file mode 100644
index bb02b00..0000000
--- a/experimental/qt5-intro-android/calqlatr/content/images/touch-white.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/demo.qmlproject b/experimental/qt5-intro-android/demo.qmlproject
deleted file mode 100644
index eed1c97..0000000
--- a/experimental/qt5-intro-android/demo.qmlproject
+++ /dev/null
@@ -1,18 +0,0 @@
-/* File generated by Qt Creator, version 2.6.1 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "main.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "images"
-    }
-}
diff --git a/experimental/qt5-intro-android/description.txt b/experimental/qt5-intro-android/description.txt
deleted file mode 100644
index 48d03f3..0000000
--- a/experimental/qt5-intro-android/description.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The following is a quick tour of what is new in Qt 5.
-
-It is an application written with Qt Quick, based on Qt 5. The source code is available from: https://qt.gitorious.org/qt-labs/qt5-launch-demo
-The demo makes use of the QML Presentation System, available from: ssh://codereview.qt-project.org/qt-labs/qml-presentation-system.git
-
-The demo has been modified slightly to run in this launcher.
diff --git a/experimental/qt5-intro-android/images/ally.png b/experimental/qt5-intro-android/images/ally.png
deleted file mode 100644
index 05b405b..0000000
--- a/experimental/qt5-intro-android/images/ally.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/butterfly.png b/experimental/qt5-intro-android/images/butterfly.png
deleted file mode 100644
index b8cc35c..0000000
--- a/experimental/qt5-intro-android/images/butterfly.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/displace.png b/experimental/qt5-intro-android/images/displace.png
deleted file mode 100644
index 440e8cb..0000000
--- a/experimental/qt5-intro-android/images/displace.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/fog.png b/experimental/qt5-intro-android/images/fog.png
deleted file mode 100644
index f462222..0000000
--- a/experimental/qt5-intro-android/images/fog.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/particle.png b/experimental/qt5-intro-android/images/particle.png
deleted file mode 100644
index 5c83896..0000000
--- a/experimental/qt5-intro-android/images/particle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/qt-logo-hdpi.png b/experimental/qt5-intro-android/images/qt-logo-hdpi.png
deleted file mode 100644
index 379cfab..0000000
--- a/experimental/qt5-intro-android/images/qt-logo-hdpi.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/qt-logo-ldpi.png b/experimental/qt5-intro-android/images/qt-logo-ldpi.png
deleted file mode 100644
index 587c0ca..0000000
--- a/experimental/qt5-intro-android/images/qt-logo-ldpi.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/qt-logo-mdpi.png b/experimental/qt5-intro-android/images/qt-logo-mdpi.png
deleted file mode 100644
index d93a564..0000000
--- a/experimental/qt5-intro-android/images/qt-logo-mdpi.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/qt-logo.png b/experimental/qt5-intro-android/images/qt-logo.png
deleted file mode 100644
index 7b5c533..0000000
--- a/experimental/qt5-intro-android/images/qt-logo.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/widgets_boxes.png b/experimental/qt5-intro-android/images/widgets_boxes.png
deleted file mode 100644
index 3115255..0000000
--- a/experimental/qt5-intro-android/images/widgets_boxes.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/widgets_chips.png b/experimental/qt5-intro-android/images/widgets_chips.png
deleted file mode 100644
index 4ef1664..0000000
--- a/experimental/qt5-intro-android/images/widgets_chips.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/widgets_mainwindows.png b/experimental/qt5-intro-android/images/widgets_mainwindows.png
deleted file mode 100644
index 5ce5416..0000000
--- a/experimental/qt5-intro-android/images/widgets_mainwindows.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/widgets_styles_fusion.png b/experimental/qt5-intro-android/images/widgets_styles_fusion.png
deleted file mode 100644
index d94f859..0000000
--- a/experimental/qt5-intro-android/images/widgets_styles_fusion.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/images/widgets_styles_macstyle.png b/experimental/qt5-intro-android/images/widgets_styles_macstyle.png
deleted file mode 100644
index 033f43b..0000000
--- a/experimental/qt5-intro-android/images/widgets_styles_macstyle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/main.qml b/experimental/qt5-intro-android/main.qml
deleted file mode 100644
index 2f44e72..0000000
--- a/experimental/qt5-intro-android/main.qml
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-
-    width: 1280
-    height: 720
-    color: "black"
-
-    property real widthFactor: root.width / root.height;
-
-    DemoMain {
-        width: 720 * root.widthFactor
-        height: 720
-
-        anchors.centerIn: parent
-
-        scale: root.height / height
-
-        useDropShadow: false;
-        useSimpleGradient: false;
-    }
-
-}
diff --git a/experimental/qt5-intro-android/main.qrc b/experimental/qt5-intro-android/main.qrc
deleted file mode 100644
index c825270..0000000
--- a/experimental/qt5-intro-android/main.qrc
+++ /dev/null
@@ -1,203 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>Button.qml</file>
-        <file>CameraSlide.qml</file>
-        <file>CanvasSlide.qml</file>
-        <file>DemoMain.qml</file>
-        <file>EffectsSlide.qml</file>
-        <file>description.txt</file>
-        <file>ExamplesSlide.qml</file>
-        <file>FontSlide.qml</file>
-        <file>main_hifi.qml</file>
-        <file>main.qml</file>
-        <file>NoisyGradient.qml</file>
-        <file>NormalMapGenerator.qml</file>
-        <file>OpacityTransitionPresentation.qml</file>
-        <file>ParticleSlide.qml</file>
-        <file>preview_l.jpg</file>
-        <file>ShaderSlide.qml</file>
-        <file>SlideDeck.qml</file>
-        <file>Swirl.qml</file>
-        <file>VideoSlide.qml</file>
-        <file>WebkitSlide.qml</file>
-        <file>WebKitSlideContent.qml</file>
-        <file>WidgetsSlide.qml</file>
-        <file>README</file>
-        <file>calqlatr/Calqlatr.qml</file>
-        <file>calqlatr/content/Button.qml</file>
-        <file>calqlatr/content/calculator.js</file>
-        <file>calqlatr/content/Display.qml</file>
-        <file>calqlatr/content/NumberPad.qml</file>
-        <file>calqlatr/content/StyleLabel.qml</file>
-        <file>calqlatr/content/audio/touch.wav</file>
-        <file>calqlatr/content/images/icon-back.png</file>
-        <file>calqlatr/content/images/icon-close.png</file>
-        <file>calqlatr/content/images/icon-settings.png</file>
-        <file>calqlatr/content/images/logo.png</file>
-        <file>calqlatr/content/images/paper-edge-left.png</file>
-        <file>calqlatr/content/images/paper-edge-right.png</file>
-        <file>calqlatr/content/images/paper-grip.png</file>
-        <file>calqlatr/content/images/settings-selected-a.png</file>
-        <file>calqlatr/content/images/settings-selected-b.png</file>
-        <file>calqlatr/content/images/touch-green.png</file>
-        <file>calqlatr/content/images/touch-white.png</file>
-        <file>images/ally.png</file>
-        <file>images/butterfly.png</file>
-        <file>images/displace.png</file>
-        <file>images/fog.png</file>
-        <file>images/particle.png</file>
-        <file>images/qt-logo.png</file>
-        <file>images/widgets_boxes.png</file>
-        <file>images/widgets_chips.png</file>
-        <file>images/widgets_mainwindows.png</file>
-        <file>images/widgets_styles_fusion.png</file>
-        <file>images/widgets_styles_macstyle.png</file>
-        <file>maroon/Maroon.qml</file>
-        <file>maroon/content/GameCanvas.qml</file>
-        <file>maroon/content/BuildButton.qml</file>
-        <file>maroon/content/GameOverScreen.qml</file>
-        <file>maroon/content/InfoBar.qml</file>
-        <file>maroon/content/logic.js</file>
-        <file>maroon/content/NewGameScreen.qml</file>
-        <file>maroon/content/SoundEffect.qml</file>
-        <file>maroon/content/audio/bomb-action.wav</file>
-        <file>maroon/content/audio/catch-action.wav</file>
-        <file>maroon/content/audio/catch.wav</file>
-        <file>maroon/content/audio/currency.wav</file>
-        <file>maroon/content/audio/factory-action.wav</file>
-        <file>maroon/content/audio/melee-action.wav</file>
-        <file>maroon/content/audio/projectile-action.wav</file>
-        <file>maroon/content/audio/shooter-action.wav</file>
-        <file>maroon/content/gfx/background.png</file>
-        <file>maroon/content/gfx/bomb-action.png</file>
-        <file>maroon/content/gfx/bomb-idle.png</file>
-        <file>maroon/content/gfx/bomb.png</file>
-        <file>maroon/content/gfx/button-help.png</file>
-        <file>maroon/content/gfx/button-play.png</file>
-        <file>maroon/content/gfx/catch-action.png</file>
-        <file>maroon/content/gfx/catch.png</file>
-        <file>maroon/content/gfx/cloud.png</file>
-        <file>maroon/content/gfx/currency.png</file>
-        <file>maroon/content/gfx/dialog-bomb.png</file>
-        <file>maroon/content/gfx/dialog-factory.png</file>
-        <file>maroon/content/gfx/dialog-melee.png</file>
-        <file>maroon/content/gfx/dialog-pointer.png</file>
-        <file>maroon/content/gfx/dialog-shooter.png</file>
-        <file>maroon/content/gfx/dialog.png</file>
-        <file>maroon/content/gfx/factory-action.png</file>
-        <file>maroon/content/gfx/factory-idle.png</file>
-        <file>maroon/content/gfx/factory.png</file>
-        <file>maroon/content/gfx/grid.png</file>
-        <file>maroon/content/gfx/help.png</file>
-        <file>maroon/content/gfx/lifes.png</file>
-        <file>maroon/content/gfx/logo-bubble.png</file>
-        <file>maroon/content/gfx/logo-fish.png</file>
-        <file>maroon/content/gfx/logo.png</file>
-        <file>maroon/content/gfx/melee-action.png</file>
-        <file>maroon/content/gfx/melee-idle.png</file>
-        <file>maroon/content/gfx/melee.png</file>
-        <file>maroon/content/gfx/mob-idle.png</file>
-        <file>maroon/content/gfx/mob.png</file>
-        <file>maroon/content/gfx/points.png</file>
-        <file>maroon/content/gfx/projectile-action.png</file>
-        <file>maroon/content/gfx/projectile.png</file>
-        <file>maroon/content/gfx/scores.png</file>
-        <file>maroon/content/gfx/shooter-action.png</file>
-        <file>maroon/content/gfx/shooter-idle.png</file>
-        <file>maroon/content/gfx/shooter.png</file>
-        <file>maroon/content/gfx/sunlight.png</file>
-        <file>maroon/content/gfx/text-1.png</file>
-        <file>maroon/content/gfx/text-2.png</file>
-        <file>maroon/content/gfx/text-3.png</file>
-        <file>maroon/content/gfx/text-blank.png</file>
-        <file>maroon/content/gfx/text-gameover.png</file>
-        <file>maroon/content/gfx/text-go.png</file>
-        <file>maroon/content/gfx/wave.png</file>
-        <file>maroon/content/mobs/MobBase.qml</file>
-        <file>maroon/content/towers/Bomb.qml</file>
-        <file>maroon/content/towers/Factory.qml</file>
-        <file>maroon/content/towers/Melee.qml</file>
-        <file>maroon/content/towers/Ranged.qml</file>
-        <file>maroon/content/towers/TowerBase.qml</file>
-        <file>particles/customemitter.qml</file>
-        <file>particles/emitmask.qml</file>
-        <file>particles/particle.png</file>
-        <file>particles/particle4.png</file>
-        <file>particles/star.png</file>
-        <file>particles/starfish_mask.png</file>
-        <file>particles/velocityfrommotion.qml</file>
-        <file>presentation/Clock.qml</file>
-        <file>presentation/CodeSlide.qml</file>
-        <file>presentation/Presentation.qml</file>
-        <file>presentation/Slide.qml</file>
-        <file>presentation/SlideCounter.qml</file>
-        <file>samegame/Samegame.qml</file>
-        <file>samegame/settings.js</file>
-        <file>samegame/content/Block.qml</file>
-        <file>samegame/content/BlockEmitter.qml</file>
-        <file>samegame/content/Button.qml</file>
-        <file>samegame/content/GameArea.qml</file>
-        <file>samegame/content/LogoAnimation.qml</file>
-        <file>samegame/content/MenuEmitter.qml</file>
-        <file>samegame/content/PaintEmitter.qml</file>
-        <file>samegame/content/PrimaryPack.qml</file>
-        <file>samegame/content/PuzzleBlock.qml</file>
-        <file>samegame/content/samegame.js</file>
-        <file>samegame/content/SamegameText.qml</file>
-        <file>samegame/content/SimpleBlock.qml</file>
-        <file>samegame/content/SmokeText.qml</file>
-        <file>samegame/content/gfx/background-puzzle.png</file>
-        <file>samegame/content/gfx/background.png</file>
-        <file>samegame/content/gfx/bar.png</file>
-        <file>samegame/content/gfx/blue-puzzle.png</file>
-        <file>samegame/content/gfx/blue.png</file>
-        <file>samegame/content/gfx/bubble-highscore.png</file>
-        <file>samegame/content/gfx/bubble-puzzle.png</file>
-        <file>samegame/content/gfx/but-game-1.png</file>
-        <file>samegame/content/gfx/but-game-2.png</file>
-        <file>samegame/content/gfx/but-game-3.png</file>
-        <file>samegame/content/gfx/but-game-4.png</file>
-        <file>samegame/content/gfx/but-game-new.png</file>
-        <file>samegame/content/gfx/but-menu.png</file>
-        <file>samegame/content/gfx/but-puzzle-next.png</file>
-        <file>samegame/content/gfx/but-quit.png</file>
-        <file>samegame/content/gfx/green-puzzle.png</file>
-        <file>samegame/content/gfx/green.png</file>
-        <file>samegame/content/gfx/icon-fail.png</file>
-        <file>samegame/content/gfx/icon-ok.png</file>
-        <file>samegame/content/gfx/icon-time.png</file>
-        <file>samegame/content/gfx/logo-a.png</file>
-        <file>samegame/content/gfx/logo-e.png</file>
-        <file>samegame/content/gfx/logo-g.png</file>
-        <file>samegame/content/gfx/logo-m.png</file>
-        <file>samegame/content/gfx/logo-s.png</file>
-        <file>samegame/content/gfx/logo.png</file>
-        <file>samegame/content/gfx/particle-brick.png</file>
-        <file>samegame/content/gfx/particle-paint.png</file>
-        <file>samegame/content/gfx/particle-smoke.png</file>
-        <file>samegame/content/gfx/red-puzzle.png</file>
-        <file>samegame/content/gfx/red.png</file>
-        <file>samegame/content/gfx/text-highscore-new.png</file>
-        <file>samegame/content/gfx/text-highscore.png</file>
-        <file>samegame/content/gfx/text-no-winner.png</file>
-        <file>samegame/content/gfx/text-p1-go.png</file>
-        <file>samegame/content/gfx/text-p1-won.png</file>
-        <file>samegame/content/gfx/text-p1.png</file>
-        <file>samegame/content/gfx/text-p2-go.png</file>
-        <file>samegame/content/gfx/text-p2-won.png</file>
-        <file>samegame/content/gfx/text-p2.png</file>
-        <file>samegame/content/gfx/yellow-puzzle.png</file>
-        <file>samegame/content/gfx/yellow.png</file>
-        <file>samegame/content/levels/level0.qml</file>
-        <file>samegame/content/levels/level1.qml</file>
-        <file>samegame/content/levels/level2.qml</file>
-        <file>samegame/content/levels/level3.qml</file>
-        <file>samegame/content/levels/level4.qml</file>
-        <file>samegame/content/levels/level5.qml</file>
-        <file>samegame/content/levels/level6.qml</file>
-        <file>samegame/content/levels/level7.qml</file>
-        <file>samegame/content/levels/level8.qml</file>
-        <file>samegame/content/levels/level9.qml</file>
-        <file>samegame/content/levels/TemplateBase.qml</file>
-    </qresource>
-</RCC>
diff --git a/experimental/qt5-intro-android/main_hifi.qml b/experimental/qt5-intro-android/main_hifi.qml
deleted file mode 100644
index 19e006b..0000000
--- a/experimental/qt5-intro-android/main_hifi.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt 5 launch demo.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-DemoMain {
-    autorun: true
-}
diff --git a/experimental/qt5-intro-android/maroon/Maroon.qml b/experimental/qt5-intro-android/maroon/Maroon.qml
deleted file mode 100644
index d7bfcb6..0000000
--- a/experimental/qt5-intro-android/maroon/Maroon.qml
+++ /dev/null
@@ -1,233 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "content"
-import "content/logic.js" as Logic
-
-Item {
-    id: root
-    width: 320
-    height: 480
-    property var gameState: Logic.newGameState(canvas);
-    property bool passedSplash: false
-
-    Image {
-        source:"content/gfx/background.png"
-        anchors.bottom: view.bottom
-
-        ParticleSystem {
-            id: particles
-            anchors.fill: parent
-
-            ImageParticle {
-                id: bubble
-                anchors.fill: parent
-                source: "content/gfx/catch.png"
-                opacity: 0.25
-            }
-
-            Wander {
-                xVariance: 25;
-                pace: 25;
-            }
-
-            Emitter {
-                width: parent.width
-                height: 150
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 3
-                startTime: 15000
-
-                emitRate: 2
-                lifeSpan: 15000
-
-                acceleration: PointDirection{ y: -6; xVariation: 2; yVariation: 2 }
-
-                size: 24
-                sizeVariation: 16
-            }
-        }
-    }
-
-    Column {
-        id: view
-        y: -(height - 480)
-        width: 320
-
-        GameOverScreen { gameCanvas: canvas }
-
-        Item {
-            id: canvasArea
-            width: 320
-            height: 480
-
-            Row {
-                height: childrenRect.height
-                Image {
-                    id: wave
-                    y: 30
-                    source:"content/gfx/wave.png"
-                }
-                Image {
-                    y: 30
-                    source:"content/gfx/wave.png"
-                }
-                NumberAnimation on x { from: 0; to: -(wave.width); duration: 16000; loops: Animation.Infinite }
-                SequentialAnimation on y {
-                    loops: Animation.Infinite
-                    NumberAnimation { from: y - 2; to: y + 2; duration: 1600; easing.type: Easing.InOutQuad }
-                    NumberAnimation { from: y + 2; to: y - 2; duration: 1600; easing.type: Easing.InOutQuad }
-                }
-            }
-
-            Row {
-                opacity: 0.5
-                Image {
-                    id: wave2
-                    y: 25
-                    source: "content/gfx/wave.png"
-                }
-                Image {
-                    y: 25
-                    source: "content/gfx/wave.png"
-                }
-                NumberAnimation on x { from: -(wave2.width); to: 0; duration: 32000; loops: Animation.Infinite }
-                SequentialAnimation on y {
-                    loops: Animation.Infinite
-                    NumberAnimation { from: y + 2; to: y - 2; duration: 1600; easing.type: Easing.InOutQuad }
-                    NumberAnimation { from: y - 2; to: y + 2; duration: 1600; easing.type: Easing.InOutQuad }
-                }
-            }
-
-            Image {
-                source: "content/gfx/sunlight.png"
-                opacity: 0.02
-                y: 0
-                anchors.horizontalCenter: parent.horizontalCenter
-                transformOrigin: Item.Top
-                SequentialAnimation on rotation {
-                    loops: Animation.Infinite
-                    NumberAnimation { from: -10; to: 10; duration: 8000; easing.type: Easing.InOutSine }
-                    NumberAnimation { from: 10; to: -10; duration: 8000; easing.type: Easing.InOutSine }
-                }
-            }
-
-            Image {
-                source: "content/gfx/sunlight.png"
-                opacity: 0.04
-                y: 20
-                anchors.horizontalCenter: parent.horizontalCenter
-                transformOrigin: Item.Top
-                SequentialAnimation on rotation {
-                    loops: Animation.Infinite
-                    NumberAnimation { from: 10; to: -10; duration: 8000; easing.type: Easing.InOutSine }
-                    NumberAnimation { from: -10; to: 10; duration: 8000; easing.type: Easing.InOutSine }
-                }
-            }
-
-            Image {
-                source: "content/gfx/grid.png"
-                opacity: 0.5
-            }
-
-            GameCanvas {
-                id: canvas
-                anchors.bottom: parent.bottom
-                anchors.bottomMargin: 20
-                x: 32
-                focus: true
-            }
-
-            InfoBar { anchors.bottom: canvas.top; anchors.bottomMargin: 6; width: parent.width }
-
-            //3..2..1..go
-            Timer {
-                id: countdownTimer
-                interval: 1000
-                running: root.countdown < 5
-                repeat: true
-                onTriggered: root.countdown++
-            }
-            Repeater {
-                model: ["content/gfx/text-blank.png", "content/gfx/text-3.png", "content/gfx/text-2.png", "content/gfx/text-1.png", "content/gfx/text-go.png"]
-                delegate: Image {
-                    visible: root.countdown <= index
-                    opacity: root.countdown == index ? 0.5 : 0.1
-                    scale: root.countdown >= index ? 1.0 : 0.0
-                    source: modelData
-                    Behavior on opacity { NumberAnimation {} }
-                    Behavior on scale { NumberAnimation {} }
-                }
-            }
-        }
-
-        NewGameScreen {
-            onStartButtonClicked: root.passedSplash = true
-        }
-    }
-
-    property int countdown: 10
-    Timer {
-        id: gameStarter
-        interval: 4000
-        running: false
-        repeat: false
-        onTriggered: Logic.startGame(canvas);
-    }
-
-    states: [
-        State {
-            name: "gameOn"; when: gameState.gameOver == false && passedSplash
-            PropertyChanges { target: view; y: -(height - 960) }
-            StateChangeScript { script: root.countdown = 0; }
-            PropertyChanges { target: gameStarter; running: true }
-        },
-        State {
-            name: "gameOver"; when: gameState.gameOver == true
-            PropertyChanges { target: view; y: 0 }
-        }
-    ]
-
-    transitions: Transition {
-        NumberAnimation { properties: "x,y"; duration: 1200; easing.type: Easing.OutQuad }
-    }
-}
diff --git a/experimental/qt5-intro-android/maroon/content/BuildButton.qml b/experimental/qt5-intro-android/maroon/content/BuildButton.qml
deleted file mode 100644
index 49641fc..0000000
--- a/experimental/qt5-intro-android/maroon/content/BuildButton.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "logic.js" as Logic
-
-Item {
-    id: container
-    width: 64
-    height: 64
-    property alias source: img.source
-    property int index
-    property int row: 0
-    property int col: 0
-    property int towerType
-    property bool canBuild: true
-    property Item gameCanvas: parent.parent.parent
-    signal clicked()
-
-    Image {
-        id: img
-        opacity: (canBuild && gameCanvas.coins >= Logic.towerData[towerType-1].cost) ? 1.0 : 0.4
-    }
-    Text {
-        anchors.right: parent.right
-        font.pointSize: 14
-        font.bold: true
-        color: "#ffffff"
-        text: Logic.towerData[towerType - 1].cost
-    }
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            Logic.buildTower(towerType, col, row)
-            container.clicked()
-        }
-    }
-    Image {
-        visible: col == index && row != 0
-        source: "gfx/dialog-pointer.png"
-        anchors.top: parent.bottom
-        anchors.topMargin: 4
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-    Image {
-        visible: col == index && row == 0
-        source: "gfx/dialog-pointer.png"
-        rotation: 180
-        anchors.bottom: parent.top
-        anchors.bottomMargin: 6
-        anchors.horizontalCenter: parent.horizontalCenter
-    }
-}
diff --git a/experimental/qt5-intro-android/maroon/content/GameCanvas.qml b/experimental/qt5-intro-android/maroon/content/GameCanvas.qml
deleted file mode 100644
index 5e6e963..0000000
--- a/experimental/qt5-intro-android/maroon/content/GameCanvas.qml
+++ /dev/null
@@ -1,240 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "logic.js" as Logic
-import "towers" as Towers
-
-Item {
-    id: grid
-
-    property int squareSize: 64
-    property int rows: 6
-    property int cols: 4
-    property Item canvas: grid
-    property int score: 0
-    property int coins: 100
-    property int lives: 3
-    property int waveNumber: 0
-    property int waveProgress: 0
-    property var towers
-    property var mobs
-    property bool gameRunning: false
-    property bool gameOver: false
-    property bool errored: false
-    property string errorString: ""
-
-    width: cols * squareSize
-    height: rows * squareSize
-
-    function freshState() {
-        lives = 3
-        coins = 100
-        score = 0
-        waveNumber = 0
-        waveProgress = 0
-        gameOver = false
-        gameRunning = false
-        towerMenu.shown = false
-        helpButton.comeBack();
-    }
-
-    Text {
-        id: errorText // Mostly for debug purposes
-        text: errorString
-        visible: errored
-        color: "red"
-        font.pixelSize: 18
-        wrapMode: Text.WordWrap
-        width: parent.width / 1.2
-        height: parent.height / 1.2
-        anchors.centerIn: parent
-        z: 1000
-    }
-
-    Timer {
-        interval: 16
-        running: true
-        repeat: true
-        onTriggered: Logic.tick()
-    }
-
-    MouseArea {
-        id: ma
-        anchors.fill: parent
-        onClicked: {
-            if (towerMenu.visible)
-                towerMenu.finish()
-            else
-                towerMenu.open(mouse.x, mouse.y)
-        }
-    }
-
-    Image {
-        id: towerMenu
-        visible: false
-        z: 1500
-        scale: 0.9
-        opacity: 0.7
-        property int dragDistance: 16
-        property int targetRow: 0
-        property int targetCol: 0
-        property bool shown: false
-        property bool towerExists: false
-
-        function finish() {
-            shown = false
-        }
-
-        function open(xp,yp) {
-            if (!grid.gameRunning)
-                return
-            targetRow = Logic.row(yp)
-            targetCol = Logic.col(xp)
-            if (targetRow == 0)
-                towerMenu.y = (targetRow + 1) * grid.squareSize
-            else
-                towerMenu.y = (targetRow - 1) * grid.squareSize
-            towerExists = (grid.towers[Logic.towerIdx(targetCol, targetRow)] != null)
-            shown = true
-            helpButton.goAway();
-        }
-
-        states: State {
-            name: "shown"; when: towerMenu.shown && !grid.gameOver
-            PropertyChanges { target: towerMenu; visible: true; scale: 1; opacity: 1 }
-        }
-
-        transitions: Transition {
-            PropertyAction { property: "visible" }
-            NumberAnimation { properties: "opacity,scale"; duration: 500; easing.type: Easing.OutElastic }
-        }
-
-        x: -32
-        source: "gfx/dialog.png"
-        Row {
-            id: buttonRow
-            height: 100
-            anchors.centerIn: parent
-            spacing: 8
-            BuildButton {
-                row: towerMenu.targetRow; col: towerMenu.targetCol
-                anchors.verticalCenter: parent.verticalCenter
-                towerType: 1; index: 0
-                canBuild: !towerMenu.towerExists
-                source: "gfx/dialog-melee.png"
-                onClicked: towerMenu.finish()
-            }
-            BuildButton {
-                row: towerMenu.targetRow; col: towerMenu.targetCol
-                anchors.verticalCenter: parent.verticalCenter
-                towerType: 2; index: 1
-                canBuild: !towerMenu.towerExists
-                source: "gfx/dialog-shooter.png"
-                onClicked: towerMenu.finish()
-            }
-            BuildButton {
-                row: towerMenu.targetRow; col: towerMenu.targetCol
-                anchors.verticalCenter: parent.verticalCenter
-                towerType: 3; index: 2
-                canBuild: !towerMenu.towerExists
-                source: "gfx/dialog-bomb.png"
-                onClicked: towerMenu.finish()
-            }
-            BuildButton {
-                row: towerMenu.targetRow; col: towerMenu.targetCol
-                anchors.verticalCenter: parent.verticalCenter
-                towerType: 4; index: 3
-                canBuild: !towerMenu.towerExists
-                source: "gfx/dialog-factory.png"
-                onClicked: towerMenu.finish()
-            }
-        }
-    }
-
-
-    Keys.onPressed: { // Cheat Codes while Testing
-        if (event.key == Qt.Key_Up && (event.modifiers & Qt.ShiftModifier))
-            grid.coins += 10;
-        if (event.key == Qt.Key_Left && (event.modifiers & Qt.ShiftModifier))
-            grid.lives += 1;
-        if (event.key == Qt.Key_Down && (event.modifiers & Qt.ShiftModifier))
-            Logic.gameState.waveProgress += 1000;
-        if (event.key == Qt.Key_Right && (event.modifiers & Qt.ShiftModifier))
-            Logic.endGame();
-    }
-
-    Image {
-        id: helpButton
-        z: 1010
-        source: "gfx/button-help.png"
-        function goAway() {
-            helpMA.enabled = false;
-            helpButton.opacity = 0;
-        }
-        function comeBack() {
-            helpMA.enabled = true;
-            helpButton.opacity = 1;
-        }
-        Behavior on opacity { NumberAnimation {} }
-        MouseArea {
-            id: helpMA
-            anchors.fill: parent
-            onClicked: {helpImage.visible = true; helpButton.visible = false;}
-        }
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 0
-    }
-
-    Image {
-        id: helpImage
-        z: 1010
-        source: "gfx/help.png"
-        anchors.fill: parent
-        visible: false
-        MouseArea {
-            anchors.fill: parent
-            onClicked: helpImage.visible = false;
-        }
-    }
-
-}
diff --git a/experimental/qt5-intro-android/maroon/content/GameOverScreen.qml b/experimental/qt5-intro-android/maroon/content/GameOverScreen.qml
deleted file mode 100644
index dfb439f..0000000
--- a/experimental/qt5-intro-android/maroon/content/GameOverScreen.qml
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "logic.js" as Logic
-
-Item {
-    id: gameOverScreen
-    width: 320
-    height: 400
-    property GameCanvas gameCanvas
-
-    Image {
-        id: img
-        source: "gfx/text-gameover.png"
-        anchors.centerIn: parent
-    }
-
-    ParticleSystem {
-        anchors.fill: parent
-        ImageParticle {
-            id: cloud
-            source: "gfx/cloud.png"
-            alphaVariation: 0.25
-            opacity: 0.25
-        }
-
-        Wander {
-            xVariance: 100;
-            pace: 1;
-        }
-
-        Emitter {
-            id: cloudLeft
-            width: 160
-            height: 160
-            anchors.right: parent.left
-            emitRate: 0.5
-            lifeSpan: 12000
-            velocity: PointDirection{ x: 64; xVariation: 2; yVariation: 2 }
-            size: 160
-        }
-
-        Emitter {
-            id: cloudRight
-            width: 160
-            height: 160
-            anchors.left: parent.right
-            emitRate: 0.5
-            lifeSpan: 12000
-            velocity: PointDirection{ x: -64; xVariation: 2; yVariation: 2 }
-            size: 160
-        }
-    }
-
-
-    Text {
-        visible: gameCanvas != undefined
-        text: "You saved " + gameCanvas.score + " fishes!"
-        anchors.top: img.bottom
-        anchors.topMargin: 12
-        anchors.horizontalCenter: parent.horizontalCenter
-        font.bold: true
-        color: "#000000"
-        opacity: 0.5
-    }
-
-    Image {
-        source: "gfx/button-play.png"
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 0
-        MouseArea {
-            anchors.fill: parent
-            onClicked: gameCanvas.gameOver = false//This will actually trigger the state change in main.qml
-        }
-    }
-}
diff --git a/experimental/qt5-intro-android/maroon/content/InfoBar.qml b/experimental/qt5-intro-android/maroon/content/InfoBar.qml
deleted file mode 100644
index 36303fc..0000000
--- a/experimental/qt5-intro-android/maroon/content/InfoBar.qml
+++ /dev/null
@@ -1,84 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    height: childrenRect.height
-
-    // Display the number of lives
-    Row {
-        anchors.left: parent.left
-        anchors.leftMargin: 10
-        spacing: 5
-        Repeater {
-            id: rep
-            model: Math.min(10, canvas.lives)
-            delegate: Image { source: "gfx/lifes.png" }
-        }
-    }
-
-    // Display the number of fishes saved
-    Row {
-        anchors.right: points.left
-        anchors.rightMargin: 20
-        spacing: 5
-        Image { source: "gfx/scores.png" }
-        Text {
-            text: canvas.score
-            font.bold: true
-        }
-    }
-
-    // Display the number of coins
-    Row {
-        id: points
-        anchors.right: parent.right
-        anchors.rightMargin: 10
-        spacing: 5
-        Image { source: "gfx/points.png" }
-        Text {
-            id: pointsLabel
-            text: canvas.coins
-            font.bold: true
-        }
-    }
-}
-
diff --git a/experimental/qt5-intro-android/maroon/content/NewGameScreen.qml b/experimental/qt5-intro-android/maroon/content/NewGameScreen.qml
deleted file mode 100644
index 495e3aa..0000000
--- a/experimental/qt5-intro-android/maroon/content/NewGameScreen.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-// This is the first screen.
-// It shows the logo and emit a startButtonClicked signal
-// when the user press the "PLAY" button.
-
-Item {
-    id: newGameScreen
-    width: 320
-    height: 480
-
-    signal startButtonClicked
-
-    Image {
-        source: "gfx/logo.png"
-        anchors.top: parent.top
-        anchors.topMargin: 60
-    }
-
-    Image {
-        source: "gfx/logo-fish.png"
-        anchors.top: parent.top
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x + 148; to: x + 25; duration: 2000; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x + 25; to: x + 148; duration: 1600; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on anchors.topMargin {
-            loops: Animation.Infinite
-            NumberAnimation { from: 100; to: 60; duration: 1600; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: 60; to: 100; duration: 2000; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    Image {
-        source: "gfx/logo-bubble.png"
-        anchors.top: parent.top
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x + 140; to: x + 40; duration: 2000; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x + 40; to: x + 140; duration: 1600; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on anchors.topMargin {
-            loops: Animation.Infinite
-            NumberAnimation { from: 100; to: 60; duration: 1600; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: 60; to: 100; duration: 2000; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on width {
-            loops: Animation.Infinite
-            NumberAnimation { from: 140; to: 160; duration: 1000; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: 160; to: 140; duration: 800; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on height {
-            loops: Animation.Infinite
-            NumberAnimation { from: 150; to: 140; duration: 800; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: 140; to: 150; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    Image {
-        source: "gfx/button-play.png"
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 60
-        MouseArea {
-            anchors.fill: parent
-            onClicked: newGameScreen.startButtonClicked()
-        }
-    }
-}
diff --git a/experimental/qt5-intro-android/maroon/content/SoundEffect.qml b/experimental/qt5-intro-android/maroon/content/SoundEffect.qml
deleted file mode 100644
index d286a39..0000000
--- a/experimental/qt5-intro-android/maroon/content/SoundEffect.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-//Proxies a SoundEffect if QtMultimedia is installed
-Item {
-    id: container
-    property QtObject effect: Qt.createQmlObject("import QtMultimedia 5.0; SoundEffect{ source: '" + container.source + "' }", container);
-    property url source: ""
-    onSourceChanged: if (effect != null) effect.source = source;
-    function play() {
-        if (effect != null)
-            effect.play();
-    }
-
-}
diff --git a/experimental/qt5-intro-android/maroon/content/audio/bomb-action.wav b/experimental/qt5-intro-android/maroon/content/audio/bomb-action.wav
deleted file mode 100644
index b334dc1..0000000
--- a/experimental/qt5-intro-android/maroon/content/audio/bomb-action.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/audio/catch-action.wav b/experimental/qt5-intro-android/maroon/content/audio/catch-action.wav
deleted file mode 100644
index 3e22124..0000000
--- a/experimental/qt5-intro-android/maroon/content/audio/catch-action.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/audio/catch.wav b/experimental/qt5-intro-android/maroon/content/audio/catch.wav
deleted file mode 100644
index d3eade8..0000000
--- a/experimental/qt5-intro-android/maroon/content/audio/catch.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/audio/currency.wav b/experimental/qt5-intro-android/maroon/content/audio/currency.wav
deleted file mode 100644
index 0d9ef2c..0000000
--- a/experimental/qt5-intro-android/maroon/content/audio/currency.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/audio/factory-action.wav b/experimental/qt5-intro-android/maroon/content/audio/factory-action.wav
deleted file mode 100644
index a2ace6c..0000000
--- a/experimental/qt5-intro-android/maroon/content/audio/factory-action.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/audio/melee-action.wav b/experimental/qt5-intro-android/maroon/content/audio/melee-action.wav
deleted file mode 100644
index d325af4..0000000
--- a/experimental/qt5-intro-android/maroon/content/audio/melee-action.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/audio/projectile-action.wav b/experimental/qt5-intro-android/maroon/content/audio/projectile-action.wav
deleted file mode 100644
index 4e2284f..0000000
--- a/experimental/qt5-intro-android/maroon/content/audio/projectile-action.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/audio/shooter-action.wav b/experimental/qt5-intro-android/maroon/content/audio/shooter-action.wav
deleted file mode 100644
index 3e12b94..0000000
--- a/experimental/qt5-intro-android/maroon/content/audio/shooter-action.wav
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/background.png b/experimental/qt5-intro-android/maroon/content/gfx/background.png
deleted file mode 100644
index d548b93..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/background.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/bomb-action.png b/experimental/qt5-intro-android/maroon/content/gfx/bomb-action.png
deleted file mode 100644
index 42da5d7..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/bomb-action.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/bomb-idle.png b/experimental/qt5-intro-android/maroon/content/gfx/bomb-idle.png
deleted file mode 100644
index 3bd62e2..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/bomb-idle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/bomb.png b/experimental/qt5-intro-android/maroon/content/gfx/bomb.png
deleted file mode 100644
index 380da7d..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/bomb.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/button-help.png b/experimental/qt5-intro-android/maroon/content/gfx/button-help.png
deleted file mode 100644
index aecebc1..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/button-help.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/button-play.png b/experimental/qt5-intro-android/maroon/content/gfx/button-play.png
deleted file mode 100644
index 6cdad6c..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/button-play.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/catch-action.png b/experimental/qt5-intro-android/maroon/content/gfx/catch-action.png
deleted file mode 100644
index 78ca9fe..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/catch-action.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/catch.png b/experimental/qt5-intro-android/maroon/content/gfx/catch.png
deleted file mode 100644
index b7620fe..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/catch.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/cloud.png b/experimental/qt5-intro-android/maroon/content/gfx/cloud.png
deleted file mode 100644
index d7c35f8..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/cloud.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/currency.png b/experimental/qt5-intro-android/maroon/content/gfx/currency.png
deleted file mode 100644
index 1571341..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/currency.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/dialog-bomb.png b/experimental/qt5-intro-android/maroon/content/gfx/dialog-bomb.png
deleted file mode 100644
index 708d916..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/dialog-bomb.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/dialog-factory.png b/experimental/qt5-intro-android/maroon/content/gfx/dialog-factory.png
deleted file mode 100644
index d2e2a48..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/dialog-factory.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/dialog-melee.png b/experimental/qt5-intro-android/maroon/content/gfx/dialog-melee.png
deleted file mode 100644
index 069d18d..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/dialog-melee.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/dialog-pointer.png b/experimental/qt5-intro-android/maroon/content/gfx/dialog-pointer.png
deleted file mode 100644
index 9b51a09..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/dialog-pointer.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/dialog-shooter.png b/experimental/qt5-intro-android/maroon/content/gfx/dialog-shooter.png
deleted file mode 100644
index af980ca..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/dialog-shooter.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/dialog.png b/experimental/qt5-intro-android/maroon/content/gfx/dialog.png
deleted file mode 100644
index d528ba7..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/dialog.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/factory-action.png b/experimental/qt5-intro-android/maroon/content/gfx/factory-action.png
deleted file mode 100644
index 8981678..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/factory-action.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/factory-idle.png b/experimental/qt5-intro-android/maroon/content/gfx/factory-idle.png
deleted file mode 100644
index a145582..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/factory-idle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/factory.png b/experimental/qt5-intro-android/maroon/content/gfx/factory.png
deleted file mode 100644
index bfb9f3f..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/factory.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/grid.png b/experimental/qt5-intro-android/maroon/content/gfx/grid.png
deleted file mode 100644
index b595552..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/grid.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/help.png b/experimental/qt5-intro-android/maroon/content/gfx/help.png
deleted file mode 100644
index 4654e4c..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/help.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/lifes.png b/experimental/qt5-intro-android/maroon/content/gfx/lifes.png
deleted file mode 100644
index 135310b..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/lifes.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/logo-bubble.png b/experimental/qt5-intro-android/maroon/content/gfx/logo-bubble.png
deleted file mode 100644
index 136151c..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/logo-bubble.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/logo-fish.png b/experimental/qt5-intro-android/maroon/content/gfx/logo-fish.png
deleted file mode 100644
index c41833a..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/logo-fish.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/logo.png b/experimental/qt5-intro-android/maroon/content/gfx/logo.png
deleted file mode 100644
index 787ac99..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/logo.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/melee-action.png b/experimental/qt5-intro-android/maroon/content/gfx/melee-action.png
deleted file mode 100644
index c53873b..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/melee-action.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/melee-idle.png b/experimental/qt5-intro-android/maroon/content/gfx/melee-idle.png
deleted file mode 100644
index 621d9df..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/melee-idle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/melee.png b/experimental/qt5-intro-android/maroon/content/gfx/melee.png
deleted file mode 100644
index ab24015..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/melee.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/mob-idle.png b/experimental/qt5-intro-android/maroon/content/gfx/mob-idle.png
deleted file mode 100644
index dedacc7..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/mob-idle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/mob.png b/experimental/qt5-intro-android/maroon/content/gfx/mob.png
deleted file mode 100644
index 7569c35..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/mob.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/points.png b/experimental/qt5-intro-android/maroon/content/gfx/points.png
deleted file mode 100644
index 1d2386d..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/points.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/projectile-action.png b/experimental/qt5-intro-android/maroon/content/gfx/projectile-action.png
deleted file mode 100644
index aa2e650..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/projectile-action.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/projectile.png b/experimental/qt5-intro-android/maroon/content/gfx/projectile.png
deleted file mode 100644
index c25a0c3..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/projectile.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/scores.png b/experimental/qt5-intro-android/maroon/content/gfx/scores.png
deleted file mode 100644
index af757fe..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/scores.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/shooter-action.png b/experimental/qt5-intro-android/maroon/content/gfx/shooter-action.png
deleted file mode 100644
index 08e7e30..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/shooter-action.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/shooter-idle.png b/experimental/qt5-intro-android/maroon/content/gfx/shooter-idle.png
deleted file mode 100644
index 663098d..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/shooter-idle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/shooter.png b/experimental/qt5-intro-android/maroon/content/gfx/shooter.png
deleted file mode 100644
index d44401e..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/shooter.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/sunlight.png b/experimental/qt5-intro-android/maroon/content/gfx/sunlight.png
deleted file mode 100644
index d1c7042..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/sunlight.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/text-1.png b/experimental/qt5-intro-android/maroon/content/gfx/text-1.png
deleted file mode 100644
index 3ea399c..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/text-1.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/text-2.png b/experimental/qt5-intro-android/maroon/content/gfx/text-2.png
deleted file mode 100644
index 934a481..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/text-2.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/text-3.png b/experimental/qt5-intro-android/maroon/content/gfx/text-3.png
deleted file mode 100644
index 47523f5..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/text-3.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/text-blank.png b/experimental/qt5-intro-android/maroon/content/gfx/text-blank.png
deleted file mode 100644
index 4a687b2..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/text-blank.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/text-gameover.png b/experimental/qt5-intro-android/maroon/content/gfx/text-gameover.png
deleted file mode 100644
index 4f53ef0..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/text-gameover.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/text-go.png b/experimental/qt5-intro-android/maroon/content/gfx/text-go.png
deleted file mode 100644
index bfc26f7..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/text-go.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/gfx/wave.png b/experimental/qt5-intro-android/maroon/content/gfx/wave.png
deleted file mode 100644
index f97426c..0000000
--- a/experimental/qt5-intro-android/maroon/content/gfx/wave.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/maroon/content/logic.js b/experimental/qt5-intro-android/maroon/content/logic.js
deleted file mode 100644
index dd76b7e..0000000
--- a/experimental/qt5-intro-android/maroon/content/logic.js
+++ /dev/null
@@ -1,264 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-.pragma library // Shared game state
-.import QtQuick 2.0 as QQ
-
-// Game Stuff
-var gameState // Local reference
-function getGameState() { return gameState; }
-
-var towerData = [ // Name and cost, stats are in the delegate per instance
-    { "name": "Melee", "cost": 20 },
-    { "name": "Ranged", "cost": 50 },
-    { "name": "Bomb", "cost": 75 },
-    { "name": "Factory", "cost": 25 }
-]
-
-var waveBaseData = [300, 290, 280, 270, 220, 180, 160, 80, 80, 80, 30, 30, 30, 30];
-var waveData = [];
-
-var towerComponents = new Array(towerData.length);
-var mobComponent = Qt.createComponent("mobs/MobBase.qml");
-
-function endGame()
-{
-    gameState.gameRunning = false;
-    gameState.gameOver = true;
-    for (var i = 0; i < gameState.cols; i++) {
-        for (var j = 0; j < gameState.rows; j++) {
-            if (gameState.towers[towerIdx(i, j)]) {
-                gameState.towers[towerIdx(i, j)].destroy();
-                gameState.towers[towerIdx(i, j)] = null;
-            }
-        }
-        for (var j in gameState.mobs[i])
-            gameState.mobs[i][j].destroy();
-        gameState.mobs[i].splice(0,gameState.mobs[i].length); //Leaves queue reusable
-    }
-}
-
-function startGame(gameCanvas)
-{
-    waveData = new Array();
-    for (var i in waveBaseData)
-        waveData[i] = waveBaseData[i];
-    gameState.freshState();
-    for (var i = 0; i < gameCanvas.cols; i++) {
-        for (var j = 0; j < gameCanvas.rows; j++)
-            gameState.towers[towerIdx(i, j)] = null;
-        gameState.mobs[i] = new Array();
-    }
-    gameState.towers[towerIdx(0, 0)] = newTower(3, 0, 0);//Start with a starfish in the corner
-    gameState.gameRunning = true;
-    gameState.gameOver = false;
-}
-
-function newGameState(gameCanvas)
-{
-    for (var i = 0; i < towerComponents.length; i++) {
-        towerComponents[i] = Qt.createComponent("towers/" + towerData[i].name + ".qml");
-        if (towerComponents[i].status == QQ.Component.Error) {
-            gameCanvas.errored = true;
-            gameCanvas.errorString += "Loading Tower " + towerData[i].name + "\n" + (towerComponents[i].errorString());
-            console.log(towerComponents[i].errorString());
-        }
-    }
-    gameState = gameCanvas;
-    gameState.freshState();
-    gameState.towers = new Array(gameCanvas.rows * gameCanvas.cols);
-    gameState.mobs = new Array(gameCanvas.cols);
-    return gameState;
-}
-
-function row(y)
-{
-    return Math.floor(y / gameState.squareSize);
-}
-
-function col(x)
-{
-    return Math.floor(x / gameState.squareSize);
-}
-
-function towerIdx(x, y)
-{
-    return y + (x * gameState.rows);
-}
-
-function newMob(col)
-{
-    var ret = mobComponent.createObject(gameState.canvas,
-        { "col" : col,
-          "speed" : (Math.min(2.0, 0.10 * (gameState.waveNumber + 1))),
-          "y" : gameState.canvas.height });
-    gameState.mobs[col].push(ret);
-    return ret;
-}
-
-function newTower(type, row, col)
-{
-    var ret = towerComponents[type].createObject(gameState.canvas);
-    ret.row = row;
-    ret.col = col;
-    ret.fireCounter = ret.rof;
-    ret.spawn();
-    return ret;
-}
-
-function buildTower(type, x, y)
-{
-    if (gameState.towers[towerIdx(x,y)] != null) {
-        if (type <= 0) {
-            gameState.towers[towerIdx(x,y)].sell();
-            gameState.towers[towerIdx(x,y)] = null;
-        }
-    } else {
-        if (gameState.coins < towerData[type - 1].cost)
-            return;
-        gameState.towers[towerIdx(x, y)] = newTower(type - 1, y, x);
-        gameState.coins -= towerData[type - 1].cost;
-    }
-}
-
-function killMob(col, mob)
-{
-    if (!mob)
-        return;
-    var idx = gameState.mobs[col].indexOf(mob);
-    if (idx == -1 || !mob.hp)
-        return;
-    mob.hp = 0;
-    mob.die();
-    gameState.mobs[col].splice(idx,1);
-}
-
-function killTower(row, col)
-{
-    var tower = gameState.towers[towerIdx(col, row)];
-    if (!tower)
-        return;
-    tower.hp = 0;
-    tower.die();
-    gameState.towers[towerIdx(col, row)] = null;
-}
-
-function tick()
-{
-    if (!gameState.gameRunning)
-        return;
-
-    // Spawn
-    gameState.waveProgress += 1;
-    var i = gameState.waveProgress;
-    var j = 0;
-    while (i > 0 && j < waveData.length)
-        i -= waveData[j++];
-    if ( i == 0 ) // Spawn a mob
-        newMob(Math.floor(Math.random() * gameState.cols));
-    if ( j == waveData.length ) { // Next Wave
-        gameState.waveNumber += 1;
-        gameState.waveProgress = 0;
-        var waveModifier = 10; // Constant governing how much faster the next wave is to spawn (not fish speed)
-        for (var k in waveData ) // Slightly faster
-            if (waveData[k] > waveModifier)
-                waveData[k] -= waveModifier;
-    }
-
-    // Towers Attack
-    for (var j in gameState.towers) {
-        var tower = gameState.towers[j];
-        if (tower == null)
-            continue;
-        if (tower.fireCounter > 0) {
-            tower.fireCounter -= 1;
-            continue;
-        }
-        var column = tower.col;
-        for (var k in gameState.mobs[column]) {
-            var conflict = gameState.mobs[column][k];
-            if (conflict.y <= gameState.canvas.height && conflict.y + conflict.height > tower.y
-                && conflict.y - ((tower.row + 1) * gameState.squareSize) < gameState.squareSize * tower.range) { // In Range
-                tower.fire();
-                tower.fireCounter = tower.rof;
-                conflict.hit(tower.damage);
-            }
-        }
-
-        // Income
-        if (tower.income) {
-            gameState.coins += tower.income;
-            tower.fire();
-            tower.fireCounter = tower.rof;
-        }
-    }
-
-    // Mobs move
-    for (var i = 0; i < gameState.cols; i++) {
-        for (var j = 0; j < gameState.mobs[i].length; j++) {
-            var mob = gameState.mobs[i][j];
-            var newPos = gameState.mobs[i][j].y - gameState.mobs[i][j].speed;
-            if (newPos < 0) {
-                gameState.lives -= 1;
-                killMob(i, mob);
-                if (gameState.lives <= 0)
-                    endGame();
-                continue;
-            }
-            var conflict = gameState.towers[towerIdx(i, row(newPos))];
-            if (conflict != null) {
-                if (mob.y < conflict.y + gameState.squareSize)
-                    gameState.mobs[i][j].y += gameState.mobs[i][j].speed * 10; // Moved inside tower, now hurry back out
-                if (mob.fireCounter > 0) {
-                    mob.fireCounter--;
-                } else {
-                    gameState.mobs[i][j].fire();
-                    conflict.hp -= mob.damage;
-                    if (conflict.hp <= 0)
-                        killTower(conflict.row, conflict.col);
-                    mob.fireCounter = mob.rof;
-                }
-            } else {
-                gameState.mobs[i][j].y = newPos;
-            }
-        }
-    }
-
-}
diff --git a/experimental/qt5-intro-android/maroon/content/mobs/MobBase.qml b/experimental/qt5-intro-android/maroon/content/mobs/MobBase.qml
deleted file mode 100644
index d4ece66..0000000
--- a/experimental/qt5-intro-android/maroon/content/mobs/MobBase.qml
+++ /dev/null
@@ -1,262 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../logic.js" as Logic
-import ".."
-
-Item  {
-    id: container
-    property string name: "Fish"
-    property int col: 0
-    property real hp: 3
-    property real damage: 1
-    property real speed: 0.25
-    property int rof: 30 //In ticks
-    property int fireCounter: 0
-    property bool dying: false
-    width: parent ? parent.squareSize : 0
-    height: parent ? parent.squareSize : 0
-    x: col * width
-    z: 1001
-    function fire() { }
-
-    function die() {
-        if (dying)
-            return;
-        dying = true;
-        bubble.jumpTo("burst");
-        if (fishSprite.currentSprite == "front")
-            fishSprite.jumpTo(Math.random() > 0.5 ? "left" : "right" );
-        fishSwim.start();
-        Logic.gameState.score += 1;
-        killedSound.play();
-        bubble.scale = 0.9
-        destroy(350);
-    }
-
-    function inked() {
-        if (hp > 0)
-            ink.jumpTo("dirty");
-    }
-
-    function hit(dmg) {
-        hp -= dmg;
-
-        if (hp <= 0)
-            Logic.killMob(col, container);
-    }
-
-    Component.onCompleted: spawnSound.play()
-
-    SoundEffect {
-        id: spawnSound
-        source: "../audio/catch.wav"
-    }
-    SoundEffect {
-        id: killedSound
-        source: "../audio/catch-action.wav"
-    }
-
-    SpriteSequence {
-        id: fishSprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "left"
-            source: "../gfx/mob-idle.png"
-            frameWidth: 64
-            frameHeight: 64
-            frameCount: 1
-            frameDuration: 800
-            frameDurationVariation: 400
-            to: { "front" : 1 }
-        }
-
-        Sprite {
-            name: "front"
-            source: "../gfx/mob-idle.png"
-            frameCount: 1
-            frameX: 64
-            frameWidth: 64
-            frameHeight: 64
-            frameDuration: 800
-            frameDurationVariation: 400
-            to: { "left" : 1, "right" : 1 }
-        }
-
-        Sprite {
-            name: "right"
-            source: "../gfx/mob-idle.png"
-            frameCount: 1
-            frameX: 128
-            frameWidth: 64
-            frameHeight: 64
-            frameDuration: 800
-            frameDurationVariation: 400
-            to: { "front" : 1 }
-        }
-
-
-        Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation.
-            name: "dummy"
-            source: "../gfx/melee-idle.png"
-            frameCount: 8
-            frameWidth: 64
-            frameHeight: 64
-            frameX: 0
-            frameDuration: 200
-        }
-
-        NumberAnimation on x {
-            id: fishSwim
-            running: false
-            property bool goingLeft: fishSprite.currentSprite == "right"
-            to: goingLeft ? -360 : 360
-            duration: 300
-        }
-    }
-
-    SpriteSequence {
-        id: bubble
-        width: 64
-        height: 64
-        scale: 0.4 + (0.2  * hp)
-        interpolate: false
-        goalSprite: ""
-
-        Behavior on scale {
-            NumberAnimation { duration: 150; easing.type: Easing.OutBack }
-        }
-
-        Sprite {
-            name: "big"
-            source: "../gfx/catch.png"
-            frameCount: 1
-            to: { "burst" : 0 }
-        }
-
-        Sprite {
-            name: "burst"
-            source: "../gfx/catch-action.png"
-            frameCount: 3
-            frameX: 64
-            frameDuration: 200
-        }
-
-        Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation.
-            name: "dummy"
-            source: "../gfx/melee-idle.png"
-            frameCount: 8
-            frameWidth: 64
-            frameHeight: 64
-            frameX: 0
-            frameDuration: 200
-        }
-        SequentialAnimation on width {
-            loops: Animation.Infinite
-            NumberAnimation { from: width * 1; to: width * 1.1; duration: 800; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: width * 1.1; to: width * 1; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on height {
-            loops: Animation.Infinite
-            NumberAnimation { from: height * 1; to: height * 1.15; duration: 1200; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: height * 1.15; to: height * 1; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    SpriteSequence {
-        id: ink
-        width: 64
-        height: 64
-        scale: bubble.scale
-        goalSprite: ""
-
-        Sprite {
-            name: "clean"
-            source: "../gfx/projectile-action.png"
-            frameCount: 1
-            frameX: 0
-            frameWidth: 64
-            frameHeight: 64
-        }
-        Sprite {
-            name: "dirty"
-            source: "../gfx/projectile-action.png"
-            frameCount: 3
-            frameX: 64
-            frameWidth: 64
-            frameHeight: 64
-            frameDuration: 150
-            to: {"clean":1}
-        }
-
-        Sprite { //WORKAROUND: This prevents the triggering of a rendering error which is currently under investigation.
-            name: "dummy"
-            source: "../gfx/melee-idle.png"
-            frameCount: 8
-            frameWidth: 64
-            frameHeight: 64
-            frameX: 0
-            frameDuration: 200
-        }
-        SequentialAnimation on width {
-            loops: Animation.Infinite
-            NumberAnimation { from: width * 1; to: width * 1.1; duration: 800; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: width * 1.1; to: width * 1; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on height {
-            loops: Animation.Infinite
-            NumberAnimation { from: height * 1; to: height * 1.15; duration: 1200; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: height * 1.15; to: height * 1; duration: 1000; easing.type: Easing.InOutQuad }
-        }
-
-    }
-
-    SequentialAnimation on x {
-        loops: Animation.Infinite
-        NumberAnimation { from: x; to: x - 5; duration: 900; easing.type: Easing.InOutQuad }
-        NumberAnimation { from: x - 5; to: x; duration: 900; easing.type: Easing.InOutQuad }
-    }
-}
-
diff --git a/experimental/qt5-intro-android/maroon/content/towers/Bomb.qml b/experimental/qt5-intro-android/maroon/content/towers/Bomb.qml
deleted file mode 100644
index 00437f4..0000000
--- a/experimental/qt5-intro-android/maroon/content/towers/Bomb.qml
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../logic.js" as Logic
-import ".."
-
-TowerBase {
-    id: container
-    hp: 10
-    range: 0.4
-    rof: 10
-    property real detonationRange: 2.5
-
-    function fire() {
-        sound.play()
-        sprite.jumpTo("shoot")
-        animDelay.start()
-    }
-
-    function finishFire() {
-        var sCol = Math.max(0, col - 1)
-        var eCol = Math.min(Logic.gameState.cols - 1, col + 1)
-        var killList = new Array()
-        for (var i = sCol; i <= eCol; i++) {
-            for (var j = 0; j < Logic.gameState.mobs[i].length; j++)
-                if (Math.abs(Logic.gameState.mobs[i][j].y - container.y) < Logic.gameState.squareSize * detonationRange)
-                    killList.push(Logic.gameState.mobs[i][j])
-            while (killList.length > 0)
-                Logic.killMob(i, killList.pop())
-        }
-        Logic.killTower(row, col);
-    }
-
-    Timer {
-        id: animDelay
-        running: false
-        interval: shootState.frameCount * shootState.frameDuration
-        onTriggered: finishFire()
-    }
-
-    function die()
-    {
-        destroy() // No blink, because we usually meant to die
-    }
-
-    SoundEffect {
-        id: sound
-        source: "../audio/bomb-action.wav"
-    }
-
-    SpriteSequence {
-        id: sprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "idle"
-            source: "../gfx/bomb-idle.png"
-            frameCount: 4
-            frameDuration: 800
-        }
-
-        Sprite {
-            id: shootState
-            name: "shoot"
-            source: "../gfx/bomb-action.png"
-            frameCount: 6
-            frameDuration: 155
-            to: { "dying" : 1 } // So that if it takes a frame to clean up, it is on the last frame of the explosion
-        }
-
-        Sprite {
-            name: "dying"
-            source: "../gfx/bomb-action.png"
-            frameCount: 1
-            frameX: 64 * 5
-            frameWidth: 64
-            frameHeight: 64
-            frameDuration: 155
-        }
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x; to: x + 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x + 4; to: x; duration: 900; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on y {
-            loops: Animation.Infinite
-            NumberAnimation { from: y; to: y - 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: y - 4; to: y; duration: 900; easing.type: Easing.InOutQuad }
-        }
-    }
-}
diff --git a/experimental/qt5-intro-android/maroon/content/towers/Factory.qml b/experimental/qt5-intro-android/maroon/content/towers/Factory.qml
deleted file mode 100644
index b34a184..0000000
--- a/experimental/qt5-intro-android/maroon/content/towers/Factory.qml
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../logic.js" as Logic
-import ".."
-
-TowerBase {
-    id: container
-    rof: 160
-    income: 5
-    SpriteSequence {
-        id: sprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "idle"
-            source: "../gfx/factory-idle.png"
-            frameCount: 4
-            frameDuration: 200
-        }
-
-        Sprite {
-            name: "action"
-            source: "../gfx/factory-action.png"
-            frameCount: 4
-            frameDuration: 90
-            to: { "idle" : 1 }
-        }
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x; to: x + 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x + 4; to: x; duration: 900; easing.type: Easing.InOutQuad }
-        }
-        SequentialAnimation on y {
-            loops: Animation.Infinite
-            NumberAnimation { from: y; to: y - 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: y - 4; to: y; duration: 900; easing.type: Easing.InOutQuad }
-        }
-    }
-
-    SoundEffect {
-        id: actionSound
-        source: "../audio/factory-action.wav"
-    }
-
-    function fire() {
-        actionSound.play()
-        sprite.jumpTo("action")
-        coinLaunch.start()
-    }
-
-    function spawn() {
-        coin.target = Logic.gameState.mapToItem(container, 240, -32)
-    }
-
-    Image {
-        id: coin
-        property var target: { "x" : 0, "y" : 0 }
-        source: "../gfx/currency.png"
-        visible: false
-    }
-
-    SequentialAnimation {
-        id: coinLaunch
-        PropertyAction { target: coin; property: "visible"; value: true }
-        ParallelAnimation {
-            NumberAnimation { target: coin; property: "x"; from: 16; to: coin.target.x }
-            NumberAnimation { target: coin; property: "y"; from: 16; to: coin.target.y }
-        }
-        PropertyAction { target: coin; property: "visible"; value: false }
-    }
-}
diff --git a/experimental/qt5-intro-android/maroon/content/towers/Melee.qml b/experimental/qt5-intro-android/maroon/content/towers/Melee.qml
deleted file mode 100644
index 1b49a45..0000000
--- a/experimental/qt5-intro-android/maroon/content/towers/Melee.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import ".."
-
-TowerBase {
-    hp: 4
-    range: 0.1
-    damage: 1
-    rof: 40
-    income: 0
-
-    SpriteSequence {
-        id: sprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "idle"
-            source: "../gfx/melee-idle.png"
-            frameCount: 8
-            frameDuration: 250
-        }
-
-        Sprite {
-            name: "shoot"
-            source: "../gfx/melee-action.png"
-            frameCount: 2
-            frameDuration: 200
-            to: { "idle" : 1 }
-        }
-    }
-
-    function fire() {
-        shootSound.play()
-        sprite.jumpTo("shoot")
-    }
-
-    SoundEffect {
-        id: shootSound
-        source: "../audio/melee-action.wav"
-    }
-}
diff --git a/experimental/qt5-intro-android/maroon/content/towers/Ranged.qml b/experimental/qt5-intro-android/maroon/content/towers/Ranged.qml
deleted file mode 100644
index 33f3354..0000000
--- a/experimental/qt5-intro-android/maroon/content/towers/Ranged.qml
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../logic.js" as Logic
-import ".."
-
-TowerBase {
-    id: container
-    hp: 2
-    range: 6
-    damage: 0 // By projectile
-    rof: 40
-    income: 0
-    property var targetMob
-    property real realDamage: 1
-    function fire() {
-        proj.x = 32 - proj.width / 2
-        proj.y = 0
-        targetMob = Logic.gameState.mobs[col][0]
-        projAnim.to = targetMob.y - container.y -10
-        projAnim.start()
-        shootSound.play()
-        sprite.jumpTo("shoot")
-    }
-
-    Image {
-        id: proj
-        y: 1000
-        SequentialAnimation on y {
-            id: projAnim
-            running: false
-            property real to: 1000
-            SmoothedAnimation {
-                to: projAnim.to
-                velocity: 400
-            }
-            ScriptAction {
-                script: {
-                    if (targetMob && targetMob.hit) {
-                        targetMob.hit(realDamage)
-                        targetMob.inked()
-                        projSound.play()
-                    }
-                }
-            }
-            PropertyAction {
-                value: 1000;
-            }
-        }
-        source: "../gfx/projectile.png"
-    }
-
-    SoundEffect {
-        id: shootSound
-        source: "../audio/shooter-action.wav"
-    }
-    SoundEffect {
-        id: projSound
-        source: "../audio/projectile-action.wav"
-    }
-
-    SpriteSequence {
-        id: sprite
-        width: 64
-        height: 64
-        interpolate: false
-        goalSprite: ""
-
-        Sprite {
-            name: "idle"
-            source: "../gfx/shooter-idle.png"
-            frameCount: 4
-            frameDuration: 250
-        }
-
-        Sprite {
-            name: "shoot"
-            source: "../gfx/shooter-action.png"
-            frameCount: 5
-            frameDuration: 90
-            to: { "idle" : 1 }
-        }
-
-        SequentialAnimation on x {
-            loops: Animation.Infinite
-            NumberAnimation { from: x; to: x - 4; duration: 900; easing.type: Easing.InOutQuad }
-            NumberAnimation { from: x - 4; to: x; duration: 900; easing.type: Easing.InOutQuad }
-        }
-    }
-}
diff --git a/experimental/qt5-intro-android/maroon/content/towers/TowerBase.qml b/experimental/qt5-intro-android/maroon/content/towers/TowerBase.qml
deleted file mode 100644
index 5c71cb0..0000000
--- a/experimental/qt5-intro-android/maroon/content/towers/TowerBase.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Item {
-    property real hp: 1
-    property real range: 0
-    property real damage: 0
-    property int rof: 100
-    property int fireCounter: 0
-    property int income: 0
-    property int row: 0
-    property int col: 0
-
-    width: parent ? parent.squareSize : 0
-    height: parent ? parent.squareSize : 0
-    //This is how it is placed on the gameboard, do not modify/animate the X/Y/Z of a TowerBase please
-    x: col * width
-    y: row * height
-    z: 1000
-
-    function fire() { }
-    function spawn() { } //After all game properties are set
-    function die() { stdDeath.start(); destroy(1000); }
-    function sell() { destroy(); }
-
-    SequentialAnimation on opacity {
-        id: stdDeath
-        running: false
-        loops: 2
-        NumberAnimation { from: 1; to: 0; }
-        NumberAnimation { from: 0; to: 1; }
-    }
-}
diff --git a/experimental/qt5-intro-android/particles/customemitter.qml b/experimental/qt5-intro-android/particles/customemitter.qml
deleted file mode 100644
index 270935d..0000000
--- a/experimental/qt5-intro-android/particles/customemitter.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-ParticleSystem {
-    id: sys
-    width: 320
-    height: 480
-    running: true
-
-    property real petalLength: 180
-    property real petalRotation: 0
-    NumberAnimation on petalRotation {
-        from: 0;
-        to: 360;
-        loops: -1;
-        running: true
-        duration: 24000
-    }
-
-    function convert(a) {return a*(Math.PI/180);}
-    Emitter {
-        lifeSpan: 4000
-        emitRate: 120
-        size: 12
-        anchors.centerIn: parent
-        //! [0]
-        onEmitParticles: {
-            for (var i=0; i<particles.length; i++) {
-                var particle = particles[i];
-                particle.startSize = Math.max(02,Math.min(492,Math.tan(particle.t/2)*24));
-                var theta = Math.floor(Math.random() * 6.0);
-                particle.red = theta == 0 || theta == 1 || theta == 2 ? 0.2 : 1;
-                particle.green = theta == 2 || theta == 3 || theta == 4 ? 0.2 : 1;
-                particle.blue = theta == 4 || theta == 5 || theta == 0 ? 0.2 : 1;
-                theta /= 6.0;
-                theta *= 2.0*Math.PI;
-                theta += sys.convert(sys.petalRotation);//Convert from degrees to radians
-                particle.initialVX = petalLength * Math.cos(theta);
-                particle.initialVY = petalLength * Math.sin(theta);
-                particle.initialAX = particle.initialVX * -0.5;
-                particle.initialAY = particle.initialVY * -0.5;
-            }
-        }
-        //! [0]
-    }
-
-    ImageParticle {
-        source: "particle4.png"
-        alpha: 0.0
-    }
-}
diff --git a/experimental/qt5-intro-android/particles/emitmask.qml b/experimental/qt5-intro-android/particles/emitmask.qml
deleted file mode 100644
index 1c3bade..0000000
--- a/experimental/qt5-intro-android/particles/emitmask.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-
-    width: 320
-    height: 480
-
-    ParticleSystem {
-        width: 300
-        height: 300
-        anchors.centerIn: parent
-
-        ImageParticle {
-            source: "particle.png"
-            z: 2
-            anchors.fill: parent
-            color: "#4040ff"
-            alpha: 0
-            colorVariation: 0.1
-        }
-
-        Emitter {
-            anchors.fill: parent
-            emitRate: 6000
-            lifeSpan: 720
-            size: 10
-            //! [0]
-            shape: MaskShape {
-                source: "starfish_mask.png"
-            }
-            //! [0]
-        }
-
-    }
-}
diff --git a/experimental/qt5-intro-android/particles/particle.png b/experimental/qt5-intro-android/particles/particle.png
deleted file mode 100644
index 5c83896..0000000
--- a/experimental/qt5-intro-android/particles/particle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/particles/particle4.png b/experimental/qt5-intro-android/particles/particle4.png
deleted file mode 100644
index bc95b70..0000000
--- a/experimental/qt5-intro-android/particles/particle4.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/particles/star.png b/experimental/qt5-intro-android/particles/star.png
deleted file mode 100644
index 0d592cf..0000000
--- a/experimental/qt5-intro-android/particles/star.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/particles/starfish_mask.png b/experimental/qt5-intro-android/particles/starfish_mask.png
deleted file mode 100644
index 2ef74f9..0000000
--- a/experimental/qt5-intro-android/particles/starfish_mask.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/particles/velocityfrommotion.qml b/experimental/qt5-intro-android/particles/velocityfrommotion.qml
deleted file mode 100644
index 2aa3617..0000000
--- a/experimental/qt5-intro-android/particles/velocityfrommotion.qml
+++ /dev/null
@@ -1,305 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-
-    id: root
-
-    height: 480
-    width: 320
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: root
-    }
-
-    ParticleSystem { id: sys1 }
-    ImageParticle {
-        system: sys1
-        source: "particle.png"
-        color: "cyan"
-        alpha: 0
-        SequentialAnimation on color {
-            loops: Animation.Infinite
-            ColorAnimation {
-                from: "cyan"
-                to: "magenta"
-                duration: 1000
-            }
-            ColorAnimation {
-                from: "magenta"
-                to: "blue"
-                duration: 2000
-            }
-            ColorAnimation {
-                from: "blue"
-                to: "violet"
-                duration: 2000
-            }
-            ColorAnimation {
-                from: "violet"
-                to: "cyan"
-                duration: 2000
-            }
-        }
-        colorVariation: 0.3
-    }
-    //! [0]
-    Emitter {
-        id: trailsNormal
-        system: sys1
-
-        emitRate: 500
-        lifeSpan: 2000
-
-        y: mouseArea.pressed ? mouseArea.mouseY : circle.cy
-        x: mouseArea.pressed ? mouseArea.mouseX : circle.cx
-
-        velocity: PointDirection {xVariation: 4; yVariation: 4;}
-        acceleration: PointDirection {xVariation: 10; yVariation: 10;}
-        velocityFromMovement: 8
-
-        size: 8
-        sizeVariation: 4
-    }
-    //! [0]
-    ParticleSystem { id: sys2 }
-    ImageParticle {
-        color: "cyan"
-        system: sys2
-        alpha: 0
-        SequentialAnimation on color {
-            loops: Animation.Infinite
-            ColorAnimation {
-                from: "magenta"
-                to: "cyan"
-                duration: 1000
-            }
-            ColorAnimation {
-                from: "cyan"
-                to: "magenta"
-                duration: 2000
-            }
-        }
-        colorVariation: 0.5
-        source: "star.png"
-    }
-    Emitter {
-        id: trailsStars
-        system: sys2
-
-        emitRate: 100
-        lifeSpan: 2200
-
-
-        y: mouseArea.pressed ? mouseArea.mouseY : circle.cy
-        x: mouseArea.pressed ? mouseArea.mouseX : circle.cx
-
-        velocity: PointDirection {xVariation: 4; yVariation: 4;}
-        acceleration: PointDirection {xVariation: 10; yVariation: 10;}
-        velocityFromMovement: 8
-
-        size: 22
-        sizeVariation: 4
-    }
-    ParticleSystem { id: sys3; }
-    ImageParticle {
-        source: "particle.png"
-        system: sys3
-        color: "orange"
-        alpha: 0
-        SequentialAnimation on color {
-            loops: Animation.Infinite
-            ColorAnimation {
-                from: "red"
-                to: "green"
-                duration: 2000
-            }
-            ColorAnimation {
-                from: "green"
-                to: "red"
-                duration: 2000
-            }
-        }
-
-        colorVariation: 0.2
-
-    }
-    Emitter {
-        id: trailsNormal2
-        system: sys3
-
-        emitRate: 300
-        lifeSpan: 2000
-
-        y: mouseArea.pressed ? mouseArea.mouseY : circle2.cy
-        x: mouseArea.pressed ? mouseArea.mouseX : circle2.cx
-
-        velocityFromMovement: 16
-
-        velocity: PointDirection {xVariation: 4; yVariation: 4;}
-        acceleration: PointDirection {xVariation: 10; yVariation: 10;}
-
-        size: 12
-        sizeVariation: 4
-    }
-    ParticleSystem { id: sys4; }
-    ImageParticle {
-        system: sys4
-        source: "star.png"
-        color: "green"
-        alpha: 0
-        SequentialAnimation on color {
-            loops: Animation.Infinite
-            ColorAnimation {
-                from: "green"
-                to: "red"
-                duration: 2000
-            }
-            ColorAnimation {
-                from: "red"
-                to: "green"
-                duration: 2000
-            }
-        }
-
-        colorVariation: 0.5
-    }
-    Emitter {
-        id: trailsStars2
-        system: sys4
-
-        emitRate: 50
-        lifeSpan: 2200
-
-
-        y: mouseArea.pressed ? mouseArea.mouseY : circle2.cy
-        x: mouseArea.pressed ? mouseArea.mouseX : circle2.cx
-
-        velocityFromMovement: 16
-        velocity: PointDirection {xVariation: 2; yVariation: 2;}
-        acceleration: PointDirection {xVariation: 10; yVariation: 10;}
-
-        size: 22
-        sizeVariation: 4
-    }
-
-
-
-    Item {
-        id: circle
-        //anchors.fill: parent
-        property real radius: 0
-        property real dx: root.width / 2
-        property real dy: root.height / 2
-        property real cx: radius * Math.sin(percent*6.283185307179) + dx
-        property real cy: radius * Math.cos(percent*6.283185307179) + dy
-        property real percent: 0
-
-        SequentialAnimation on percent {
-            loops: Animation.Infinite
-            running: true
-            NumberAnimation {
-            duration: 1000
-            from: 1
-            to: 0
-            loops: 8
-            }
-            NumberAnimation {
-            duration: 1000
-            from: 0
-            to: 1
-            loops: 8
-            }
-
-        }
-
-        SequentialAnimation on radius {
-            loops: Animation.Infinite
-            running: true
-            NumberAnimation {
-                duration: 4000
-                from: 0
-                to: 100
-            }
-            NumberAnimation {
-                duration: 4000
-                from: 100
-                to: 0
-            }
-        }
-    }
-
-    Item {
-        id: circle3
-        property real radius: 100
-        property real dx: root.width / 2
-        property real dy: root.height / 2
-        property real cx: radius * Math.sin(percent*6.283185307179) + dx
-        property real cy: radius * Math.cos(percent*6.283185307179) + dy
-        property real percent: 0
-
-        SequentialAnimation on percent {
-            loops: Animation.Infinite
-            running: true
-            NumberAnimation { from: 0.0; to: 1 ; duration: 10000;  }
-        }
-    }
-
-    Item {
-        id: circle2
-        property real radius: 30
-        property real dx: circle3.cx
-        property real dy: circle3.cy
-        property real cx: radius * Math.sin(percent*6.283185307179) + dx
-        property real cy: radius * Math.cos(percent*6.283185307179) + dy
-        property real percent: 0
-
-        SequentialAnimation on percent {
-            loops: Animation.Infinite
-            running: true
-            NumberAnimation { from: 0.0; to: 1 ; duration: 1000; }
-        }
-    }
-
-}
diff --git a/experimental/qt5-intro-android/presentation/Clock.qml b/experimental/qt5-intro-android/presentation/Clock.qml
deleted file mode 100644
index d4c97ce..0000000
--- a/experimental/qt5-intro-android/presentation/Clock.qml
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QML Presentation System.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Digia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-
-import QtQuick 2.0
-
-Text {
-    id: clock
-
-    property real fontSize: parent.height * 0.05
-    property real fontScale: 0.5
-    property color textColor: parent.textColor != undefined ? parent.textColor : "black"
-    property string fontFamily: parent.fontFamily != undefined ? parent.fontFamily : "Helvetica"
-
-    text: currentTime();
-
-    function currentTime() {
-        var d = new Date();
-        var m = d.getMinutes();
-        if (m < 10) m = "0" + m;
-        return d.getHours() + ":" + m;
-    }
-
-    color: textColor;
-    font.family: fontFamily;
-    font.pixelSize: fontSize * fontScale;
-
-    anchors.bottom: parent.bottom;
-    anchors.left: parent.left;
-    anchors.margins: font.pixelSize;
-
-    Timer {
-        interval: 60000;
-        repeat: true;
-        running: true
-        onTriggered: clock.text = clock.currentTime();
-    }
-}
diff --git a/experimental/qt5-intro-android/presentation/CodeSlide.qml b/experimental/qt5-intro-android/presentation/CodeSlide.qml
deleted file mode 100644
index ba8626b..0000000
--- a/experimental/qt5-intro-android/presentation/CodeSlide.qml
+++ /dev/null
@@ -1,162 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QML Presentation System.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Digia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-
-Slide {
-    id: slide;
-
-    property string codeFontFamily: parent.codeFontFamily;
-    property string code;
-    property real codeFontSize: baseFontSize * 0.6;
-
-
-
-    Rectangle {
-        id: background
-        anchors.fill: parent
-        radius: height / 10;
-        gradient: Gradient {
-            GradientStop { position: 0; color: Qt.rgba(0.8, 0.8, 0.8, 0.5); }
-            GradientStop { position: 1; color: Qt.rgba(0.2, 0.2, 0.2, 0.5); }
-        }
-        border.color: slide.textColor;
-        border.width: height / 250;
-        antialiasing: true
-    }
-
-    onCodeChanged: {
-        listModel.clear();
-        var codeLines = slide.code.split("\n");
-        for (var i=0; i<codeLines.length; ++i) {
-            listModel.append({
-                                line: i,
-                                code: codeLines[i]
-                             });
-        }
-    }
-
-
-
-    ListModel {
-        id: listModel
-    }
-
-
-    onVisibleChanged: {
-        listView.focus = slide.visible;
-        listView.currentIndex = -1;
-    }
-
-    ListView {
-        id: listView;
-
-        anchors.fill: parent;
-        anchors.margins: background.radius / 2
-        clip: true
-
-        model: listModel;
-        focus: true;
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                listView.focus = true;
-                listView.currentIndex = listView.indexAt(mouse.x, mouse.y + listView.contentY);
-            }
-
-        }
-
-        delegate: Item {
-
-            id: itemDelegate
-
-            height: lineLabel.height
-            width: parent.width
-
-            Rectangle {
-                id: lineLabelBackground
-                width: lineLabel.height * 3;
-                height: lineLabel.height;
-                color: slide.textColor;
-                opacity: 0.1;
-            }
-
-            Text {
-                id: lineLabel
-                anchors.right: lineLabelBackground.right;
-                text: (line+1) + ":"
-                color: slide.textColor;
-                font.family: slide.codeFontFamily
-                font.pixelSize: slide.codeFontSize
-                font.bold: itemDelegate.ListView.isCurrentItem;
-                opacity: itemDelegate.ListView.isCurrentItem ? 1 : 0.9;
-
-            }
-
-            Rectangle {
-                id: lineContentBackground
-                anchors.fill: lineContent;
-                anchors.leftMargin: -height / 2;
-                color: slide.textColor
-                opacity: 0.2
-                visible: itemDelegate.ListView.isCurrentItem;
-            }
-
-            Text {
-                id: lineContent
-                anchors.left: lineLabelBackground.right
-                anchors.leftMargin: lineContent.height;
-                anchors.right: parent.right;
-                color: slide.textColor;
-                text: code;
-                font.family: slide.codeFontFamily
-                font.pixelSize: slide.codeFontSize
-                font.bold: itemDelegate.ListView.isCurrentItem;
-                opacity: itemDelegate.ListView.isCurrentItem ? 1 : 0.9;
-            }
-        }
-    }
-
-
-
-}
diff --git a/experimental/qt5-intro-android/presentation/Presentation.qml b/experimental/qt5-intro-android/presentation/Presentation.qml
deleted file mode 100644
index ace4d59..0000000
--- a/experimental/qt5-intro-android/presentation/Presentation.qml
+++ /dev/null
@@ -1,243 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QML Presentation System.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Digia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-import QtQuick.Window 2.0
-
-Item {
-    id: root
-
-    property variant slides: []
-    property int currentSlide;
-
-    property bool showNotes: false;
-
-    property color titleColor: textColor;
-    property color textColor: "black"
-    property string fontFamily: "Helvetica"
-    property string codeFontFamily: "Courier New"
-
-    property real masterVolume: 0.5
-
-    // Private API
-    property bool _faded: false
-    property int _userNum;
-
-    Component.onCompleted: {
-        var slideCount = 0;
-        var slides = [];
-        for (var i=0; i<root.children.length; ++i) {
-            var r = root.children[i];
-            if (r.isSlide) {
-                slides.push(r);
-            }
-        }
-
-        root.slides = slides;
-        root._userNum = 0;
-
-        // Make first slide visible...
-        if (root.slides.length > 0) {
-            root.currentSlide = 0;
-            root.slides[root.currentSlide].visible = true;
-        }
-    }
-
-    function switchSlides(from, to, forward) {
-        from.visible = false
-        to.visible = true
-        return true
-    }
-
-    function goToNextSlide() {
-        root._userNum = 0
-        if (_faded)
-            return
-        if (root.currentSlide + 1 < root.slides.length) {
-            var from = slides[currentSlide]
-            var to = slides[currentSlide + 1]
-            to.textAnimating = true
-            if (switchSlides(from, to, true)) {
-                currentSlide = currentSlide + 1;
-                root.focus = true;
-            }
-        }
-        timer.stop()
-        if (slides[currentSlide].shouldTimeout)
-            timer.start()
-    }
-
-    function goToPreviousSlide() {
-        root._userNum = 0
-        if (root._faded)
-            return
-        if (root.currentSlide - 1 >= 0) {
-            var from = slides[currentSlide]
-            var to = slides[currentSlide - 1]
-            to.textAnimating = false
-           if (switchSlides(from, to, false)) {
-                currentSlide = currentSlide - 1;
-               root.focus = true;
-           }
-        }
-        timer.stop()
-    }
-
-    function goToUserSlide() {
-        --_userNum;
-        if (root._faded || _userNum >= root.slides.length)
-            return
-        if (_userNum < 0)
-            goToNextSlide()
-        else if (root.currentSlide != _userNum) {
-            var from = slides[currentSlide]
-            var to = slides[_userNum]
-           if (switchSlides(from, to, _userNum > currentSlide)) {
-                currentSlide = _userNum;
-               root.focus = true;
-           }
-        }
-        timer.stop()
-    }
-
-    Timer {
-        id: timer
-        interval: slides[currentSlide].timeout > 0 ? slides[currentSlide].timeout : 7000
-        running: false
-        onTriggered: goToNextSlide()
-    }
-
-    focus: true
-
-    Keys.onSpacePressed: goToNextSlide()
-    Keys.onRightPressed: goToNextSlide()
-    Keys.onDownPressed: goToNextSlide()
-    Keys.onLeftPressed: goToPreviousSlide()
-    Keys.onUpPressed: goToPreviousSlide()
-    Keys.onEscapePressed: Qt.quit()
-    Keys.onPressed: {
-        if (event.key >= Qt.Key_0 && event.key <= Qt.Key_9)
-            _userNum = 10 * _userNum + (event.key - Qt.Key_0)
-        else {
-            if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter)
-                goToUserSlide();
-            else if (event.key === Qt.Key_VolumeUp)
-                root.masterVolume = Math.min(1.0, root.masterVolume + 0.1)
-            else if (event.key === Qt.Key_VolumeDown)
-                root.masterVolume = Math.max(0.0, root.masterVolume - 0.1)
-            else if (event.key === Qt.Key_VolumeMute)
-                root.masterVolume = 0.0
-            else if (event.key === Qt.Key_Backspace)
-                goToPreviousSlide();
-            else if (event.key === Qt.Key_C)
-                root._faded = !root._faded;
-            _userNum = 0;
-        }        
-    }
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Back) {
-            if (root.currentSlide > 0) {
-                goToPreviousSlide()
-                event.accepted = true
-            }
-        }
-    }
-
-    Rectangle {
-        z: 1000
-        color: "black"
-        anchors.fill: parent
-        opacity: root._faded ? 1 : 0
-        Behavior on opacity { NumberAnimation { duration: 250 } }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onClicked: {
-            if (mouse.button == Qt.RightButton)
-                goToPreviousSlide()
-            else
-                goToNextSlide()
-        }
-        onPressAndHold: goToPreviousSlide(); //A back mechanism for touch only devices
-    }
-
-    Window {
-        id: notesWindow;
-        width: 400
-        height: 300
-
-        title: "QML Presentation: Notes"
-        visible: root.showNotes
-
-        Text {
-            anchors.fill: parent
-            anchors.margins: parent.height * 0.1;
-
-            font.pixelSize: 16
-            wrapMode: Text.WordWrap
-
-            property string notes: root.slides[root.currentSlide].notes;
-            text: notes == "" ? "Slide has no notes..." : notes;
-            font.italic: notes == "";
-        }
-    }
-
-    Text {
-        id: tapToAdvance
-        color: textColor
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: parent.height * 0.01
-        anchors.horizontalCenter: parent.horizontalCenter
-        text: "[ Tap to advance ]"
-        font.family: fontFamily
-        font.pixelSize: slides[currentSlide].baseFontSize
-        opacity: slides[currentSlide].showTapToAdvance ? 1.0 : 0.0
-        visible: opacity > 0.0
-
-        Behavior on opacity {
-               NumberAnimation { duration: 400 }
-        }
-    }
-}
diff --git a/experimental/qt5-intro-android/presentation/Slide.qml b/experimental/qt5-intro-android/presentation/Slide.qml
deleted file mode 100644
index 40b7b93..0000000
--- a/experimental/qt5-intro-android/presentation/Slide.qml
+++ /dev/null
@@ -1,195 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QML Presentation System.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Digia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-
-Item {
-    /*
-      Slides can only be instantiated as a direct child of a Presentation {} as they rely on
-      several properties there.
-     */
-
-    id: slide
-
-    property bool isSlide: true;
-    property bool shouldTimeout: true
-    property real timeout: 0
-    property bool showTapToAdvance: !shouldTimeout
-
-    property string title;
-    property variant content: []
-    property string centeredText
-    property string writeInText;
-    property string notes;
-
-    property real fontSize: Math.min(parent.height, parent.width) * 0.05
-    property real fontScale: 1
-
-    property real baseFontSize: fontSize * fontScale
-    property real titleFontSize: fontSize * 1.2 * fontScale
-    property real bulletSpacing: 1
-
-    property real contentWidth: width
-
-    property bool textAnimating: true
-
-    // Define the slide to be the "content area"
-    x: parent.width * 0.05
-    y: parent.height * 0.2
-    width: parent.width * 0.9
-    height: parent.height * 0.7
-
-    property real masterWidth: parent.width
-    property real masterHeight: parent.height
-
-    property color titleColor: parent.titleColor;
-    property color textColor: parent.textColor;
-    property string fontFamily: parent.fontFamily;
-
-    property variant contentFormat: Text.PlainText
-
-    visible: false
-
-    Text {
-        id: titleText
-        font.pixelSize: titleFontSize
-        text: title;
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.top
-        anchors.bottomMargin: parent.fontSize * 1.5
-        font.bold: true;
-        font.family: slide.fontFamily
-        color: slide.titleColor
-        horizontalAlignment: Text.Center
-        z: 1
-    }
-
-    Text {
-        id: centeredId
-        width: parent.width
-        anchors.centerIn: parent
-        anchors.verticalCenterOffset: - parent.y / 3
-        text: centeredText
-        horizontalAlignment: Text.Center
-        font.pixelSize: baseFontSize
-        font.family: slide.fontFamily
-        color: slide.textColor
-        wrapMode: Text.Wrap
-    }
-
-    Text {
-        id: writeInTextId
-        property int length;
-        font.family: slide.fontFamily
-        font.pixelSize: baseFontSize
-        color: slide.textColor
-
-        anchors.fill: parent;
-        wrapMode: Text.Wrap
-
-        text: slide.writeInText.substring(0, length);
-
-        NumberAnimation on length {
-            from: 0;
-            to: slide.writeInText.length;
-            duration: slide.textAnimating ? slide.writeInText.length * 10 : 1;
-            running: slide.visible && parent.visible && slide.writeInText.length > 0
-        }
-
-        visible: slide.writeInText != undefined;
-    }
-
-
-    Column {
-        id: contentId
-        anchors.fill: parent
-
-        Repeater {
-            model: content.length
-
-            Row {
-                id: row
-
-                function decideIndentLevel(s) { return s.charAt(0) == " " ? 1 + decideIndentLevel(s.substring(1)) : 0 }
-                property int indentLevel: decideIndentLevel(content[index])
-                property int nextIndentLevel: index < content.length - 1 ? decideIndentLevel(content[index+1]) : 0
-                property real indentFactor: (10 - row.indentLevel * 2) / 10;
-
-                height: text.height + (nextIndentLevel == 0 ? 1 : 0.3) * slide.baseFontSize * slide.bulletSpacing
-                x: slide.baseFontSize * indentLevel
-
-                Rectangle {
-                    id: dot
-                    y: baseFontSize * row.indentFactor / 2
-                    width: baseFontSize / 4
-                    height: baseFontSize / 4
-                    color: slide.textColor
-                    radius: width / 2
-                    smooth: true
-                    opacity: text.text.length == 0 ? 0 : 1
-                }
-
-                Rectangle {
-                    id: space
-                    width: dot.width * 2
-                    height: 1
-                    color: "#00ffffff"
-                }
-
-                Text {
-                    id: text
-                    width: slide.contentWidth - parent.x - dot.width - space.width
-                    font.pixelSize: baseFontSize * row.indentFactor
-                    text: content[index]
-                    textFormat: contentFormat
-                    wrapMode: Text.WordWrap
-                    color: slide.textColor
-                    horizontalAlignment: Text.AlignLeft
-                    font.family: slide.fontFamily
-
-                    onLinkActivated: Qt.openUrlExternally(link)
-                }
-            }
-        }
-    }
-
-}
diff --git a/experimental/qt5-intro-android/presentation/SlideCounter.qml b/experimental/qt5-intro-android/presentation/SlideCounter.qml
deleted file mode 100644
index 06e7542..0000000
--- a/experimental/qt5-intro-android/presentation/SlideCounter.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QML Presentation System.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Digia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-
-Text {
-    id: counter;
-
-    property real fontSize: parent.height * 0.05
-    property real fontScale: 0.5;
-    property color textColor: parent.textColor != undefined ? parent.textColor : "black"
-    property string fontFamily: parent.fontFamily != undefined ? parent.fontFamily : "Helvetica"
-
-    text: "# " + (parent.currentSlide + 1) + " / " + parent.slides.length;
-    color: counter.textColor;
-    font.family: counter.fontFamily;
-    font.pixelSize: fontSize * fontScale;
-
-    anchors.right: parent.right;
-    anchors.bottom: parent.bottom;
-    anchors.margins: font.pixelSize;
-}
diff --git a/experimental/qt5-intro-android/preview_l.jpg b/experimental/qt5-intro-android/preview_l.jpg
deleted file mode 100644
index 8decd76..0000000
--- a/experimental/qt5-intro-android/preview_l.jpg
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/Samegame.qml b/experimental/qt5-intro-android/samegame/Samegame.qml
deleted file mode 100644
index 2b0b82a..0000000
--- a/experimental/qt5-intro-android/samegame/Samegame.qml
+++ /dev/null
@@ -1,371 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "content/samegame.js" as Logic
-import "settings.js" as Settings
-import "content"
-
-Rectangle {
-    id: root
-    width: 320; height: 480
-    property int acc: 0
-
-
-    function loadPuzzle() {
-        if (gameCanvas.mode != "")
-            Logic.cleanUp();
-        Logic.startNewGame(gameCanvas,"puzzle","levels/level"+acc+".qml")
-    }
-    function nextPuzzle() {
-        acc = (acc + 1) % 10;
-        loadPuzzle();
-    }
-    Timer {
-        id: gameOverTimer
-        interval: 1500
-        running : gameCanvas.gameOver && gameCanvas.mode == "puzzle" //mode will be reset by cleanUp();
-        repeat  : false
-        onTriggered: {
-            Logic.cleanUp();
-            nextPuzzle();
-        }
-    }
-
-    Image {
-        source: "content/gfx/background.png"
-        anchors.fill: parent
-    }
-
-    GameArea {
-        id: gameCanvas
-        z: 1
-        y: Settings.headerHeight
-
-        width: parent.width
-        height: parent.height - Settings.headerHeight - Settings.footerHeight
-
-        backgroundVisible: root.state == "in-game"
-        onModeChanged: if (gameCanvas.mode != "puzzle") puzzleWon = false; //UI has stricter constraints on this variable than the game does
-        Age {
-            groups: ["redspots", "greenspots", "bluespots", "yellowspots"]
-            enabled: root.state == ""
-            system: gameCanvas.ps
-        }
-
-        onPuzzleLost: acc--;//So that nextPuzzle() reloads the current one
-
-    }
-
-    Item {
-        id: menu
-        z: 2
-        width: parent.width;
-        anchors.top: parent.top
-        anchors.bottom: bottomBar.top
-
-        LogoAnimation {
-            x: 64
-            y: Settings.headerHeight
-            particleSystem: gameCanvas.ps
-            running: root.state == ""
-        }
-        Row {
-            x: 112
-            y: 20
-            Image { source: "content/gfx/logo-a.png" }
-            Image { source: "content/gfx/logo-m.png" }
-            Image { source: "content/gfx/logo-e.png" }
-        }
-
-        Column {
-            y: 100 + 40
-            spacing: Settings.menuButtonSpacing
-
-            Button {
-                width: root.width
-                rotatedButton: true
-                imgSrc: "content/gfx/but-game-1.png"
-                onClicked: {
-                    if (root.state == "in-game")
-                        return //Prevent double clicking
-                    root.state = "in-game"
-                    gameCanvas.blockFile = "Block.qml"
-                    gameCanvas.background = "gfx/background.png"
-                    arcadeTimer.start();
-                }
-                //Emitted particles don't fade out, because ImageParticle is on the GameArea
-                system: gameCanvas.ps
-                group: "green"
-                Timer {
-                    id: arcadeTimer
-                    interval: Settings.menuDelay
-                    running : false
-                    repeat  : false
-                    onTriggered: Logic.startNewGame(gameCanvas)
-                }
-            }
-
-            Button {
-                width: root.width
-                rotatedButton: true
-                imgSrc: "content/gfx/but-game-2.png"
-                onClicked: {
-                    if (root.state == "in-game")
-                        return
-                    root.state = "in-game"
-                    gameCanvas.blockFile = "Block.qml"
-                    gameCanvas.background = "gfx/background.png"
-                    twopTimer.start();
-                }
-                system: gameCanvas.ps
-                group: "green"
-                Timer {
-                    id: twopTimer
-                    interval: Settings.menuDelay
-                    running : false
-                    repeat  : false
-                    onTriggered: Logic.startNewGame(gameCanvas, "multiplayer")
-                }
-            }
-
-            Button {
-                width: root.width
-                rotatedButton: true
-                imgSrc: "content/gfx/but-game-3.png"
-                onClicked: {
-                    if (root.state == "in-game")
-                        return
-                    root.state = "in-game"
-                    gameCanvas.blockFile = "SimpleBlock.qml"
-                    gameCanvas.background = "gfx/background.png"
-                    endlessTimer.start();
-                }
-                system: gameCanvas.ps
-                group: "blue"
-                Timer {
-                    id: endlessTimer
-                    interval: Settings.menuDelay
-                    running : false
-                    repeat  : false
-                    onTriggered: Logic.startNewGame(gameCanvas, "endless")
-                }
-            }
-
-            Button {
-                width: root.width
-                rotatedButton: true
-                imgSrc: "content/gfx/but-game-4.png"
-                group: "yellow"
-                onClicked: {
-                    if (root.state == "in-game")
-                        return
-                    root.state = "in-game"
-                    gameCanvas.blockFile = "PuzzleBlock.qml"
-                    gameCanvas.background = "gfx/background.png"
-                    puzzleTimer.start();
-                }
-                Timer {
-                    id: puzzleTimer
-                    interval: Settings.menuDelay
-                    running : false
-                    repeat  : false
-                    onTriggered: loadPuzzle();
-                }
-                system: gameCanvas.ps
-            }
-        }
-    }
-
-    Image {
-        id: scoreBar
-        source: "content/gfx/bar.png"
-        width: parent.width
-        z: 6
-        y: -Settings.headerHeight
-        height: Settings.headerHeight
-        Behavior on opacity { NumberAnimation {} }
-        SamegameText {
-            id: arcadeScore
-            anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">P1:</font> ' + gameCanvas.score
-            font.pixelSize: Settings.fontPixelSize
-            textFormat: Text.StyledText
-            color: "white"
-            opacity: gameCanvas.mode == "arcade" ? 1 : 0
-            Behavior on opacity { NumberAnimation {} }
-        }
-        SamegameText {
-            id: arcadeHighScore
-            anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">Highscore:</font> ' + gameCanvas.highScore
-            opacity: gameCanvas.mode == "arcade" ? 1 : 0
-        }
-        SamegameText {
-            id: p1Score
-            anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">P1:</font> ' + gameCanvas.score
-            opacity: gameCanvas.mode == "multiplayer" ? 1 : 0
-        }
-        SamegameText {
-            id: p2Score
-            anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">P2:</font> ' + gameCanvas.score2
-            opacity: gameCanvas.mode == "multiplayer" ? 1 : 0
-            rotation: 180
-        }
-        SamegameText {
-            id: puzzleMoves
-            anchors { left: parent.left; topMargin: 3; leftMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">Moves:</font> ' + gameCanvas.moves
-            opacity: gameCanvas.mode == "puzzle" ? 1 : 0
-        }
-        SamegameText {
-            Image {
-                source: "content/gfx/icon-time.png"
-                x: -20
-            }
-            id: puzzleTime
-            anchors { topMargin: 3; top: parent.top; horizontalCenter: parent.horizontalCenter; horizontalCenterOffset: 20}
-            text: "00:00"
-            opacity: gameCanvas.mode == "puzzle" ? 1 : 0
-            Timer {
-                interval: 1000
-                repeat: true
-                running: gameCanvas.mode == "puzzle" && !gameCanvas.gameOver
-                onTriggered: {
-                    var elapsed = Math.floor((new Date() - Logic.gameDuration)/ 1000.0);
-                    var mins = Math.floor(elapsed/60.0);
-                    var secs = (elapsed % 60);
-                    puzzleTime.text =  (mins < 10 ? "0" : "") + mins + ":" + (secs < 10 ? "0" : "") + secs;
-                }
-            }
-        }
-        SamegameText {
-            id: puzzleScore
-            anchors { right: parent.right; topMargin: 3; rightMargin: 11; top: parent.top}
-            text: '<font color="#f7d303">Score:</font> ' + gameCanvas.score
-            opacity: gameCanvas.mode == "puzzle" ? 1 : 0
-        }
-    }
-
-    Image {
-        id: bottomBar
-        width: parent.width
-        height: Settings.footerHeight
-        source: "content/gfx/bar.png"
-        y: parent.height - Settings.footerHeight;
-        z: 2
-        Button {
-            id: quitButton
-            height: Settings.toolButtonHeight
-            imgSrc: "content/gfx/but-quit.png"
-            onClicked: {Qt.quit(); }
-            anchors { left: parent.left; verticalCenter: parent.verticalCenter; leftMargin: 11 }
-        }
-        Button {
-            id: menuButton
-            height: Settings.toolButtonHeight
-            imgSrc: "content/gfx/but-menu.png"
-            visible: (root.state == "in-game");
-            onClicked: {root.state = ""; Logic.cleanUp(); gameCanvas.mode = ""}
-            anchors { left: quitButton.right; verticalCenter: parent.verticalCenter; leftMargin: 0 }
-        }
-        Button {
-            id: againButton
-            height: Settings.toolButtonHeight
-            imgSrc: "content/gfx/but-game-new.png"
-            visible: (root.state == "in-game");
-            opacity: gameCanvas.gameOver && (gameCanvas.mode == "arcade" || gameCanvas.mode == "multiplayer")
-            Behavior on opacity{ NumberAnimation {} }
-            onClicked: {if (gameCanvas.gameOver) { Logic.startNewGame(gameCanvas, gameCanvas.mode);}}
-            anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 11 }
-        }
-        Button {
-            id: nextButton
-            height: Settings.toolButtonHeight
-            imgSrc: "content/gfx/but-puzzle-next.png"
-            visible: (root.state == "in-game") && gameCanvas.mode == "puzzle" && gameCanvas.puzzleWon
-            opacity: gameCanvas.puzzleWon ? 1 : 0
-            Behavior on opacity{ NumberAnimation {} }
-            onClicked: {if (gameCanvas.puzzleWon) nextPuzzle();}
-            anchors { right: parent.right; verticalCenter: parent.verticalCenter; rightMargin: 11 }
-        }
-    }
-
-    Connections {
-        target: root
-        onStateChanged: stateChangeAnim.running = true
-    }
-    SequentialAnimation {
-        id: stateChangeAnim
-        ParallelAnimation {
-            NumberAnimation { target: bottomBar; property: "y"; to: root.height; duration: Settings.menuDelay/2; easing.type: Easing.OutQuad }
-            NumberAnimation { target: scoreBar; property: "y"; to: -Settings.headerHeight; duration: Settings.menuDelay/2; easing.type: Easing.OutQuad }
-        }
-        ParallelAnimation {
-            NumberAnimation { target: bottomBar; property: "y"; to: root.height - Settings.footerHeight; duration: Settings.menuDelay/2; easing.type: Easing.OutBounce}
-            NumberAnimation { target: scoreBar; property: "y"; to: root.state == "" ? -Settings.headerHeight : 0; duration: Settings.menuDelay/2; easing.type: Easing.OutBounce}
-        }
-    }
-
-    states: [
-        State {
-            name: "in-game"
-            PropertyChanges {
-                target: menu
-                opacity: 0
-                visible: false
-            }
-        }
-    ]
-
-    transitions: [
-        Transition {
-            NumberAnimation {properties: "x,y,opacity"}
-        }
-    ]
-
-    //"Debug mode"
-    focus: true
-    Keys.onAsteriskPressed: Logic.nuke();
-    Keys.onSpacePressed: gameCanvas.puzzleWon = true;
-}
diff --git a/experimental/qt5-intro-android/samegame/content/Block.qml b/experimental/qt5-intro-android/samegame/content/Block.qml
deleted file mode 100644
index 85f2e27..0000000
--- a/experimental/qt5-intro-android/samegame/content/Block.qml
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: block
-    property bool dying: false
-    property bool spawned: false
-    property int type: 0
-    property ParticleSystem particleSystem
-
-    Behavior on x {
-        enabled: spawned;
-        SpringAnimation{ spring: 2; damping: 0.2 }
-    }
-    Behavior on y {
-        SpringAnimation{ spring: 2; damping: 0.2 }
-    }
-
-    Image {
-        id: img
-        source: {
-            if (type == 0){
-                "gfx/red.png";
-            } else if (type == 1) {
-                "gfx/blue.png";
-            } else if (type == 2) {
-                "gfx/green.png";
-            } else {
-                "gfx/yellow.png";
-            }
-        }
-        opacity: 0
-        Behavior on opacity { NumberAnimation { duration: 200 } }
-        anchors.fill: parent
-    }
-
-    //Foreground particles
-    BlockEmitter {
-        id: particles
-        system: particleSystem
-        group: {
-            if (type == 0){
-                "red";
-            } else if (type == 1) {
-                "blue";
-            } else if (type == 2) {
-                "green";
-            } else {
-                "yellow";
-            }
-        }
-        anchors.fill: parent
-    }
-
-    //Paint particles on the background
-    PaintEmitter {
-        id: particles2
-        system: particleSystem
-    }
-
-    states: [
-        State {
-            name: "AliveState"; when: spawned == true && dying == false
-            PropertyChanges { target: img; opacity: 1 }
-        },
-
-        State {
-            name: "DeathState"; when: dying == true
-            StateChangeScript { script: {particleSystem.paused = false; particles.pulse(100); particles2.pulse(100);} }
-            PropertyChanges { target: img; opacity: 0 }
-            StateChangeScript { script: block.destroy(1000); }
-        }
-    ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/BlockEmitter.qml b/experimental/qt5-intro-android/samegame/content/BlockEmitter.qml
deleted file mode 100644
index 7dad509..0000000
--- a/experimental/qt5-intro-android/samegame/content/BlockEmitter.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-import "../settings.js" as Settings
-
-Emitter {
-    property Item block: parent
-    velocity: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -40; magnitudeVariation: 40}
-    acceleration: TargetDirection{targetX: block.width/2; targetY: block.height/2; magnitude: -100;}
-    shape: EllipseShape{fill:true}
-    enabled: false;
-    lifeSpan: 700; lifeSpanVariation: 100
-    emitRate: 1000
-    maximumEmitted: 100 //only fires 0.1s bursts (still 2x old number)
-    size: Settings.blockSize * 0.85
-    endSize: Settings.blockSize * 0.85 /2
-}
diff --git a/experimental/qt5-intro-android/samegame/content/Button.qml b/experimental/qt5-intro-android/samegame/content/Button.qml
deleted file mode 100644
index aab21ec..0000000
--- a/experimental/qt5-intro-android/samegame/content/Button.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    property alias imgSrc: image.source
-    property alias system: emitter.system
-    property alias group: emitter.group
-    signal clicked
-    property bool rotatedButton: false
-
-    width: image.width
-    height: image.sourceSize.height
-    Image {
-        id: image
-        height: parent.height
-        width: height/sourceSize.height * sourceSize.width
-
-        anchors.horizontalCenter: parent.horizontalCenter
-        rotation: rotatedButton ? ((Math.random() * 3 + 2) * (Math.random() <= 0.5 ? -1 : 1)) : 0
-        MenuEmitter {
-            id: emitter
-            anchors.fill: parent
-            //shape: MaskShape {source: image.source}
-        }
-    }
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {parent.clicked(); emitter.burst(400);}
-    }
-}
diff --git a/experimental/qt5-intro-android/samegame/content/GameArea.qml b/experimental/qt5-intro-android/samegame/content/GameArea.qml
deleted file mode 100644
index f3ca98d..0000000
--- a/experimental/qt5-intro-android/samegame/content/GameArea.qml
+++ /dev/null
@@ -1,226 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "samegame.js" as Logic
-
-Item {
-    id: gameCanvas
-    property bool gameOver: true
-    property int score: 0
-    property int highScore: 0
-    property int moves: 0
-    property string mode: ""
-    property ParticleSystem ps: particleSystem
-    //For easy theming
-    property alias backgroundVisible: bg.visible
-    property string background: "gfx/background.png"
-    property string blockFile: "Block.qml"
-    onBlockFileChanged: Logic.changeBlock(blockFile);
-    property alias particlePack: auxLoader.source
-    //For multiplayer
-    property int score2: 0
-    property int curTurn: 1
-    property bool autoTurnChange: false
-    signal swapPlayers
-    property bool swapping: false
-    //onSwapPlayers: if (autoTurnChange) Logic.turnChange();//Now implemented below
-    //For puzzle
-    property url level
-    property bool puzzleWon: false
-    signal puzzleLost //Since root is tracking the puzzle progress
-    function showPuzzleEnd (won) {
-        if (won) {
-            smokeParticle.color = Qt.rgba(0,1,0,0);
-            puzzleWin.play();
-        } else {
-            smokeParticle.color = Qt.rgba(1,0,0,0);
-            puzzleFail.play();
-            puzzleLost();
-        }
-    }
-    function showPuzzleGoal (str) {
-        puzzleTextBubble.opacity = 1;
-        puzzleTextLabel.text = str;
-    }
-    Image {
-        id: bg
-        z: -1
-        anchors.fill: parent
-        source: background;
-        fillMode: Image.PreserveAspectCrop
-    }
-
-    MouseArea {
-        anchors.fill: parent; onClicked: {
-            if (puzzleTextBubble.opacity == 1) {
-                puzzleTextBubble.opacity = 0;
-                Logic.finishLoadingMap();
-            } else if (!swapping) {
-                Logic.handleClick(mouse.x,mouse.y);
-            }
-        }
-    }
-
-    Image {
-        id: highScoreTextBubble
-        opacity: mode == "arcade" && gameOver && gameCanvas.score == gameCanvas.highScore ? 1 : 0
-        Behavior on opacity { NumberAnimation {} }
-        anchors.centerIn: parent
-        z: 10
-        source: "gfx/bubble-highscore.png"
-        Image {
-            anchors.centerIn: parent
-            source: "gfx/text-highscore-new.png"
-            rotation: -10
-        }
-    }
-
-    Image {
-        id: puzzleTextBubble
-        anchors.centerIn: parent
-        opacity: 0
-        Behavior on opacity { NumberAnimation {} }
-        z: 10
-        source: "gfx/bubble-puzzle.png"
-        Connections {
-            target: gameCanvas
-            onModeChanged: if (mode != "puzzle" && puzzleTextBubble.opacity > 0) puzzleTextBubble.opacity = 0;
-        }
-        Text {
-            id: puzzleTextLabel
-            width: parent.width - 24
-            anchors.centerIn: parent
-            horizontalAlignment: Text.AlignHCenter
-            color: "white"
-            font.pixelSize: 24
-            font.bold: true
-            wrapMode: Text.WordWrap
-        }
-    }
-    onModeChanged: {
-        p1WonImg.opacity = 0;
-        p2WonImg.opacity = 0;
-    }
-    SmokeText { id: puzzleWin; source: "gfx/icon-ok.png"; system: particleSystem }
-    SmokeText { id: puzzleFail; source: "gfx/icon-fail.png"; system: particleSystem }
-
-    onSwapPlayers: {
-        smokeParticle.color = "yellow"
-        Logic.turnChange();
-        if (curTurn == 1) {
-            p1Text.play();
-        } else {
-            p2Text.play();
-        }
-        clickDelay.running = true;
-    }
-    SequentialAnimation {
-        id: clickDelay
-        ScriptAction { script: gameCanvas.swapping = true; }
-        PauseAnimation { duration: 750 }
-        ScriptAction { script: gameCanvas.swapping = false; }
-    }
-
-    SmokeText {
-        id: p1Text; source: "gfx/text-p1-go.png";
-        system: particleSystem; playerNum: 1
-        opacity: p1WonImg.opacity + p2WonImg.opacity > 0 ? 0 : 1
-    }
-
-    SmokeText {
-        id: p2Text; source: "gfx/text-p2-go.png";
-        system: particleSystem; playerNum: 2
-        opacity: p1WonImg.opacity + p2WonImg.opacity > 0 ? 0 : 1
-    }
-
-    onGameOverChanged: {
-        if (gameCanvas.mode == "multiplayer") {
-            if (gameCanvas.score >= gameCanvas.score2) {
-                p1WonImg.opacity = 1;
-            } else {
-                p2WonImg.opacity = 1;
-            }
-        }
-    }
-    Image {
-        id: p1WonImg
-        source: "gfx/text-p1-won.png"
-        anchors.centerIn: parent
-        opacity: 0
-        Behavior on opacity { NumberAnimation {} }
-        z: 10
-    }
-    Image {
-        id: p2WonImg
-        source: "gfx/text-p2-won.png"
-        anchors.centerIn: parent
-        opacity: 0
-        Behavior on opacity { NumberAnimation {} }
-        z: 10
-    }
-
-    ParticleSystem{
-        id: particleSystem;
-        anchors.fill: parent
-        z: 5
-        ImageParticle {
-            id: smokeParticle
-            groups: ["smoke"]
-            source: "gfx/particle-smoke.png"
-            alpha: 0.1
-            alphaVariation: 0.1
-            color: "yellow"
-        }
-        Loader {
-            id: auxLoader
-            anchors.fill: parent
-            source: "PrimaryPack.qml"
-            onItemChanged: {
-                if (item && "particleSystem" in item)
-                    item.particleSystem = particleSystem
-                if (item && "gameArea" in item)
-                    item.gameArea = gameCanvas
-            }
-        }
-    }
-}
-
diff --git a/experimental/qt5-intro-android/samegame/content/LogoAnimation.qml b/experimental/qt5-intro-android/samegame/content/LogoAnimation.qml
deleted file mode 100644
index c879893..0000000
--- a/experimental/qt5-intro-android/samegame/content/LogoAnimation.qml
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: container //Positioned where the 48x48 S/G should be
-    property alias running: mainAnim.running
-    property ParticleSystem particleSystem
-    property int dur: 500
-    signal boomTime
-    Image {
-        id: s1
-        source: "gfx/logo-s.png"
-        y: 0
-    }
-    Image {
-        id: g1
-        source: "gfx/logo-g.png"
-        y: -128
-    }
-    Column {
-        Repeater {
-            model: 2
-            Item {
-                width: 48
-                height: 48
-                BlockEmitter {
-                    id: emitter
-                    anchors.fill: parent
-                    group: "red"
-                    system: particleSystem
-                    Connections {
-                        target: container
-                        onBoomTime: emitter.pulse(100);
-                    }
-                }
-            }
-        }
-    }
-    SequentialAnimation {
-        id: mainAnim
-        running: true
-        loops: -1
-        PropertyAction { target: g1; property: "y"; value: -128}
-        PropertyAction { target: g1; property: "opacity"; value: 1}
-        PropertyAction { target: s1; property: "y"; value: 0}
-        PropertyAction { target: s1; property: "opacity"; value: 1}
-        NumberAnimation { target: g1; property: "y"; from: -96; to: -48; duration: dur}
-        ParallelAnimation {
-            NumberAnimation { target: g1; property: "y"; from: -48; to: 0; duration: dur}
-            NumberAnimation { target: s1; property: "y"; from: 0; to: 48; duration: dur }
-        }
-        PauseAnimation { duration: dur }
-        ScriptAction { script: container.boomTime(); }
-        ParallelAnimation {
-            NumberAnimation { target: g1; property: "opacity"; to: 0; duration: dur }
-            NumberAnimation { target: s1; property: "opacity"; to: 0; duration: dur }
-        }
-        PropertyAction { target: s1; property: "y"; value: -128}
-        PropertyAction { target: s1; property: "opacity"; value: 1}
-        NumberAnimation { target: s1; property: "y"; from: -96; to: 0; duration: dur * 2}
-    }
-}
diff --git a/experimental/qt5-intro-android/samegame/content/MenuEmitter.qml b/experimental/qt5-intro-android/samegame/content/MenuEmitter.qml
deleted file mode 100644
index 16c7660..0000000
--- a/experimental/qt5-intro-android/samegame/content/MenuEmitter.qml
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Emitter {
-    anchors.fill: parent
-    velocity: AngleDirection{angleVariation: 360; magnitude: 140; magnitudeVariation: 40}
-    enabled: false;
-    lifeSpan: 500;
-    emitRate: 1
-    size: 28
-    endSize: 14
-    group: "yellow"
-}
diff --git a/experimental/qt5-intro-android/samegame/content/PaintEmitter.qml b/experimental/qt5-intro-android/samegame/content/PaintEmitter.qml
deleted file mode 100644
index 4a67c4a..0000000
--- a/experimental/qt5-intro-android/samegame/content/PaintEmitter.qml
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-import "../settings.js" as Settings
-
-Emitter {
-    property Item block: parent
-    anchors.fill: parent
-    shape: EllipseShape { fill: true }
-    group: {
-        if (block.type == 0){
-            "redspots";
-        } else if (block.type == 1) {
-            "bluespots";
-        } else if (block.type == 2) {
-            "greenspots";
-        } else {
-            "yellowspots";
-        }
-    }
-    size: Settings.blockSize * 2
-    endSize: Settings.blockSize/2
-    lifeSpan: 30000
-    enabled: false
-    emitRate: 60
-    maximumEmitted: 60
-    velocity: PointDirection{ y: 4; yVariation: 4 }
-    /* Possibly better, but dependent on gerrit change,28212
-    property real mainIntensity: 0.8
-    property real subIntensity: 0.1
-    property real colorVariation: 0.005
-    onEmitParticles: {//One group, many colors, for better stacking
-        for (var i=0; i<particles.length; i++) {
-            var particle = particles[i];
-            if (block.type == 0) {
-                particle.red = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            } else if (block.type == 1) {
-                particle.red = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            } else if (block.type == 2) {
-                particle.red = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            } else if (block.type == 3) {
-                particle.red = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = subIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            } else {
-                particle.red = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.green = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-                particle.blue = mainIntensity + (Math.random() * colorVariation * 2 - colorVariation);
-            }
-        }
-    }
-    */
-}
diff --git a/experimental/qt5-intro-android/samegame/content/PrimaryPack.qml b/experimental/qt5-intro-android/samegame/content/PrimaryPack.qml
deleted file mode 100644
index 278ed0e..0000000
--- a/experimental/qt5-intro-android/samegame/content/PrimaryPack.qml
+++ /dev/null
@@ -1,122 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: container
-    property ParticleSystem particleSystem
-    property GameArea gameArea
-    onGameAreaChanged: bgstacker.parent = gameArea;//Move to direct child of game canvas
-    Item {
-        id: bgstacker
-        z: 0
-        ImageParticle {
-            groups: ["yellowspots"]
-            color: Qt.darker("yellow");//Actually want desaturated...
-            system: particleSystem
-            source: "gfx/particle-paint.png"
-            colorVariation: 0.2
-            alpha: 0.2
-            entryEffect: ImageParticle.None
-        }
-        ImageParticle {
-            groups: ["redspots"]
-            system: particleSystem
-            color: Qt.darker("red");//Actually want desaturated...
-            source: "gfx/particle-paint.png"
-            colorVariation: 0.2
-            alpha: 0.2
-            entryEffect: ImageParticle.None
-        }
-        ImageParticle {
-            groups: ["greenspots"]
-            system: particleSystem
-            color: Qt.darker("green");//Actually want desaturated...
-            source: "gfx/particle-paint.png"
-            colorVariation: 0.2
-            alpha: 0.2
-            entryEffect: ImageParticle.None
-        }
-        ImageParticle {
-            groups: ["bluespots"]
-            system: particleSystem
-            color: Qt.darker("blue");//Actually want desaturated...
-            source: "gfx/particle-paint.png"
-            colorVariation: 0.2
-            alpha: 0.2
-            entryEffect: ImageParticle.None
-        }
-    }
-    ImageParticle {
-        groups: ["yellow"]
-        system: particleSystem
-        color: Qt.darker("yellow");//Actually want desaturated...
-        source: "gfx/particle-brick.png"
-        colorVariation: 0.4
-        alpha: 0.1
-    }
-    ImageParticle {
-        groups: ["red"]
-        system: particleSystem
-        color: Qt.darker("red");//Actually want desaturated...
-        source: "gfx/particle-brick.png"
-        colorVariation: 0.4
-        alpha: 0.1
-    }
-    ImageParticle {
-        groups: ["green"]
-        system: particleSystem
-        color: Qt.darker("green");//Actually want desaturated...
-        source: "gfx/particle-brick.png"
-        colorVariation: 0.4
-        alpha: 0.1
-    }
-    ImageParticle {
-        groups: ["blue"]
-        system: particleSystem
-        color: Qt.darker("blue");//Actually want desaturated...
-        source: "gfx/particle-brick.png"
-        colorVariation: 0.4
-        alpha: 0.1
-    }
-}
diff --git a/experimental/qt5-intro-android/samegame/content/PuzzleBlock.qml b/experimental/qt5-intro-android/samegame/content/PuzzleBlock.qml
deleted file mode 100644
index 8a0e725..0000000
--- a/experimental/qt5-intro-android/samegame/content/PuzzleBlock.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: block
-    property bool dying: false
-    property bool spawned: false
-    property int type: 0
-    property ParticleSystem particleSystem
-
-    Behavior on x {
-        enabled: spawned;
-        NumberAnimation{ easing.type: Easing.OutBounce }
-    }
-    Behavior on y {
-        NumberAnimation{ easing.type: Easing.InQuad }
-    }
-
-    Image {
-        id: img
-        source: {
-            if (type == 0){
-                "gfx/red-puzzle.png";
-            } else if (type == 1) {
-                "gfx/blue-puzzle.png";
-            } else if (type == 2) {
-                "gfx/green-puzzle.png";
-            } else {
-                "gfx/yellow-puzzle.png";
-            }
-        }
-        opacity: 0
-        Behavior on opacity { NumberAnimation { duration: 200 } }
-        anchors.centerIn: parent
-        anchors.verticalCenterOffset: -4
-        anchors.horizontalCenterOffset: 4
-    }
-
-    //Foreground particles
-    BlockEmitter {
-        id: particles
-        system: particleSystem
-        group: {
-            if (type == 0){
-                "red";
-            } else if (type == 1) {
-                "blue";
-            } else if (type == 2) {
-                "green";
-            } else {
-                "yellow";
-            }
-        }
-        anchors.fill: parent
-    }
-
-    states: [
-        State {
-            name: "AliveState"; when: spawned == true && dying == false
-            PropertyChanges { target: img; opacity: 1 }
-        },
-
-        State {
-            name: "DeathState"; when: dying == true
-            PropertyChanges { target: img; scale: 2 }
-            StateChangeScript { script: particles.pulse(200); }
-            PropertyChanges { target: img; opacity: 0 }
-            StateChangeScript { script: block.destroy(1000); }
-        }
-    ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/SamegameText.qml b/experimental/qt5-intro-android/samegame/content/SamegameText.qml
deleted file mode 100644
index 28c85f9..0000000
--- a/experimental/qt5-intro-android/samegame/content/SamegameText.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/***************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../settings.js" as Settings
-
-Text {
-    font.pixelSize: Settings.fontPixelSize;
-    color: "white";
-    textFormat: Text.StyledText;
-    Behavior on opacity { NumberAnimation {} }
-}
diff --git a/experimental/qt5-intro-android/samegame/content/SimpleBlock.qml b/experimental/qt5-intro-android/samegame/content/SimpleBlock.qml
deleted file mode 100644
index 22a1fa3..0000000
--- a/experimental/qt5-intro-android/samegame/content/SimpleBlock.qml
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: block
-    property bool dying: false
-    property bool spawned: false
-    property int type: 0
-    property ParticleSystem particleSystem
-
-    Behavior on x {
-        enabled: spawned;
-        SpringAnimation{ spring: 2; damping: 0.2 }
-    }
-    Behavior on y {
-        SpringAnimation{ spring: 2; damping: 0.2 }
-    }
-
-    Image {
-        id: img
-        source: {
-            if (type == 0){
-                "gfx/red.png";
-            } else if (type == 1) {
-                "gfx/blue.png";
-            } else if (type == 2) {
-                "gfx/green.png";
-            } else {
-                "gfx/yellow.png";
-            }
-        }
-        opacity: 0
-        Behavior on opacity { NumberAnimation { duration: 200 } }
-        anchors.fill: parent
-    }
-
-    //Foreground particles
-    BlockEmitter {
-        id: particles
-        system: particleSystem
-        group: {
-            if (type == 0){
-                "red";
-            } else if (type == 1) {
-                "blue";
-            } else if (type == 2) {
-                "green";
-            } else {
-                "yellow";
-            }
-        }
-        anchors.fill: parent
-    }
-
-    states: [
-        State {
-            name: "AliveState"; when: spawned == true && dying == false
-            PropertyChanges { target: img; opacity: 1 }
-        },
-
-        State {
-            name: "DeathState"; when: dying == true
-            StateChangeScript { script: {particleSystem.paused = false; particles.pulse(100); } }
-            PropertyChanges { target: img; opacity: 0 }
-            StateChangeScript { script: block.destroy(1000); }
-        }
-    ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/SmokeText.qml b/experimental/qt5-intro-android/samegame/content/SmokeText.qml
deleted file mode 100644
index 73d9ae4..0000000
--- a/experimental/qt5-intro-android/samegame/content/SmokeText.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    z: 10
-    property alias source: img.source
-    property alias system: emitter.system
-    property int playerNum: 1
-    function play() {
-        anim.running = true;
-    }
-    anchors.centerIn: parent
-    Image {
-        opacity: 0
-        id: img
-        anchors.centerIn: parent
-        rotation: playerNum == 1 ? -8 : -5
-        Emitter {
-            id: emitter
-            group: "smoke"
-            anchors.fill: parent
-            shape: MaskShape { source: img.source }
-            enabled: false
-            emitRate: 1000
-            lifeSpan: 600
-            size: 64
-            endSize: 32
-            velocity: AngleDirection { angleVariation: 360; magnitudeVariation: 160 }
-        }
-    }
-    SequentialAnimation {
-        id: anim
-        running: false
-        PauseAnimation { duration: 500}
-        ParallelAnimation {
-            NumberAnimation { target: img; property: "opacity"; from: 0.1; to: 1.0 }
-            NumberAnimation { target: img; property: "scale"; from: 0.1; to: 1.0 }
-        }
-        PauseAnimation { duration: 250}
-        ScriptAction { script: emitter.pulse(100); }
-        NumberAnimation { target: img; property: "opacity"; from: 1.0; to: 0.0 }
-    }
-}
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/background-puzzle.png b/experimental/qt5-intro-android/samegame/content/gfx/background-puzzle.png
deleted file mode 100644
index c2eca5f..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/background-puzzle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/background.png b/experimental/qt5-intro-android/samegame/content/gfx/background.png
deleted file mode 100644
index 60f57b6..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/background.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/bar.png b/experimental/qt5-intro-android/samegame/content/gfx/bar.png
deleted file mode 100644
index 4953cd6..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/bar.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/blue-puzzle.png b/experimental/qt5-intro-android/samegame/content/gfx/blue-puzzle.png
deleted file mode 100644
index e550d59..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/blue-puzzle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/blue.png b/experimental/qt5-intro-android/samegame/content/gfx/blue.png
deleted file mode 100644
index b8161c0..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/blue.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/bubble-highscore.png b/experimental/qt5-intro-android/samegame/content/gfx/bubble-highscore.png
deleted file mode 100644
index c4e38df..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/bubble-highscore.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/bubble-puzzle.png b/experimental/qt5-intro-android/samegame/content/gfx/bubble-puzzle.png
deleted file mode 100644
index 278556b..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/bubble-puzzle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/but-game-1.png b/experimental/qt5-intro-android/samegame/content/gfx/but-game-1.png
deleted file mode 100644
index 3343b7f..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/but-game-1.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/but-game-2.png b/experimental/qt5-intro-android/samegame/content/gfx/but-game-2.png
deleted file mode 100644
index afba106..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/but-game-2.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/but-game-3.png b/experimental/qt5-intro-android/samegame/content/gfx/but-game-3.png
deleted file mode 100644
index adea77a..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/but-game-3.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/but-game-4.png b/experimental/qt5-intro-android/samegame/content/gfx/but-game-4.png
deleted file mode 100644
index 18c922b..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/but-game-4.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/but-game-new.png b/experimental/qt5-intro-android/samegame/content/gfx/but-game-new.png
deleted file mode 100644
index 257e182..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/but-game-new.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/but-menu.png b/experimental/qt5-intro-android/samegame/content/gfx/but-menu.png
deleted file mode 100644
index 8440e87..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/but-menu.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/but-puzzle-next.png b/experimental/qt5-intro-android/samegame/content/gfx/but-puzzle-next.png
deleted file mode 100644
index 7e3ed41..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/but-puzzle-next.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/but-quit.png b/experimental/qt5-intro-android/samegame/content/gfx/but-quit.png
deleted file mode 100644
index 95c77ce..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/but-quit.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/green-puzzle.png b/experimental/qt5-intro-android/samegame/content/gfx/green-puzzle.png
deleted file mode 100644
index 581f76f..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/green-puzzle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/green.png b/experimental/qt5-intro-android/samegame/content/gfx/green.png
deleted file mode 100644
index da4cca5..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/green.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/icon-fail.png b/experimental/qt5-intro-android/samegame/content/gfx/icon-fail.png
deleted file mode 100644
index 4072611..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/icon-fail.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/icon-ok.png b/experimental/qt5-intro-android/samegame/content/gfx/icon-ok.png
deleted file mode 100644
index 15a8442..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/icon-ok.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/icon-time.png b/experimental/qt5-intro-android/samegame/content/gfx/icon-time.png
deleted file mode 100644
index 9490e49..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/icon-time.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/logo-a.png b/experimental/qt5-intro-android/samegame/content/gfx/logo-a.png
deleted file mode 100644
index 20c20ba..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/logo-a.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/logo-e.png b/experimental/qt5-intro-android/samegame/content/gfx/logo-e.png
deleted file mode 100644
index dd663f1..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/logo-e.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/logo-g.png b/experimental/qt5-intro-android/samegame/content/gfx/logo-g.png
deleted file mode 100644
index a319bf9..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/logo-g.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/logo-m.png b/experimental/qt5-intro-android/samegame/content/gfx/logo-m.png
deleted file mode 100644
index 6a029b3..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/logo-m.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/logo-s.png b/experimental/qt5-intro-android/samegame/content/gfx/logo-s.png
deleted file mode 100644
index 963b175..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/logo-s.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/logo.png b/experimental/qt5-intro-android/samegame/content/gfx/logo.png
deleted file mode 100644
index e900edd..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/logo.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/particle-brick.png b/experimental/qt5-intro-android/samegame/content/gfx/particle-brick.png
deleted file mode 100644
index 5c83896..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/particle-brick.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/particle-paint.png b/experimental/qt5-intro-android/samegame/content/gfx/particle-paint.png
deleted file mode 100644
index 9bd0a2a..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/particle-paint.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/particle-smoke.png b/experimental/qt5-intro-android/samegame/content/gfx/particle-smoke.png
deleted file mode 100644
index b27f954..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/particle-smoke.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/red-puzzle.png b/experimental/qt5-intro-android/samegame/content/gfx/red-puzzle.png
deleted file mode 100644
index 9ceb17e..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/red-puzzle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/red.png b/experimental/qt5-intro-android/samegame/content/gfx/red.png
deleted file mode 100644
index 681810f..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/red.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-highscore-new.png b/experimental/qt5-intro-android/samegame/content/gfx/text-highscore-new.png
deleted file mode 100644
index 50f7fcd..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-highscore-new.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-highscore.png b/experimental/qt5-intro-android/samegame/content/gfx/text-highscore.png
deleted file mode 100644
index 7198c27..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-highscore.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-no-winner.png b/experimental/qt5-intro-android/samegame/content/gfx/text-no-winner.png
deleted file mode 100644
index b4a6685..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-no-winner.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-p1-go.png b/experimental/qt5-intro-android/samegame/content/gfx/text-p1-go.png
deleted file mode 100644
index c7bd2a5..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-p1-go.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-p1-won.png b/experimental/qt5-intro-android/samegame/content/gfx/text-p1-won.png
deleted file mode 100644
index 41c2eb7..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-p1-won.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-p1.png b/experimental/qt5-intro-android/samegame/content/gfx/text-p1.png
deleted file mode 100644
index b59c87b..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-p1.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-p2-go.png b/experimental/qt5-intro-android/samegame/content/gfx/text-p2-go.png
deleted file mode 100644
index f03cd93..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-p2-go.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-p2-won.png b/experimental/qt5-intro-android/samegame/content/gfx/text-p2-won.png
deleted file mode 100644
index 116b7f2..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-p2-won.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/text-p2.png b/experimental/qt5-intro-android/samegame/content/gfx/text-p2.png
deleted file mode 100644
index d4f2bc7..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/text-p2.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/yellow-puzzle.png b/experimental/qt5-intro-android/samegame/content/gfx/yellow-puzzle.png
deleted file mode 100644
index 66044c8..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/yellow-puzzle.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/gfx/yellow.png b/experimental/qt5-intro-android/samegame/content/gfx/yellow.png
deleted file mode 100644
index 6bc5d38..0000000
--- a/experimental/qt5-intro-android/samegame/content/gfx/yellow.png
+++ /dev/null
diff --git a/experimental/qt5-intro-android/samegame/content/levels/TemplateBase.qml b/experimental/qt5-intro-android/samegame/content/levels/TemplateBase.qml
deleted file mode 100644
index f0832d4..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/TemplateBase.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-Rectangle{
-    id: control
-    property int scoreTarget: -1
-    property int timeTarget: -1
-    property int moveTarget: -1
-    property bool mustClear: true
-    property string goalText: "Clear the level..."
-
-    property var startingGrid //If this isn't an array of ints, we will refuse to load the level.
-    /*  Ints are 0-4. If not enough ints are there it will be prepadded with 0s to fill the grid
-        (which ruins everything if you have the wrong number of rows).
-        0 - No block
-        1 - Red
-        2 - Blue
-        3 - Green
-        4 - Yellow
-        Ideas for future colors, but not supported in this version:
-        5 - Purple
-        6 - Cyan
-        7 - Gray
-        8 - Black
-        9 - White
-    */
-
-    width: 320
-    height: 416
-    color: "white" //TODO: Theme support for both setting themes per level, and seeing it in the control!
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level0.qml b/experimental/qt5-intro-android/samegame/content/levels/level0.qml
deleted file mode 100644
index 5d2fa4f..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level0.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    moveTarget: 3
-    goalText: "1 of 10<br><br>Clear in three moves..."
-    startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 1 , 1 , 1 ,
-                    0 , 0 , 0 , 0 , 0 , 1 , 1 , 2 , 1 , 1 ,
-                    0 , 0 , 0 , 1 , 1 , 3 , 3 , 3 , 3 , 3 ,
-                    0 , 1 , 1 , 3 , 3 , 3 , 1 , 3 , 1 , 1 ,
-                    1 , 2 , 3 , 3 , 1 , 1 , 3 , 3 , 3 , 3 ,
-                    1 , 3 , 3 , 2 , 3 , 3 , 3 , 3 , 1 , 1 ,
-                    1 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 , 2 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level1.qml b/experimental/qt5-intro-android/samegame/content/levels/level1.qml
deleted file mode 100644
index 4bb15cb..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level1.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    timeTarget: 10
-    goalText: "2 of 10<br><br>Clear in 10 seconds..."
-    startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    1 , 3 , 3 , 3 , 1 , 1 , 1 , 1 , 2 , 2 ,
-                    1 , 2 , 3 , 3 , 3 , 1 , 1 , 1 , 1 , 2 ,
-                    2 , 2 , 1 , 3 , 3 , 3 , 1 , 1 , 1 , 2 ,
-                    2 , 1 , 1 , 1 , 3 , 3 , 3 , 1 , 2 , 2 ,
-                    1 , 1 , 1 , 1 , 1 , 3 , 3 , 3 , 2 , 1 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level2.qml b/experimental/qt5-intro-android/samegame/content/levels/level2.qml
deleted file mode 100644
index a319479..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level2.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    scoreTarget: 1200
-    timeTarget: 60
-    goalText: "3 of 10<br><br>Score over 1200 points in one minute..."
-    mustClear: false
-    startingGrid: [ 3 , 1 , 2 , 1 , 1 , 2 , 1 , 1 , 3 , 3 ,
-                    1 , 3 , 3 , 2 , 3 , 3 , 1 , 1 , 3 , 1 ,
-                    3 , 1 , 3 , 3 , 2 , 3 , 3 , 3 , 1 , 2 ,
-                    3 , 2 , 2 , 1 , 3 , 3 , 2 , 1 , 1 , 2 ,
-                    3 , 1 , 2 , 2 , 2 , 2 , 2 , 1 , 3 , 1 ,
-                    2 , 3 , 1 , 2 , 2 , 3 , 3 , 1 , 3 , 2 ,
-                    3 , 2 , 1 , 1 , 3 , 3 , 3 , 2 , 2 , 1 ,
-                    1 , 2 , 2 , 3 , 2 , 3 , 3 , 3 , 1 , 1 ,
-                    1 , 3 , 3 , 3 , 1 , 2 , 2 , 3 , 3 , 1 ,
-                    3 , 3 , 2 , 1 , 2 , 2 , 1 , 1 , 1 , 3 ,
-                    2 , 1 , 3 , 2 , 3 , 2 , 3 , 2 , 2 , 1 ,
-                    1 , 3 , 1 , 2 , 1 , 2 , 3 , 1 , 2 , 2 ,
-                    1 , 2 , 2 , 2 , 1 , 1 , 2 , 3 , 1 , 2 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level3.qml b/experimental/qt5-intro-android/samegame/content/levels/level3.qml
deleted file mode 100644
index 43e82d7..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level3.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    scoreTarget: 3000
-    timeTarget: 60
-    goalText: "4 of 10<br>Clear the board with over 3000 points in under a minute..."
-    startingGrid: [ 3 , 3 , 1 , 1 , 1 , 2 , 2 , 4 , 3 , 3 ,
-                    4 , 3 , 1 , 4 , 2 , 2 , 2 , 4 , 3 , 4 ,
-                    4 , 3 , 3 , 4 , 1 , 1 , 3 , 3 , 4 , 4 ,
-                    3 , 3 , 3 , 3 , 3 , 1 , 3 , 2 , 2 , 4 ,
-                    4 , 4 , 3 , 4 , 3 , 1 , 4 , 4 , 4 , 4 ,
-                    4 , 4 , 3 , 4 , 1 , 1 , 4 , 4 , 3 , 3 ,
-                    4 , 2 , 2 , 2 , 2 , 2 , 4 , 4 , 4 , 1 ,
-                    4 , 4 , 2 , 4 , 2 , 2 , 1 , 1 , 1 , 1 ,
-                    4 , 4 , 2 , 4 , 2 , 2 , 1 , 4 , 4 , 1 ,
-                    4 , 1 , 1 , 4 , 3 , 3 , 4 , 2 , 4 , 1 ,
-                    4 , 1 , 1 , 2 , 3 , 3 , 4 , 2 , 2 , 1 ,
-                    1 , 1 , 2 , 2 , 2 , 3 , 3 , 3 , 2 , 1 ,
-                    4 , 1 , 1 , 2 , 2 , 3 , 4 , 3 , 4 , 4 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level4.qml b/experimental/qt5-intro-android/samegame/content/levels/level4.qml
deleted file mode 100644
index 46ad42f..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level4.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    goalText: "5 of 10<br><br>Clear the level..."
-    startingGrid: [ 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-                    1 , 3 , 2 , 1 , 1 , 1 , 1 , 3 , 2 , 3 ,
-                    1 , 2 , 3 , 1 , 3 , 2 , 2 , 1 , 1 , 2 ,
-                    3 , 2 , 2 , 2 , 1 , 1 , 1 , 1 , 3 , 3 ,
-                    2 , 1 , 1 , 3 , 2 , 1 , 1 , 2 , 1 , 3 ,
-                    1 , 3 , 3 , 1 , 2 , 1 , 2 , 1 , 3 , 3 ,
-                    1 , 3 , 2 , 2 , 2 , 1 , 1 , 3 , 2 , 3 ,
-                    1 , 1 , 3 , 2 , 3 , 3 , 2 , 1 , 1 , 1 ,
-                    1 , 2 , 2 , 3 , 2 , 2 , 1 , 3 , 1 , 3 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level5.qml b/experimental/qt5-intro-android/samegame/content/levels/level5.qml
deleted file mode 100644
index 3716264..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level5.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    moveTarget: 4
-    goalText: "6 of 10<br><br>Clear in four or less moves..."
-    startingGrid: [ 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 ,
-                    4 , 2 , 2 , 2 , 4 , 3 , 3 , 3 , 4 , 4 ,
-                    4 , 2 , 4 , 4 , 4 , 3 , 2 , 3 , 4 , 4 ,
-                    4 , 2 , 2 , 2 , 4 , 3 , 3 , 3 , 4 , 4 ,
-                    4 , 4 , 4 , 2 , 4 , 3 , 4 , 3 , 4 , 4 ,
-                    4 , 2 , 2 , 2 , 4 , 3 , 4 , 3 , 4 , 4 ,
-                    4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 ,
-                    4 , 3 , 4 , 3 , 4 , 2 , 2 , 2 , 4 , 3 ,
-                    4 , 3 , 3 , 3 , 4 , 2 , 4 , 4 , 4 , 3 ,
-                    4 , 3 , 3 , 3 , 4 , 2 , 2 , 2 , 4 , 3 ,
-                    4 , 3 , 4 , 3 , 4 , 2 , 4 , 4 , 4 , 4 ,
-                    4 , 3 , 4 , 3 , 4 , 2 , 2 , 2 , 4 , 3 ,
-                    4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 , 4 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level6.qml b/experimental/qt5-intro-android/samegame/content/levels/level6.qml
deleted file mode 100644
index 4547b75..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level6.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    moveTarget: 20
-    timeTarget: 40
-    goalText: "7 of 10<br><br>Clear with 20 moves in 40 seconds (or better)."
-    startingGrid: [ 1 , 3 , 1 , 1 , 1 , 1 , 2 , 1 , 2 , 2 ,
-                    2 , 1 , 2 , 3 , 3 , 1 , 3 , 1 , 1 , 3 ,
-                    3 , 1 , 1 , 1 , 2 , 2 , 3 , 2 , 3 , 1 ,
-                    1 , 3 , 1 , 1 , 3 , 1 , 1 , 1 , 2 , 3 ,
-                    2 , 1 , 1 , 1 , 3 , 2 , 3 , 3 , 2 , 3 ,
-                    3 , 3 , 3 , 3 , 2 , 2 , 3 , 1 , 3 , 2 ,
-                    2 , 2 , 3 , 2 , 2 , 3 , 2 , 2 , 2 , 2 ,
-                    1 , 2 , 1 , 2 , 1 , 3 , 2 , 3 , 2 , 3 ,
-                    1 , 1 , 2 , 3 , 3 , 3 , 3 , 1 , 1 , 2 ,
-                    3 , 3 , 2 , 2 , 2 , 2 , 3 , 1 , 3 , 1 ,
-                    1 , 2 , 3 , 3 , 3 , 1 , 3 , 2 , 1 , 2 ,
-                    1 , 2 , 1 , 1 , 2 , 3 , 1 , 2 , 1 , 3 ,
-                    3 , 1 , 2 , 2 , 1 , 3 , 3 , 1 , 3 , 2 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level7.qml b/experimental/qt5-intro-android/samegame/content/levels/level7.qml
deleted file mode 100644
index 5d71d7c..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level7.qml
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    goalText: "8 of 10<br><br>Clear the grid."
-    startingGrid: [ 2 , 4 , 3 , 2 , 3 , 2 , 3 , 3 , 4 , 3 ,
-                    2 , 2 , 3 , 3 , 1 , 4 , 3 , 3 , 3 , 2 ,
-                    1 , 4 , 2 , 3 , 4 , 3 , 3 , 1 , 1 , 1 ,
-                    2 , 1 , 2 , 4 , 4 , 2 , 2 , 3 , 2 , 1 ,
-                    3 , 4 , 4 , 1 , 3 , 2 , 4 , 2 , 1 , 1 ,
-                    2 , 2 , 3 , 1 , 2 , 4 , 1 , 2 , 1 , 2 ,
-                    1 , 2 , 3 , 2 , 4 , 4 , 3 , 1 , 1 , 2 ,
-                    4 , 4 , 2 , 1 , 2 , 4 , 2 , 2 , 4 , 3 ,
-                    4 , 2 , 4 , 1 , 3 , 4 , 1 , 4 , 2 , 4 ,
-                    4 , 3 , 4 , 1 , 4 , 3 , 1 , 3 , 1 , 1 ,
-                    3 , 3 , 2 , 3 , 2 , 4 , 1 , 2 , 4 , 4 ,
-                    3 , 4 , 2 , 2 , 4 , 3 , 4 , 1 , 3 , 2 ,
-                    4 , 3 , 3 , 4 , 2 , 4 , 1 , 2 , 3 , 2 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level8.qml b/experimental/qt5-intro-android/samegame/content/levels/level8.qml
deleted file mode 100644
index 9dbb8c2..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level8.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    scoreTarget: 1000
-    goalText: "9 of 10<br><br>Score over 1000 points"
-    startingGrid: [ 1 , 4 , 4 , 3 , 2 , 1 , 4 , 2 , 4 , 2 ,
-                    2 , 3 , 4 , 4 , 1 , 1 , 1 , 4 , 4 , 4 ,
-                    1 , 3 , 1 , 2 , 2 , 1 , 2 , 1 , 4 , 2 ,
-                    4 , 3 , 4 , 2 , 1 , 4 , 1 , 2 , 2 , 3 ,
-                    3 , 4 , 2 , 4 , 4 , 3 , 2 , 2 , 2 , 1 ,
-                    4 , 4 , 3 , 2 , 4 , 4 , 2 , 1 , 1 , 1 ,
-                    1 , 2 , 1 , 3 , 4 , 1 , 1 , 3 , 2 , 3 ,
-                    3 , 4 , 2 , 2 , 1 , 3 , 2 , 2 , 4 , 2 ,
-                    2 , 4 , 1 , 2 , 2 , 4 , 3 , 3 , 3 , 1 ,
-                    1 , 2 , 2 , 4 , 1 , 2 , 2 , 3 , 3 , 3 ,
-                    4 , 4 , 1 , 4 , 3 , 1 , 3 , 3 , 3 , 4 ,
-                    1 , 2 , 4 , 1 , 2 , 1 , 1 , 4 , 2 , 1 ,
-                    1 , 2 , 3 , 4 , 2 , 4 , 4 , 2 , 1 , 3 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/levels/level9.qml b/experimental/qt5-intro-android/samegame/content/levels/level9.qml
deleted file mode 100644
index 4e8bf19..0000000
--- a/experimental/qt5-intro-android/samegame/content/levels/level9.qml
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-
-TemplateBase{
-    scoreTarget: 2000
-    timeTarget: 60
-    moveTarget: 20
-    mustClear: false
-    goalText: "10 of 10<br><br>Score 2000 in one minute with less than 20 moves!"
-    startingGrid: [ 3 , 2 , 3 , 1 , 3 , 3 , 4 , 1 , 3 , 3 ,
-                    2 , 3 , 2 , 1 , 1 , 2 , 2 , 2 , 4 , 1 ,
-                    2 , 4 , 4 , 4 , 3 , 1 , 4 , 4 , 4 , 1 ,
-                    3 , 1 , 3 , 4 , 4 , 2 , 2 , 2 , 2 , 3 ,
-                    2 , 1 , 4 , 4 , 3 , 3 , 1 , 1 , 3 , 2 ,
-                    3 , 2 , 1 , 4 , 3 , 4 , 1 , 3 , 4 , 2 ,
-                    3 , 3 , 1 , 4 , 4 , 4 , 2 , 1 , 2 , 3 ,
-                    2 , 3 , 4 , 3 , 4 , 1 , 1 , 3 , 2 , 4 ,
-                    4 , 4 , 1 , 2 , 4 , 3 , 2 , 2 , 2 , 4 ,
-                    1 , 4 , 2 , 2 , 1 , 1 , 2 , 1 , 1 , 4 ,
-                    1 , 4 , 3 , 3 , 3 , 1 , 3 , 4 , 4 , 2 ,
-                    3 , 4 , 1 , 1 , 2 , 2 , 2 , 3 , 2 , 1 ,
-                    3 , 3 , 4 , 3 , 1 , 1 , 1 , 4 , 4 , 3 ]
-}
diff --git a/experimental/qt5-intro-android/samegame/content/samegame.js b/experimental/qt5-intro-android/samegame/content/samegame.js
deleted file mode 100755
index 7b226cb..0000000
--- a/experimental/qt5-intro-android/samegame/content/samegame.js
+++ /dev/null
@@ -1,581 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/* This script file handles the game logic */
-.pragma library
-.import QtQuick.LocalStorage 2.0 as Sql
-.import "../settings.js" as Settings
-
-var maxColumn = 10;
-var maxRow = 13;
-var types = 3;
-var maxIndex = maxColumn*maxRow;
-var board = new Array(maxIndex);
-var blockSrc = "Block.qml";
-var gameDuration;
-var component = Qt.createComponent(blockSrc);
-var gameCanvas;
-var betweenTurns = false;
-
-var puzzleLevel = null;
-var puzzlePath = "";
-
-var gameMode = "arcade"; //Set in new game, then tweaks behaviour of other functions
-var gameOver = false;
-
-function changeBlock(src)
-{
-    blockSrc = src;
-    component = Qt.createComponent(blockSrc);
-}
-
-// Index function used instead of a 2D array
-function index(column, row)
-{
-    return column + row * maxColumn;
-}
-
-function timeStr(msecs)
-{
-    var secs = Math.floor(msecs/1000);
-    var m = Math.floor(secs/60);
-    var ret = "" + m + "m " + (secs%60) + "s";
-    return ret;
-}
-
-function cleanUp()
-{
-    if (gameCanvas == undefined)
-        return;
-    // Delete blocks from previous game
-    for (var i = 0; i < maxIndex; i++) {
-        if (board[i] != null)
-            board[i].destroy();
-        board[i] = null;
-    }
-    if (puzzleLevel != null){
-        puzzleLevel.destroy();
-        puzzleLevel = null;
-    }
-    gameCanvas.mode = ""
-}
-
-function startNewGame(gc, mode, map)
-{
-    gameCanvas = gc;
-    if (mode == undefined)
-        gameMode = "arcade";
-    else
-        gameMode = mode;
-    gameOver = false;
-
-    cleanUp();
-
-    gc.gameOver = false;
-    gc.mode = gameMode;
-    // Calculate board size
-    maxColumn = Math.floor(gameCanvas.width/Settings.blockSize);
-    maxRow = Math.floor(gameCanvas.height/Settings.blockSize);
-    maxIndex = maxRow * maxColumn;
-    if (gameMode == "arcade") //Needs to be after board sizing
-        getHighScore();
-
-
-    // Initialize Board
-    board = new Array(maxIndex);
-    gameCanvas.score = 0;
-    gameCanvas.score2 = 0;
-    gameCanvas.moves = 0;
-    gameCanvas.curTurn = 1;
-    if (gameMode == "puzzle")
-        loadMap(map);
-    else//Note that we load them in reverse order for correct visual stacking
-        for (var column = maxColumn - 1; column >= 0; column--)
-            for (var row = maxRow - 1; row >= 0; row--)
-                createBlock(column, row);
-    if (gameMode == "puzzle")
-        getLevelHistory();//Needs to be after map load
-    gameDuration = new Date();
-}
-
-var fillFound;  // Set after a floodFill call to the number of blocks found
-var floodBoard; // Set to 1 if the floodFill reaches off that node
-
-// NOTE: Be careful with vars named x,y, as the calling object's x,y are still in scope
-function handleClick(x,y)
-{
-    if (betweenTurns || gameOver || gameCanvas == undefined)
-        return;
-    var column = Math.floor(x/Settings.blockSize);
-    var row = Math.floor(y/Settings.blockSize);
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return;
-    if (board[index(column, row)] == null)
-        return;
-    // If it's a valid block, remove it and all connected (does nothing if it's not connected)
-    floodFill(column,row, -1);
-    if (fillFound <= 0)
-        return;
-    if (gameMode == "multiplayer" && gameCanvas.curTurn == 2)
-        gameCanvas.score2 += (fillFound - 1) * (fillFound - 1);
-    else
-        gameCanvas.score += (fillFound - 1) * (fillFound - 1);
-    if (gameMode == "multiplayer" && gameCanvas.curTurn == 2)
-        shuffleUp();
-    else
-        shuffleDown();
-    gameCanvas.moves += 1;
-    if (gameMode == "endless")
-        refill();
-    else if (gameMode != "multiplayer")
-        victoryCheck();
-    if (gameMode == "multiplayer" && !gc.gameOver){
-        betweenTurns = true;
-        gameCanvas.swapPlayers();//signal, animate and call turnChange() when ready
-    }
-}
-
-function floodFill(column,row,type)
-{
-    if (board[index(column, row)] == null)
-        return;
-    var first = false;
-    if (type == -1) {
-        first = true;
-        type = board[index(column,row)].type;
-
-        // Flood fill initialization
-        fillFound = 0;
-        floodBoard = new Array(maxIndex);
-    }
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return;
-    if (floodBoard[index(column, row)] == 1 || (!first && type != board[index(column, row)].type))
-        return;
-    floodBoard[index(column, row)] = 1;
-    floodFill(column + 1, row, type);
-    floodFill(column - 1, row, type);
-    floodFill(column, row + 1, type);
-    floodFill(column, row - 1, type);
-    if (first == true && fillFound == 0)
-        return; // Can't remove single blocks
-    board[index(column, row)].dying = true;
-    board[index(column, row)] = null;
-    fillFound += 1;
-}
-
-function shuffleDown()
-{
-    // Fall down
-    for (var column = 0; column < maxColumn; column++) {
-        var fallDist = 0;
-        for (var row = maxRow - 1; row >= 0; row--) {
-            if (board[index(column,row)] == null) {
-                fallDist += 1;
-            } else {
-                if (fallDist > 0) {
-                    var obj = board[index(column, row)];
-                    obj.y = (row + fallDist) * Settings.blockSize;
-                    board[index(column, row + fallDist)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-    // Fall to the left
-    fallDist = 0;
-    for (column = 0; column < maxColumn; column++) {
-        if (board[index(column, maxRow - 1)] == null) {
-            fallDist += 1;
-        } else {
-            if (fallDist > 0) {
-                for (row = 0; row < maxRow; row++) {
-                    obj = board[index(column, row)];
-                    if (obj == null)
-                        continue;
-                    obj.x = (column - fallDist) * Settings.blockSize;
-                    board[index(column - fallDist,row)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-}
-
-
-function shuffleUp()
-{
-    // Fall up
-    for (var column = 0; column < maxColumn; column++) {
-        var fallDist = 0;
-        for (var row = 0; row < maxRow; row++) {
-            if (board[index(column,row)] == null) {
-                fallDist += 1;
-            } else {
-                if (fallDist > 0) {
-                    var obj = board[index(column, row)];
-                    obj.y = (row - fallDist) * Settings.blockSize;
-                    board[index(column, row - fallDist)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-    // Fall to the left (or should it be right, so as to be left for P2?)
-    fallDist = 0;
-    for (column = 0; column < maxColumn; column++) {
-        if (board[index(column, 0)] == null) {
-            fallDist += 1;
-        } else {
-            if (fallDist > 0) {
-                for (row = 0; row < maxRow; row++) {
-                    obj = board[index(column, row)];
-                    if (obj == null)
-                        continue;
-                    obj.x = (column - fallDist) * Settings.blockSize;
-                    board[index(column - fallDist,row)] = obj;
-                    board[index(column, row)] = null;
-                }
-            }
-        }
-    }
-}
-
-function turnChange()//called by ui outside
-{
-    betweenTurns = false;
-    if (gameCanvas.curTurn == 1){
-        shuffleUp();
-        gameCanvas.curTurn = 2;
-        victoryCheck();
-    }else{
-        shuffleDown();
-        gameCanvas.curTurn = 1;
-        victoryCheck();
-    }
-}
-
-function refill()
-{
-    for (var column = 0; column < maxColumn; column++) {
-        for (var row = 0; row < maxRow; row++) {
-            if (board[index(column, row)] == null)
-                createBlock(column, row);
-        }
-    }
-}
-
-function victoryCheck()
-{
-    // Awards bonuses for no blocks left
-    var deservesBonus = true;
-    if (board[index(0,maxRow - 1)] != null || board[index(0,0)] != null)
-        deservesBonus = false;
-    // Checks for game over
-    if (deservesBonus){
-        if (gameCanvas.curTurn = 1)
-            gameCanvas.score += 1000;
-        else
-            gameCanvas.score2 += 1000;
-    }
-    gameOver = deservesBonus;
-    if (gameCanvas.curTurn == 1){
-        if (!(floodMoveCheck(0, maxRow - 1, -1)))
-            gameOver = true;
-    }else{
-        if (!(floodMoveCheck(0, 0, -1, true)))
-            gameOver = true;
-    }
-    if (gameMode == "puzzle"){
-        puzzleVictoryCheck(deservesBonus);//Takes it from here
-        return;
-    }
-    if (gameOver) {
-        var winnerScore = Math.max(gameCanvas.score, gameCanvas.score2);
-        if (gameMode == "multiplayer"){
-            gameCanvas.score = winnerScore;
-            saveHighScore(gameCanvas.score2);
-        }
-        saveHighScore(gameCanvas.score);
-        gameDuration = new Date() - gameDuration;
-        gameCanvas.gameOver = true;
-    }
-}
-
-// Only floods up and right, to see if it can find adjacent same-typed blocks
-function floodMoveCheck(column, row, type, goDownInstead)
-{
-    if (column >= maxColumn || column < 0 || row >= maxRow || row < 0)
-        return false;
-    if (board[index(column, row)] == null)
-        return false;
-    var myType = board[index(column, row)].type;
-    if (type == myType)
-        return true;
-    if (goDownInstead)
-        return floodMoveCheck(column + 1, row, myType, goDownInstead) ||
-               floodMoveCheck(column, row + 1, myType, goDownInstead);
-    else
-        return floodMoveCheck(column + 1, row, myType) ||
-               floodMoveCheck(column, row - 1, myType);
-}
-
-function createBlock(column,row,type)
-{
-    // Note that we don't wait for the component to become ready. This will
-    // only work if the block QML is a local file. Otherwise the component will
-    // not be ready immediately. There is a statusChanged signal on the
-    // component you could use if you want to wait to load remote files.
-    if (component.status == 1){
-        if (type == undefined)
-            type = Math.floor(Math.random() * types);
-        if (type < 0 || type > 4) {
-            console.log("Invalid type requested");//TODO: Is this triggered by custom levels much?
-            return;
-        }
-        var dynamicObject = component.createObject(gameCanvas,
-                {"type": type,
-                "x": column*Settings.blockSize,
-                "y": -1*Settings.blockSize,
-                "width": Settings.blockSize,
-                "height": Settings.blockSize,
-                "particleSystem": gameCanvas.ps});
-        if (dynamicObject == null){
-            console.log("error creating block");
-            console.log(component.errorString());
-            return false;
-        }
-        dynamicObject.y = row*Settings.blockSize;
-        dynamicObject.spawned = true;
-
-        board[index(column,row)] = dynamicObject;
-    }else{
-        console.log("error loading block component");
-        console.log(component.errorString());
-        return false;
-    }
-    return true;
-}
-
-function showPuzzleError(str)
-{
-    //TODO: Nice user visible UI?
-    console.log(str);
-}
-
-function loadMap(map)
-{
-    puzzlePath = map;
-    var levelComp = Qt.createComponent(puzzlePath);
-    if (levelComp.status != 1){
-        console.log("Error loading level");
-        showPuzzleError(levelComp.errorString());
-        return;
-    }
-    puzzleLevel = levelComp.createObject();
-    if (puzzleLevel == null || !puzzleLevel.startingGrid instanceof Array) {
-        showPuzzleError("Bugger!");
-        return;
-    }
-    gameCanvas.showPuzzleGoal(puzzleLevel.goalText);
-    //showPuzzleGoal should call finishLoadingMap as the next thing it does, before handling more events
-}
-
-function finishLoadingMap()
-{
-    for (var i in puzzleLevel.startingGrid)
-        if (! (puzzleLevel.startingGrid[i] >= 0 && puzzleLevel.startingGrid[i] <= 9) )
-            puzzleLevel.startingGrid[i] = 0;
-    //TODO: Don't allow loading larger levels, leads to cheating
-    while (puzzleLevel.startingGrid.length > maxIndex) puzzleLevel.startingGrid.shift();
-    while (puzzleLevel.startingGrid.length < maxIndex) puzzleLevel.startingGrid.unshift(0);
-    for (var i in puzzleLevel.startingGrid)
-        if (puzzleLevel.startingGrid[i] > 0)
-            createBlock(i % maxColumn, Math.floor(i / maxColumn), puzzleLevel.startingGrid[i] - 1);
-
-    //### Experimental feature - allow levels to contain arbitrary QML scenes as well!
-    //while (puzzleLevel.children.length)
-    //    puzzleLevel.children[0].parent = gameCanvas;
-    gameDuration = new Date(); //Don't start until we finish loading
-}
-
-function puzzleVictoryCheck(clearedAll)//gameOver has also been set if no more moves
-{
-    var won = true;
-    var soFar = new Date() - gameDuration;
-    if (puzzleLevel.scoreTarget != -1 && gameCanvas.score < puzzleLevel.scoreTarget){
-        won = false;
-    } if (puzzleLevel.scoreTarget != -1 && gameCanvas.score >= puzzleLevel.scoreTarget && !puzzleLevel.mustClear){
-        gameOver = true;
-    } if (puzzleLevel.timeTarget != -1 && soFar/1000.0 > puzzleLevel.timeTarget){
-        gameOver = true;
-    } if (puzzleLevel.moveTarget != -1 && gameCanvas.moves >= puzzleLevel.moveTarget){
-        gameOver = true;
-    } if (puzzleLevel.mustClear && gameOver && !clearedAll) {
-        won = false;
-    }
-
-    if (gameOver) {
-        gameCanvas.gameOver = true;
-        gameCanvas.showPuzzleEnd(won);
-
-        if (won) {
-            // Store progress
-            saveLevelHistory();
-        }
-    }
-}
-
-function getHighScore()
-{
-    var db = Sql.LocalStorage.openDatabaseSync(
-        "SameGame",
-        "2.0",
-        "SameGame Local Data",
-        100
-    );
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(game TEXT, score NUMBER, gridSize TEXT, time NUMBER)');
-            // Only show results for the current grid size
-            var rs = tx.executeSql('SELECT * FROM Scores WHERE gridSize = "'
-                + maxColumn + "x" + maxRow + '" AND game = "' + gameMode + '" ORDER BY score desc');
-            if (rs.rows.length > 0)
-                gameCanvas.highScore = rs.rows.item(0).score;
-            else
-                gameCanvas.highScore = 0;
-        }
-    );
-}
-
-function saveHighScore(score)
-{
-    // Offline storage
-    var db = Sql.LocalStorage.openDatabaseSync(
-        "SameGame",
-        "2.0",
-        "SameGame Local Data",
-        100
-    );
-    var dataStr = "INSERT INTO Scores VALUES(?, ?, ?, ?)";
-    var data = [
-        gameMode,
-        score,
-        maxColumn + "x" + maxRow,
-        Math.floor(gameDuration / 1000)
-    ];
-    if (score >= gameCanvas.highScore)//Update UI field
-        gameCanvas.highScore = score;
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Scores(game TEXT, score NUMBER, gridSize TEXT, time NUMBER)');
-            tx.executeSql(dataStr, data);
-        }
-    );
-}
-
-function getLevelHistory()
-{
-    var db = Sql.LocalStorage.openDatabaseSync(
-        "SameGame",
-        "2.0",
-        "SameGame Local Data",
-        100
-    );
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Puzzle(level TEXT, score NUMBER, moves NUMBER, time NUMBER)');
-            var rs = tx.executeSql('SELECT * FROM Puzzle WHERE level = "' + puzzlePath + '" ORDER BY score desc');
-            if (rs.rows.length > 0) {
-                gameCanvas.puzzleWon = true;
-                gameCanvas.highScore = rs.rows.item(0).score;
-            } else {
-                gameCanvas.puzzleWon = false;
-                gameCanvas.highScore = 0;
-            }
-        }
-    );
-}
-
-function saveLevelHistory()
-{
-    var db = Sql.LocalStorage.openDatabaseSync(
-        "SameGame",
-        "2.0",
-        "SameGame Local Data",
-        100
-    );
-    var dataStr = "INSERT INTO Puzzle VALUES(?, ?, ?, ?)";
-    var data = [
-        puzzlePath,
-        gameCanvas.score,
-        gameCanvas.moves,
-        Math.floor(gameDuration / 1000)
-    ];
-    gameCanvas.puzzleWon = true;
-
-    db.transaction(
-        function(tx) {
-            tx.executeSql('CREATE TABLE IF NOT EXISTS Puzzle(level TEXT, score NUMBER, moves NUMBER, time NUMBER)');
-            tx.executeSql(dataStr, data);
-        }
-    );
-}
-
-function nuke() //For "Debug mode"
-{
-    for (var row = 1; row <= 5; row++) {
-        for (var col = 0; col < 5; col++) {
-            if (board[index(col, maxRow - row)] != null) {
-                board[index(col, maxRow - row)].dying = true;
-                board[index(col, maxRow - row)] = null;
-            }
-        }
-    }
-    if (gameMode == "multiplayer" && gameCanvas.curTurn == 2)
-        shuffleUp();
-    else
-        shuffleDown();
-    if (gameMode == "endless")
-        refill();
-    else
-        victoryCheck();
-}
diff --git a/experimental/qt5-intro-android/samegame/settings.js b/experimental/qt5-intro-android/samegame/settings.js
deleted file mode 100644
index e09dee9..0000000
--- a/experimental/qt5-intro-android/samegame/settings.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Research In Motion
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-.pragma library
-
-//This should be switched over once a proper QML settings API exists
-
-var menuDelay = 500
-
-var headerHeight = 20 // 70 on BB10
-var footerHeight = 44 // 100 on BB10
-
-var fontPixelSize = 14 // 55 on BB10
-
-var blockSize = 32 // 64 on BB10
-
-var toolButtonHeight = 32 // 64 on BB10
-
-var menuButtonSpacing = 0 // 15 on BB10