Merge branch 'stable' into release

* stable: (50 commits)
  Fix deployment of QML import plugins when building in Qt Creator
  Add QtWidgets dependecy to shared.pri
  Update title and description for Text Input demo
  Update content for About Boot to Qt demo
  Fix QML GroupBox: Binding loop detected for property
  [controls-touch] Deploy images
  Remove Sensors demo from the Qt Creator's list of examples
  Remove Sensor Explorer and Particles demos from launcher
  Fix layout issues with Qt-Everywhere (touchgallery)
  [qt5-launchpresentation] Don't crop the description text on nexus
  [launcher settings] improve visual appearance
  [qt5-everywhere] update preview image
  Fix vkb import path
  Fix issues in qt5-launcher presentation
  Remove Raspberry Pi logo from demo
  Fix Canvas2D error
  Qt5-Everywhere: show network error message
  fix glsl syntax in graphical effects demo
  Update copyright year
  Limit camera & mediaplayer demos to working devices
  ...

Change-Id: I1ed9233a89ea989013b398c8480e1932949fff19

1167 files changed, 26203 insertions, 18201 deletions

diff --git a/basicsuite/About Boot to Qt/AboutBoot2Qt.qml b/basicsuite/About Boot to Qt/AboutBoot2Qt.qml
deleted file mode 100644
index 66346c1..0000000
--- a/basicsuite/About Boot to Qt/AboutBoot2Qt.qml
+++ /dev/null
@@ -1,61 +0,0 @@
-import QtQuick 2.0
-
-Column {
-
-    id: root
-
-    width: parent.width
-
-    spacing: engine.smallFontSize()
-
-    Title {
-        id: title
-        text: "Boot to Qt"
-    }
-
-    ContentText {
-        id: brief
-        width: parent.width
-        text: '<p align="justify">Boot to Qt is the working name for a light-weight UI stack for embedded linux,
-               based on the Qt Framework by Digia. Boot to Qt places Qt on top of an Android
-               kernel/baselayer and offers an elegant means of developing beautiful and
-               performant embedded devices.
-
-               <p align="justify">Boot to Qt is a commercial-only SDK offering which includes a ready-made stack
-               with full Qt Creator integration. The SDK allows building and running on device
-               with just a button. Embedded development has never been this easy!'
-    }
-
-    Column {
-        id: diagram
-        spacing: 1
-        width: parent.width * 0.5
-        anchors.horizontalCenter: parent.horizontalCenter
-        Box { text: "Application"; accentColor: "coral" }
-        Box { text: "Qt Framework"; accentColor: Qt.rgba(0.64, 0.82, 0.15) }
-        Box { text: "Android Baselayer"; accentColor: "steelblue" }
-        Box { text: "Embedded Hardware"; accentColor: "steelblue"}
-    }
-
-    ContentText {
-        id: description
-
-        width: parent.width
-
-        text: '<p align="justify">Boot to Qt runs on top of Android 4.0 based kernels and has been tested and verified on
-               a number of different hardware configurations, including:
-               <ul>
-                 <li>Google Nexus 7 - NVIDIA Tegra3 Quad Core, 1 GB RAM</li>
-                 <li>Beagle Board xM - ARM Coretex A8 1GHz, 512 MB RAM, PowerVR SGX 530</li>
-                 <li>Freescale i.MX 6 - ARM Cortex A9 1.2GHz, 1 GB RAM, Vivante GC2000</li>
-               </ul>
-               Rough minimal requirements for running Boot to Qt are:
-               <ul>
-                 <li>256Mb of RAM</li>
-                 <li>500Mhz CPU, 1Ghz preferred for 60 FPS velvet UIs</li>
-                 <li>OpenGL ES 2.0 support</li>
-                 <li>Android 4.0+ compatible hardware</li>
-               </ul>
-              '
-    }
-}
diff --git a/basicsuite/About Boot to Qt/Box.qml b/basicsuite/About Boot to Qt/Box.qml
deleted file mode 100644
index cfbb995..0000000
--- a/basicsuite/About Boot to Qt/Box.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-
-    width: parent.width
-    height: label.font.pixelSize * 3
-
-    radius: 4
-
-    antialiasing: true
-
-    property alias text: label.text;
-
-    property color accentColor: "palegreen"
-
-    gradient: Gradient {
-        GradientStop { position: 0; color: root.accentColor; }
-        GradientStop { position: 1; color: "black"; }
-    }
-
-    Text {
-        id: label
-        font.pixelSize: engine.smallFontSize()
-        font.bold: true;
-        color: "white"
-        anchors.centerIn: parent
-    }
-
-}
diff --git a/basicsuite/About Boot to Qt/ContentText.qml b/basicsuite/About Boot to Qt/ContentText.qml
deleted file mode 100644
index ed95064..0000000
--- a/basicsuite/About Boot to Qt/ContentText.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-Text {
-    color: "white"
-    font.pixelSize: engine.smallFontSize()
-    textFormat: Text.RichText
-    wrapMode: Text.WordWrap
-}
diff --git a/basicsuite/About Boot to Qt/QtForAndroid.qml b/basicsuite/About Boot to Qt/QtForAndroid.qml
deleted file mode 100644
index 2eac080..0000000
--- a/basicsuite/About Boot to Qt/QtForAndroid.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import QtQuick 2.0
-
-Column {
-    id: root
-
-    width: parent.width
-
-    spacing: engine.smallFontSize()
-
-    Title {
-        text: "Boot2Qt vs Qt for Android"
-    }
-
-    ContentText {
-        width: parent.width
-        text: '<p align="justify">Qt for Android is a port of the Qt Framework to be used
-               for application development on the Android platform. Its
-               purpose is to enable development of applications that
-               can run on Android devices. For developers writing applications
-               for the Android ecosystem, Qt for Android is the right choice.
-
-               <p align="justify">Boot2Qt tries to strip down the Android stack to the bare minimum,
-               relying only on basic Linux features. The majority of the Android stack,
-               such as <i>SurfaceFlinger</i> or <i>DalvikVM</i> is not running in
-               Boot2Qt, resulting in faster startup times, lower memory consumption
-               and overall better performance.
-               '
-    }
-
-    Column {
-        id: diagram
-        spacing: 1
-        width: parent.width * 0.66
-        anchors.horizontalCenter: parent.horizontalCenter
-        Box { text: "Application"; accentColor: "coral" }
-        Box { text: "Qt for Android"; accentColor: Qt.rgba(0.64, 0.82, 0.15) }
-        Row {
-            width: parent.width
-            height: b.height
-            Box { id: b; width: parent.width / 2; text: "Qt Framework"; accentColor: Qt.rgba(0.64, 0.82, 0.15) }
-            Box { width: parent.width / 2; text: "Android (Dalvik)"; accentColor: "steelblue" }
-        }
-
-        Box { text: "Android Baselayer"; accentColor: "steelblue" }
-        Box { text: "Embedded Hardware"; accentColor: "steelblue"}
-    }
-
-}
diff --git a/basicsuite/About Boot to Qt/QtFramework.qml b/basicsuite/About Boot to Qt/QtFramework.qml
deleted file mode 100644
index 3cb2f10..0000000
--- a/basicsuite/About Boot to Qt/QtFramework.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import QtQuick 2.0
-
-Column {
-    id: root
-
-    width: parent.width
-
-    spacing: engine.smallFontSize()
-
-    Title {
-        text: "Qt Framework"
-    }
-
-    ContentText {
-        id: brief
-        width: parent.width
-        text: '<p align="justify">Qt is a full development framework with tools designed to streamline
-               the creation of applications and user interfaces for desktop, embedded
-               and mobile platforms.
-               <ul>
-                <li><b>Qt Framework</b> - intuitive APIs for C++ and CSS/JavaScript-like
-                    programming with Qt Quick for rapid UI creation<\li>
-                <li><b>Qt Creator IDE</b> - powerful cross-platform integrated
-                    development environment, including UI designer tools and on-device debugging</li>
-                <li><b>Tools and toolchains</b> - internationalization support, embedded toolchains
-                    and more.</li>
-               </ul>
-               <p align="justify">With Qt, you can reuse code efficiently to target multiple platforms
-               with one code base. The modular C++ class library and developer tools
-               easily enables developers to create applications for one platform and
-               easily build and run to deploy on another platform.'
-    }
-
-
-}
diff --git a/basicsuite/About Boot to Qt/Title.qml b/basicsuite/About Boot to Qt/Title.qml
deleted file mode 100644
index 8fb13cc..0000000
--- a/basicsuite/About Boot to Qt/Title.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-Text {
-    font.pixelSize: engine.titleFontSize()
-    font.italic: true
-    color: "white"
-    anchors.horizontalCenter: parent.horizontalCenter
-}
diff --git a/basicsuite/About Boot to Qt/description.txt b/basicsuite/About Boot to Qt/description.txt
deleted file mode 100644
index f546387..0000000
--- a/basicsuite/About Boot to Qt/description.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The "About Boot to Qt" 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 from the more traditional Qt editions.
diff --git a/basicsuite/About Boot to Qt/main.qml b/basicsuite/About Boot to Qt/main.qml
deleted file mode 100644
index 6586811..0000000
--- a/basicsuite/About Boot to Qt/main.qml
+++ /dev/null
@@ -1,135 +0,0 @@
-import QtQuick 2.0
-import QtQuick.Particles 2.0
-
-Item {
-    id: root
-
-    width: 1280
-    height: 800
-
-//    Rectangle {
-//        anchors.fill: parent
-//        color: "black"
-//    }
-
-    Flickable {
-        id: flick
-        property real inertia: 0.4
-
-        property real cellWidth;
-        property real cellHeight;
-
-        width: parent.width
-        height: parent.height
-        anchors.horizontalCenter: parent.horizontalCenter
-
-        contentHeight: content.height
-
-        flickableDirection: Flickable.VerticalFlick
-
-        property real topOvershoot: Math.max(0, contentItem.y);
-        property real bottomOvershoot: Math.max(0, root.height - (contentItem.height + contentItem.y));
-//        onTopOvershootChanged: print("Top Overshoot:", topOvershoot);
-//        onBottomOvershootChanged: print("Bottom Overshoot:", bottomOvershoot);
-
-        Item {
-            id: shiftTrickery
-
-            width: flick.width
-            height: content.height
-
-            Column {
-                id: content;
-
-                y: -flick.contentItem.y + offsetY;
-                width: flick.width * 2 / 3
-                anchors.horizontalCenter: parent.horizontalCenter
-
-                property real offsetY: 0;
-                property real inertia: flick.inertia;
-                property real t;
-                NumberAnimation on t {
-                    id: animation;
-                    from: 0;
-                    to: 1;
-                    duration: 1000;
-                    loops: Animation.Infinite
-                    running: Math.abs(content.y) > 0.001 || Math.abs(content.x) > 0.001
-                }
-
-                onTChanged: {
-                    offsetY += (flick.contentItem.y - offsetY) * inertia
-                }
-
-
-                spacing: engine.smallFontSize() * 2
-
-                Item { width: 1; height: engine.smallFontSize() }
-                AboutBoot2Qt { }
-                QtFramework { }
-                QtForAndroid { }
-                Image {
-                    id: codeLessImage
-                    source: "codeless.png"
-                    anchors.horizontalCenter: parent.horizontalCenter
-                }
-                Item { width: 1; height: engine.smallFontSize() }
-            }
-
-        }
-    }
-
-    ParticleSystem {
-
-        anchors.fill: parent
-
-        ImageParticle {
-            id: imageParticle
-            source: "particle.png"
-            color: "#80c342"
-            alpha: 0
-            colorVariation: 0.3
-            entryEffect: ImageParticle.None
-        }
-
-        Emitter {
-            id: topEmitter
-            width: root.width
-            height: 1
-            x: 0
-            y: -1
-            shape: EllipseShape { fill: true }
-
-            emitRate: 300
-            lifeSpan: 1000
-            size: 20
-            sizeVariation: 4
-            endSize: 0
-
-            enabled: flick.topOvershoot > 0
-
-            velocity: PointDirection { xVariation: 10; yVariation: 50; y: Math.sqrt(flick.topOvershoot) * 10; }
-            acceleration: PointDirection { y: 50 }
-        }
-
-        Emitter {
-            id: bottomEmitter
-            width: root.width
-            height: 1
-            x: 0
-            y: root.height + 1
-            shape: EllipseShape { fill: true }
-
-            emitRate: 300
-            lifeSpan: 1000
-            size: 20
-            sizeVariation: 4
-            endSize: 0
-
-            enabled: flick.bottomOvershoot > 0
-
-            velocity: PointDirection { xVariation: 10; yVariation: -50; y: Math.sqrt(flick.bottomOvershoot) * -10; }
-            acceleration: PointDirection { y: -50 }
-        }
-    }
-}
diff --git a/basicsuite/Camera/Camera.pro b/basicsuite/Camera/Camera.pro
deleted file mode 100644
index d8e46c6..0000000
--- a/basicsuite/Camera/Camera.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += \
-    camerautils
-
diff --git a/basicsuite/Camera/CameraControlButton.qml b/basicsuite/Camera/CameraControlButton.qml
deleted file mode 100644
index dc82435..0000000
--- a/basicsuite/Camera/CameraControlButton.qml
+++ /dev/null
@@ -1,54 +0,0 @@
-import QtQuick 2.0
-
-MouseArea {
-    id: buttonRoot
-    property alias title: titleTxt.text
-    property alias subtitle: valueTxt.text
-    property bool toggled: false
-
-    width: 78 * root.contentScale
-    height: 78 * root.contentScale
-    opacity: pressed ? 0.3 : 1.0
-    rotation: root.contentRotation
-    Behavior on rotation { NumberAnimation { } }
-
-    Rectangle {
-        anchors.fill: parent
-        color: toggled ? "#8898c66c" : "#77333333"
-        radius: 5 * root.contentScale
-    }
-
-    Column {
-        id: expModeControls
-        spacing: 2 * root.contentScale
-        anchors.centerIn: parent
-
-        Text {
-            id: titleTxt
-            anchors.horizontalCenter: expModeControls.horizontalCenter
-            font.pixelSize: 22 * root.contentScale
-            font.letterSpacing: -1
-            color: "white"
-            font.bold: true
-        }
-
-        Text {
-            id: valueTxt
-            anchors.horizontalCenter: expModeControls.horizontalCenter
-            height: 22 * root.contentScale
-            verticalAlignment: Text.AlignVCenter
-            color: "white"
-
-            Connections {
-                target: root
-                onContentScaleChanged: valueTxt.font.pixelSize = Math.round(18 * root.contentScale)
-            }
-
-            onTextChanged: font.pixelSize = Math.round(18 * root.contentScale)
-            onPaintedWidthChanged: {
-                if (paintedWidth > buttonRoot.width - (8 * root.contentScale))
-                    font.pixelSize -= Math.round(2 * root.contentScale);
-            }
-        }
-    }
-}
diff --git a/basicsuite/Camera/CameraSetting.qml b/basicsuite/Camera/CameraSetting.qml
deleted file mode 100644
index 224c70c..0000000
--- a/basicsuite/Camera/CameraSetting.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    width: button.width
-    height: button.height
-    visible: enabled && picker.count > 1
-
-    property alias title: button.title
-    property alias selectedValue: picker.value
-    property alias currentIndex: picker.currentIndex
-    property alias model: picker.model
-    property alias count: picker.count
-
-    CameraControlButton {
-        id: button
-        anchors.centerIn: parent
-
-        subtitle: picker.name
-        toggled: picker.visible
-
-        onClicked: picker.visible = true
-    }
-
-    Picker {
-        id: picker
-    }
-
-}
diff --git a/basicsuite/Camera/CaptureControl.qml b/basicsuite/Camera/CaptureControl.qml
deleted file mode 100644
index b8180f9..0000000
--- a/basicsuite/Camera/CaptureControl.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-Rectangle {
-    id: controlRoot
-
-    signal clicked
-
-    property bool videoMode: camera.captureMode === Camera.CaptureVideo
-
-    width: 180 * root.contentScale
-    height: width
-    radius: width / 2
-    color: mouser.pressed ? (controlRoot.videoMode ? "#77fa334f" : "#7798c66c") : "#77333333"
-    visible: enabled
-
-    Rectangle {
-        id: center
-        anchors.centerIn: parent
-        width: parent.width * 0.45
-        height: width
-        radius: width / 2
-        opacity: mouser.pressed ? 0.7 : 1
-        color: controlRoot.videoMode ? "#fa334f" : "#98c66c"
-    }
-
-    Rectangle {
-        anchors.centerIn: parent
-        color: "white"
-        visible: camera.videoRecorder.recorderStatus === CameraRecorder.RecordingStatus
-        width: center.width * 0.3
-        height: width
-    }
-
-    MouseArea {
-        id: mouser
-        anchors.fill: parent
-        onClicked: controlRoot.clicked()
-    }
-}
diff --git a/basicsuite/Camera/CapturePreview.qml b/basicsuite/Camera/CapturePreview.qml
deleted file mode 100644
index 611fa53..0000000
--- a/basicsuite/Camera/CapturePreview.qml
+++ /dev/null
@@ -1,45 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    anchors.fill: parent
-    color: "black"
-    opacity: 0
-    enabled: opacity !== 0
-
-    property string previewSrc: ""
-
-    onOpacityChanged: {
-        if (opacity === 1 && previewSrc !== "") {
-            previewImage.source = previewSrc;
-            previewSrc = "";
-        }
-    }
-
-    Behavior on opacity { NumberAnimation { duration: 100 } }
-
-    function show() {
-        previewImage.source = "";
-        opacity = 1;
-    }
-
-    function setPreview(preview) {
-        if (root.opacity === 1)
-            previewImage.source = preview;
-        else
-            root.previewSrc = preview;
-    }
-
-    Image {
-        id: previewImage
-        anchors.fill: parent
-        fillMode: Image.PreserveAspectFit
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: {
-            root.opacity = 0;
-        }
-    }
-}
diff --git a/basicsuite/Camera/Controls.qml b/basicsuite/Camera/Controls.qml
deleted file mode 100644
index 63f750b..0000000
--- a/basicsuite/Camera/Controls.qml
+++ /dev/null
@@ -1,159 +0,0 @@
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-Item {
-    id: controlsRoot
-    anchors.fill: parent
-
-    property alias cameraMode: cameraModeControl.selectedValue
-
-    property alias requestedZoom: zoomControl.requestedZoom
-    property alias actualZoom: zoomControl.actualZoom
-    property alias maximumZoom: zoomControl.maximumZoom
-
-    property alias flashMode: flashControl.selectedValue
-    property alias focusMode: focusModeControl.selectedValue
-    property alias exposureMode: expModeControl.selectedValue
-    property alias exposureCompensation: expCompControl.selectedValue
-    property alias whiteBalanceMode: wbControl.selectedValue
-    property alias resolution: resControl.selectedValue
-
-    property bool captureReady: false
-
-    signal capture
-    signal searchAndLock
-
-    FocusControl {
-        id: focusControl
-        anchors.fill: parent
-        onSearchAndLock: controlsRoot.searchAndLock()
-        enabled: camera.captureMode === Camera.CaptureStillImage
-    }
-
-    ZoomControl {
-        id: zoomControl
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 50
-    }
-
-    CameraSetting {
-        id: cameraModeControl
-        anchors.right: parent.right
-        anchors.rightMargin: 20
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 20
-        title: "MODE"
-        model: ListModel {
-            ListElement {
-                name: "Picture"
-                value: Camera.CaptureStillImage
-            }
-            ListElement {
-                name: "Video"
-                value: Camera.CaptureVideo
-            }
-        }
-        onCountChanged: currentIndex = 0
-        enabled: controlsRoot.captureReady
-    }
-
-    RecordingTime {
-        anchors.right: parent.right
-        anchors.rightMargin: 40
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 60 * root.contentScale
-        visible: camera.videoRecorder.recorderStatus === CameraRecorder.RecordingStatus
-    }
-
-    Row {
-        anchors.left: parent.left
-        anchors.leftMargin: 20
-        anchors.top: parent.top
-        anchors.topMargin: 20
-        height: 84
-        spacing: 20
-
-        CameraSetting {
-            id: flashControl
-            title: "FLASH"
-            model: cameraUtils.supportedFlashModes
-        }
-
-        CameraSetting {
-            id: focusModeControl
-            title: "FOCUS"
-            model: cameraUtils.supportedFocusModes
-            enabled: camera.captureMode === Camera.CaptureStillImage
-        }
-
-        CameraSetting {
-            id: expModeControl
-            title: "SCENE"
-            model: cameraUtils.supportedSceneModes
-        }
-
-        CameraSetting {
-            id: expCompControl
-            title: "EV"
-            model: ListModel {
-                ListElement {
-                    name: "+2"
-                    value: 2
-                }
-                ListElement {
-                    name: "+1"
-                    value: 1
-                }
-                ListElement {
-                    name: "0"
-                    value: 0
-                }
-                ListElement {
-                    name: "-1"
-                    value: -1
-                }
-                ListElement {
-                    name: "-2"
-                    value: -2
-                }
-            }
-        }
-
-        CameraSetting {
-            id: wbControl
-            title: "WB"
-            model: cameraUtils.supportedWhiteBalanceModes
-        }
-
-        CameraSetting {
-            id: resControl
-            title: "SIZE"
-            model: cameraUtils.supportedCaptureResolutions
-//            onCountChanged: currentIndex = 1
-
-            Component.onCompleted: currentIndex = 1
-
-            Connections {
-                target: camera
-                onCaptureModeChanged: {
-                    if (camera.captureMode === Camera.CaptureStillImage) {
-                        resControl.model = cameraUtils.supportedCaptureResolutions;
-                    } else {
-                        resControl.model = cameraUtils.supportedVideoResolutions;
-                    }
-                }
-            }
-        }
-    }
-
-    CaptureControl {
-        id: captureControl
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.right: parent.right
-        anchors.rightMargin: -30
-        enabled: controlsRoot.captureReady || camera.videoRecorder.recorderStatus === CameraRecorder.RecordingStatus
-
-        onClicked: controlsRoot.capture()
-    }
-}
diff --git a/basicsuite/Camera/FocusControl.qml b/basicsuite/Camera/FocusControl.qml
deleted file mode 100644
index f9b2f29..0000000
--- a/basicsuite/Camera/FocusControl.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-MouseArea {
-    id: focusRoot
-
-    signal searchAndLock
-
-    onClicked: {
-        camera.focus.focusPointMode = Camera.FocusPointCustom
-        camera.focus.customFocusPoint = viewfinder.mapPointToSourceNormalized(Qt.point(mouse.x, mouse.y))
-        focusRoot.searchAndLock()
-    }
-
-    Item {
-        id: zones
-        anchors.fill: parent
-
-        property color focusAreaColor
-        property real focusAreaScale: 1
-
-        Repeater {
-            model: camera.focus.focusZones
-
-            Rectangle {
-                border {
-                    width: Math.round(2 * root.contentScale)
-                    color: zones.focusAreaColor
-                }
-                radius: 8 * root.contentScale
-                color: "transparent"
-                scale: zones.focusAreaScale
-
-                // Map from the relative, normalized frame coordinates
-                property rect mappedRect: viewfinder.mapNormalizedRectToItem(area);
-
-                Connections {
-                    target: viewfinder
-                    onContentRectChanged: {
-                        mappedRect = viewfinder.mapNormalizedRectToItem(area);
-                    }
-                }
-
-                x: mappedRect.x - (width - mappedRect.width) / 2
-                y: mappedRect.y - (height - mappedRect.height) / 2
-                width: Math.round(120 * root.contentScale)
-                height: width
-
-                Rectangle {
-                    anchors.fill: parent
-                    anchors.margins: -1.5
-                    color: "transparent"
-                    border.width: 1
-                    border.color: "black"
-                    radius: parent.radius + 2
-                }
-
-                Rectangle {
-                    anchors.fill: parent
-                    anchors.margins: 1 + parent.border.width / 2 + 0.5
-                    color: "transparent"
-                    border.width: 1
-                    border.color: "black"
-                    radius: parent.radius - 3
-                }
-            }
-        }
-
-        states: [
-            State {
-                name: "unlocked"; when: camera.lockStatus === Camera.Unlocked
-                PropertyChanges { target: zones; opacity: 0; focusAreaColor: "red" }
-            },
-            State {
-                name: "searching"; when: camera.lockStatus === Camera.Searching
-                PropertyChanges { target: zones; opacity: 1; focusAreaColor: "white" }
-            },
-            State {
-                name: "locked"; when: camera.lockStatus === Camera.Locked
-                PropertyChanges { target: zones; opacity: 0; focusAreaColor: "green" }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                to: "searching"
-                NumberAnimation { properties: "opacity"; duration: 60 }
-                SequentialAnimation {
-                    NumberAnimation {
-                        target: zones; property: "focusAreaScale"; from: 1; to: 1.3; duration: 150
-                    }
-                    PauseAnimation { duration: 20 }
-                    NumberAnimation {
-                        target: zones; property: "focusAreaScale"; easing.period: 1; easing.amplitude: 1.4
-                        easing.type: Easing.OutElastic; from: 1.3; to: 1
-                        duration: 450
-                    }
-                }
-            },
-            Transition {
-                from: "searching"
-                SequentialAnimation {
-                    PauseAnimation { duration: 1500 }
-                    NumberAnimation { properties: "opacity"; duration: 60 }
-                }
-            }
-
-        ]
-    }
-
-}
diff --git a/basicsuite/Camera/Picker.qml b/basicsuite/Camera/Picker.qml
deleted file mode 100644
index 364fed7..0000000
--- a/basicsuite/Camera/Picker.qml
+++ /dev/null
@@ -1,89 +0,0 @@
-import QtQuick 2.0
-
-MouseArea {
-    id: pickerRoot
-
-    parent: root
-    anchors.fill: parent
-
-    onClicked: visible = false
-    visible: false
-
-    property alias contentWidth: back.width
-    property real contentHeight: 350 * root.contentScale
-    property alias model: list.model
-    property variant value: null
-    property string name: ""
-    property alias currentIndex: list.currentIndex
-    property alias count: list.count
-
-    onValueChanged: {
-        for (var i = 0; i < list.count; ++i) {
-            var data = list.model[i];
-            if (data === undefined)
-                data = list.model.get(i);
-            if (data.value === pickerRoot.value) {
-                list.currentIndex = i;
-                return;
-            }
-        }
-        list.currentIndex = -1;
-    }
-
-    Rectangle {
-        id: back
-        color: "#77333333"
-        width: 200 * root.contentScale
-        height: Math.min(pickerRoot.contentHeight, list.contentHeight + list.anchors.margins * 2)
-        anchors.centerIn: parent
-        property int itemHeight: 25 * root.contentScale
-        rotation: root.contentRotation
-        Behavior on rotation { NumberAnimation { } }
-
-        ListView {
-            id: list
-            anchors.fill: parent
-            clip: true
-            anchors.margins: 14 * root.contentScale
-
-            currentIndex: -1
-
-            onCurrentIndexChanged: {
-                if (list.currentIndex >= 0) {
-                    var data = list.model[list.currentIndex];
-                    if (data === undefined)
-                        data = list.model.get(list.currentIndex);
-                    pickerRoot.value = data.value;
-                    pickerRoot.name = data.name;
-                } else {
-                    pickerRoot.value = null
-                    pickerRoot.name = ""
-                }
-            }
-
-            delegate: Item {
-                height: 40 * root.contentScale
-                width: parent.width
-                Rectangle {
-                    anchors.fill: parent
-                    border.color: index == list.currentIndex ? "#44ffffff" : "transparent"
-                    color: index == list.currentIndex ? "#22ffffff" : "transparent"
-                    radius: 3 * root.contentScale
-                    Text {
-                        color: "white"
-                        text: (typeof modelData === 'undefined' ? name : modelData.name)
-                        anchors.centerIn: parent
-                        font.pixelSize: Math.round(20 * root.contentScale)
-                    }
-                    MouseArea {
-                        anchors.fill: parent
-                        onClicked:  {
-                            list.currentIndex = index;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/basicsuite/Camera/RecordingTime.qml b/basicsuite/Camera/RecordingTime.qml
deleted file mode 100644
index 504d232..0000000
--- a/basicsuite/Camera/RecordingTime.qml
+++ /dev/null
@@ -1,70 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: recRoot
-    width: row.width + 14 * root.contentScale
-    height: circle.height + 14 * root.contentScale
-    color: "#77333333"
-    radius: 5 * root.contentScale
-    rotation: root.contentRotation
-    Behavior on rotation { NumberAnimation { } }
-
-    Row {
-        id: row
-        anchors.centerIn: parent
-        spacing: 10 * root.contentScale
-
-        Item {
-            anchors.verticalCenter: timeText.verticalCenter
-            width: 18 * root.contentScale
-            height: width
-
-            Rectangle {
-                id: circle
-                width: parent.width
-                height: parent.height
-                radius: width / 2
-                color: "#fa334f"
-
-                SequentialAnimation {
-                    loops: Animation.Infinite
-                    running: recRoot.visible
-                    PropertyAction { target: circle; property: "visible"; value: true }
-                    PauseAnimation { duration: 1000 }
-                    PropertyAction { target: circle; property: "visible"; value: false }
-                    PauseAnimation { duration: 1000 }
-                }
-            }
-        }
-
-        Text {
-            id: timeText
-            color: "white"
-            font.pixelSize: 24 * root.contentScale
-            text: formatTime(camera.videoRecorder.duration)
-        }
-    }
-
-    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/Camera/Slider.qml b/basicsuite/Camera/Slider.qml
deleted file mode 100644
index 025d521..0000000
--- a/basicsuite/Camera/Slider.qml
+++ /dev/null
@@ -1,93 +0,0 @@
-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: 4 * root.contentScale
-        color: "#666666"
-
-        MouseArea {
-            id: backgroundMouse
-            anchors.fill: parent
-            anchors.topMargin: -24 * root.contentScale
-            anchors.bottomMargin: -24 * root.contentScale
-            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);
-            }
-        }
-    }
-
-    Rectangle {
-        id: progress
-        height: 8 * root.contentScale
-        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 * root.contentScale
-        height: width
-        radius: width / 2
-        color: "#8898c66c"
-        antialiasing: true
-        anchors.centerIn: handle
-        visible: handle.visible
-    }
-
-    Rectangle {
-        id: handle
-        width: 14 * root.contentScale
-        height: width
-        radius: width / 2
-        antialiasing: true
-        color: "#98c66c"
-        anchors.verticalCenter: background.verticalCenter
-        visible: slider.enabled
-    }
-}
-
diff --git a/basicsuite/Camera/ZoomControl.qml b/basicsuite/Camera/ZoomControl.qml
deleted file mode 100644
index 493defe..0000000
--- a/basicsuite/Camera/ZoomControl.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import QtQuick 2.0
-
-Column {
-    width: 400 * root.contentScale
-    spacing: 20 * root.contentScale
-    visible: maximumZoom > 1
-
-    property alias maximumZoom: zoomSlider.maximum
-    property alias requestedZoom: zoomSlider.value
-    property real actualZoom: 1
-
-    Rectangle {
-        anchors.horizontalCenter: zoomSlider.horizontalCenter
-        width: zoomText.width + 10 * root.contentScale
-        height: zoomText.height + 10 * root.contentScale
-        color: "#77333333"
-        radius: 5 * root.contentScale
-        rotation: root.contentRotation
-        Behavior on rotation { NumberAnimation { } }
-
-        Text {
-            id: zoomText
-            anchors.centerIn: parent
-            font.pixelSize: Math.round(24 * root.contentScale)
-            color: "white"
-            font.bold: true
-            text: (Math.round(actualZoom * 100) / 100) + "x"
-        }
-    }
-
-    Slider {
-        id: zoomSlider
-        width: parent.width
-        rotation: root.contentRotation === -90 ? 180 : (root.contentRotation === 90 ? 0 : root.contentRotation)
-
-        minimum: 1
-        maximum: 1
-        value: 1
-    }
-}
diff --git a/basicsuite/Camera/camerautils/camerautils.cpp b/basicsuite/Camera/camerautils/camerautils.cpp
deleted file mode 100644
index 608bfaa..0000000
--- a/basicsuite/Camera/camerautils/camerautils.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-#include "camerautils.h"
-
-#include <QCamera>
-#include <QCameraImageCapture>
-#include <QCameraImageProcessing>
-#include <QCameraExposure>
-#include <QCameraFocus>
-#include <QMediaRecorder>
-
-static QList<CameraSettingsValue*> g_commonResolutions;
-static QList<CameraSettingsValue*> g_commonVideoResolutions;
-static QList<CameraSettingsValue*> g_whiteBalanceModes;
-static QList<CameraSettingsValue*> g_sceneModes;
-static QList<CameraSettingsValue*> g_flashModes;
-static QList<CameraSettingsValue*> g_focusModes;
-
-QDebug operator<<(QDebug dbg, const CameraSettingsValue &r) {
-    dbg.nospace() << "CameraSettingsValue(" << r.name() << ", " << r.value() << ')';
-    return dbg.space();
-}
-
-CameraUtils::CameraUtils(QObject *parent)
-    : QObject(parent)
-    , m_camera(0)
-{
-    if (g_commonResolutions.isEmpty()) {
-        g_commonResolutions << new CameraSettingsValue(QStringLiteral("QVGA"), QSize(320, 240))
-                            << new CameraSettingsValue(QStringLiteral("0.3M"), QSize(640, 480))
-                            << new CameraSettingsValue(QStringLiteral("0.8M"), QSize(1024, 768))
-                            << new CameraSettingsValue(QStringLiteral("1.2M"), QSize(1280, 960))
-                            << new CameraSettingsValue(QStringLiteral("2M"), QSize(1600, 1200))
-                            << new CameraSettingsValue(QStringLiteral("5M"), QSize(2560, 1920))
-                            << new CameraSettingsValue(QStringLiteral("8M"), QSize(3264, 2448));
-
-        g_commonVideoResolutions << new CameraSettingsValue(QStringLiteral("1080p (16:9)"), QSize(1920, 1080))
-                                 << new CameraSettingsValue(QStringLiteral("1080p (16:9)"), QSize(1920, 1088))
-                                 << new CameraSettingsValue(QStringLiteral("1080p (4:3)"), QSize(1440, 1080))
-                                 << new CameraSettingsValue(QStringLiteral("1080p (4:3)"), QSize(1440, 1088))
-                                 << new CameraSettingsValue(QStringLiteral("720p (16:9)"), QSize(1280, 720))
-                                 << new CameraSettingsValue(QStringLiteral("720p (4:3)"), QSize(960, 720))
-                                 << new CameraSettingsValue(QStringLiteral("480p (16:9)"), QSize(720, 480))
-                                 << new CameraSettingsValue(QStringLiteral("480p (4:3)"), QSize(640, 480))
-                                 << new CameraSettingsValue(QStringLiteral("QVGA"), QSize(320, 240));
-
-        g_whiteBalanceModes << new CameraSettingsValue(QStringLiteral("Auto"), QCameraImageProcessing::WhiteBalanceAuto)
-                            << new CameraSettingsValue(QStringLiteral("Manual"), QCameraImageProcessing::WhiteBalanceManual)
-                            << new CameraSettingsValue(QStringLiteral("Sunlight"), QCameraImageProcessing::WhiteBalanceSunlight)
-                            << new CameraSettingsValue(QStringLiteral("Cloudy"), QCameraImageProcessing::WhiteBalanceCloudy)
-                            << new CameraSettingsValue(QStringLiteral("Shade"), QCameraImageProcessing::WhiteBalanceShade)
-                            << new CameraSettingsValue(QStringLiteral("Tungsten"), QCameraImageProcessing::WhiteBalanceTungsten)
-                            << new CameraSettingsValue(QStringLiteral("Fluorescent"), QCameraImageProcessing::WhiteBalanceFluorescent)
-                            << new CameraSettingsValue(QStringLiteral("Flash"), QCameraImageProcessing::WhiteBalanceFlash)
-                            << new CameraSettingsValue(QStringLiteral("Sunset"), QCameraImageProcessing::WhiteBalanceSunset);
-
-        g_sceneModes << new CameraSettingsValue(QStringLiteral("Auto"), QCameraExposure::ExposureAuto)
-                     << new CameraSettingsValue(QStringLiteral("Manual"), QCameraExposure::ExposureManual)
-                     << new CameraSettingsValue(QStringLiteral("Portrait"), QCameraExposure::ExposurePortrait)
-                     << new CameraSettingsValue(QStringLiteral("Night"), QCameraExposure::ExposureNight)
-                     << new CameraSettingsValue(QStringLiteral("Backlight"), QCameraExposure::ExposureBacklight)
-                     << new CameraSettingsValue(QStringLiteral("Spotlight"), QCameraExposure::ExposureSpotlight)
-                     << new CameraSettingsValue(QStringLiteral("Sports"), QCameraExposure::ExposureSports)
-                     << new CameraSettingsValue(QStringLiteral("Snow"), QCameraExposure::ExposureSnow)
-                     << new CameraSettingsValue(QStringLiteral("Beach"), QCameraExposure::ExposureBeach)
-                     << new CameraSettingsValue(QStringLiteral("Large Aperture"), QCameraExposure::ExposureLargeAperture)
-                     << new CameraSettingsValue(QStringLiteral("Small Aperture"), QCameraExposure::ExposureSmallAperture);
-
-        g_flashModes << new CameraSettingsValue(QStringLiteral("Auto"), QCameraExposure::FlashAuto)
-                     << new CameraSettingsValue(QStringLiteral("Off"), QCameraExposure::FlashOff)
-                     << new CameraSettingsValue(QStringLiteral("On"), QCameraExposure::FlashOn)
-                     << new CameraSettingsValue(QStringLiteral("Red-Eye"), QCameraExposure::FlashRedEyeReduction)
-                     << new CameraSettingsValue(QStringLiteral("Torch"), QCameraExposure::FlashVideoLight);
-
-        g_focusModes << new CameraSettingsValue(QStringLiteral("Auto"), QCameraFocus::AutoFocus)
-                     << new CameraSettingsValue(QStringLiteral("Continuous"), QCameraFocus::ContinuousFocus)
-                     << new CameraSettingsValue(QStringLiteral("Hyperfocal"), QCameraFocus::HyperfocalFocus)
-                     << new CameraSettingsValue(QStringLiteral("Infinity"), QCameraFocus::InfinityFocus)
-                     << new CameraSettingsValue(QStringLiteral("Macro"), QCameraFocus::MacroFocus)
-                     << new CameraSettingsValue(QStringLiteral("Off"), QCameraFocus::ManualFocus);
-    }
-
-}
-
-CameraUtils::~CameraUtils()
-{
-}
-
-void CameraUtils::init()
-{
-    m_camera = new QCamera;
-    connect(m_camera, SIGNAL(statusChanged(QCamera::Status)), this, SLOT(onCameraStatusChanged()));
-    connect(m_camera, SIGNAL(error(QCamera::Error)), this, SLOT(onError()));
-    m_camera->load();
-}
-
-void CameraUtils::setCamera(QObject *obj)
-{
-    QObject *mediaObject = qvariant_cast<QObject*>(obj->property("mediaObject"));
-    if (!mediaObject)
-        return;
-
-    m_camera = qobject_cast<QCamera*>(mediaObject);
-    if (!m_camera)
-        return;
-
-    if (m_camera->status() >= QCamera::LoadedStatus)
-        onCameraStatusChanged();
-    else
-        connect(m_camera, SIGNAL(statusChanged(QCamera::Status)), this, SLOT(onCameraStatusChanged()));
-}
-
-void CameraUtils::onError()
-{
-    if (m_camera && m_camera->status() == QCamera::UnavailableStatus) {
-        delete m_camera;
-        m_camera = 0;
-
-        emit done();
-    }
-}
-
-void CameraUtils::onCameraStatusChanged()
-{
-    if (!m_camera || m_camera->status() < QCamera::LoadedStatus)
-        return;
-
-    disconnect(m_camera, SIGNAL(statusChanged(QCamera::Status)), this, SLOT(onCameraStatusChanged()));
-
-    QCameraImageCapture *imageCapture = new QCameraImageCapture(m_camera);
-    QCameraImageProcessing *imageProc = m_camera->imageProcessing();
-    QCameraExposure *exposure = m_camera->exposure();
-    QCameraFocus *focus = m_camera->focus();
-    QMediaRecorder rec(m_camera);
-
-    // Supported image resolutions
-    QList<QSize> resolutions = imageCapture->supportedResolutions();
-    for (int i = resolutions.size() - 1; i >= 0; --i) {
-        QSize reso = resolutions.at(i);
-        int mp = reso.width() * reso.height();
-        CameraSettingsValue *r = new CameraSettingsValue(QString::number(mp / double(1000000), 'f', 1) + QLatin1String("M"), reso);
-        m_supportedResolutions.append(r);
-    }
-
-    // Supported video resolutions
-    QList<QSize> suppRes = rec.supportedResolutions();
-    for (int i = 0; i < g_commonVideoResolutions.size(); ++i) {
-        CameraSettingsValue *r = g_commonVideoResolutions.at(i);
-        if (suppRes.contains(r->value().toSize()))
-            m_supportedVideoResolutions.append(r);
-    }
-
-
-    // Supported white balance modes
-    for (int i = 0; i < g_whiteBalanceModes.size(); ++i) {
-        CameraSettingsValue *m = g_whiteBalanceModes.at(i);
-        if (imageProc->isWhiteBalanceModeSupported(QCameraImageProcessing::WhiteBalanceMode(m->value().toInt())))
-            m_supportedWhiteBalanceModes.append(m);
-    }
-
-    // Supported scene modes
-    for (int i = 0; i < g_sceneModes.size(); ++i) {
-        CameraSettingsValue *sm = g_sceneModes.at(i);
-        if (exposure->isExposureModeSupported(QCameraExposure::ExposureMode(sm->value().toInt())))
-            m_supportedSceneModes.append(sm);
-    }
-
-    // Supported flash modes
-    for (int i = 0; i < g_flashModes.size(); ++i) {
-        CameraSettingsValue *sm = g_flashModes.at(i);
-        if (exposure->isFlashModeSupported(QCameraExposure::FlashModes(sm->value().toInt())))
-            m_supportedFlashModes.append(sm);
-    }
-
-    // Supported focus modes
-    for (int i = 0; i < g_focusModes.size(); ++i) {
-        CameraSettingsValue *sm = g_focusModes.at(i);
-        if (focus->isFocusModeSupported(QCameraFocus::FocusModes(sm->value().toInt())))
-            m_supportedFocusModes.append(sm);
-    }
-
-    delete imageCapture;
-
-    emit supportedCaptureResolutionsChanged();
-    emit supportedVideoResolutionsChanged();
-    emit supportedWhiteBalanceModesChanged();
-    emit supportedSceneModesChanged();
-    emit supportedFlashModesChanged();
-}
-
-
diff --git a/basicsuite/Camera/camerautils/camerautils.h b/basicsuite/Camera/camerautils/camerautils.h
deleted file mode 100644
index 562b675..0000000
--- a/basicsuite/Camera/camerautils/camerautils.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef CAMERAUTILS_H
-#define CAMERAUTILS_H
-
-#include <QObject>
-#include <QVariant>
-
-class QCamera;
-
-class CameraSettingsValue : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
-
-public:
-    CameraSettingsValue(const QString &n, const QVariant &v)
-        : QObject()
-        , m_name(n)
-        , m_value(v)
-    { }
-
-    QString name() const { return m_name; }
-    void setName(const QString &n) { m_name = n; emit nameChanged(); }
-
-    QVariant value() const { return m_value; }
-    void setValue(const QVariant &v) { m_value = v; emit valueChanged(); }
-
-Q_SIGNALS:
-    void nameChanged();
-    void valueChanged();
-
-private:
-    QString m_name;
-    QVariant m_value;
-};
-
-QDebug operator<<(QDebug, const CameraSettingsValue &);
-
-class CameraUtils : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QList<QObject*> supportedCaptureResolutions READ supportedCaptureResolutions NOTIFY supportedCaptureResolutionsChanged)
-    Q_PROPERTY(QList<QObject*> supportedWhiteBalanceModes READ supportedWhiteBalanceModes NOTIFY supportedWhiteBalanceModesChanged)
-    Q_PROPERTY(QList<QObject*> supportedSceneModes READ supportedSceneModes NOTIFY supportedSceneModesChanged)
-    Q_PROPERTY(QList<QObject*> supportedFlashModes READ supportedFlashModes NOTIFY supportedFlashModesChanged)
-    Q_PROPERTY(QList<QObject*> supportedFocusModes READ supportedFocusModes NOTIFY supportedFocusModesChanged)
-    Q_PROPERTY(QList<QObject*> supportedVideoResolutions READ supportedVideoResolutions NOTIFY supportedVideoResolutionsChanged)
-public:
-    explicit CameraUtils(QObject *parent = 0);
-    ~CameraUtils();
-
-    Q_INVOKABLE void init();
-    Q_INVOKABLE void setCamera(QObject *cam);
-
-    QList<QObject*> supportedCaptureResolutions() const { return m_supportedResolutions; }
-    QList<QObject*> supportedVideoResolutions() const { return m_supportedVideoResolutions; }
-    QList<QObject*> supportedWhiteBalanceModes() const { return m_supportedWhiteBalanceModes; }
-    QList<QObject*> supportedSceneModes() const { return m_supportedSceneModes; }
-    QList<QObject*> supportedFlashModes() const { return m_supportedFlashModes; }
-    QList<QObject*> supportedFocusModes() const { return m_supportedFocusModes; }
-
-Q_SIGNALS:
-    void supportedCaptureResolutionsChanged();
-    void supportedWhiteBalanceModesChanged();
-    void supportedSceneModesChanged();
-    void supportedFlashModesChanged();
-    void supportedFocusModesChanged();
-    void supportedVideoResolutionsChanged();
-
-    void done();
-
-private Q_SLOTS:
-    void onCameraStatusChanged();
-    void onError();
-
-private:
-    QCamera *m_camera;
-
-    QList<QObject*> m_supportedResolutions;
-    QList<QObject*> m_supportedVideoResolutions;
-    QList<QObject*> m_supportedWhiteBalanceModes;
-    QList<QObject*> m_supportedSceneModes;
-    QList<QObject*> m_supportedFlashModes;
-    QList<QObject*> m_supportedFocusModes;
-};
-
-#endif // CAMERAUTILS_H
diff --git a/basicsuite/Camera/camerautils/camerautils.pro b/basicsuite/Camera/camerautils/camerautils.pro
deleted file mode 100644
index 938a0a9..0000000
--- a/basicsuite/Camera/camerautils/camerautils.pro
+++ /dev/null
@@ -1,19 +0,0 @@
-TEMPLATE = lib
-CONFIG += plugin
-QT += qml multimedia
-
-TARGET  = camerautilsplugin
-
-SOURCES += plugin.cpp \
-           camerautils.cpp
-
-HEADERS += camerautils.h
-
-pluginfiles.files += \
-    qmldir \
-
-target.path += $$[QT_INSTALL_QML]/CameraUtils
-pluginfiles.path += $$[QT_INSTALL_QML]/CameraUtils
-
-INSTALLS += target pluginfiles
-
diff --git a/basicsuite/Camera/camerautils/plugin.cpp b/basicsuite/Camera/camerautils/plugin.cpp
deleted file mode 100644
index 2a8c3ea..0000000
--- a/basicsuite/Camera/camerautils/plugin.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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$
-**
-****************************************************************************/
-
-#include <QtQml/QQmlExtensionPlugin>
-#include <QtQml/qqml.h>
-#include <qdebug.h>
-
-#include "camerautils.h"
-
-class QExampleQmlPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri)
-    {
-        qmlRegisterType<CameraUtils>(uri, 1, 0, "CameraUtils");
-    }
-};
-
-
-#include "plugin.moc"
diff --git a/basicsuite/Camera/description.txt b/basicsuite/Camera/description.txt
deleted file mode 100644
index 7e94e89..0000000
--- a/basicsuite/Camera/description.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-This example demonstrates the use of the camera features of Qt Multimedia with Qt Quick.
-
-It can take pictures and record videos. Files are saved inside the 'DCIM' folder on the external storage.
-
-Camera parameters such as flash mode, scene mode or white balance can be changed. The availability of parameters depends on what the camera driver provides.
diff --git a/basicsuite/Camera/main.qml b/basicsuite/Camera/main.qml
deleted file mode 100644
index a1cc89c..0000000
--- a/basicsuite/Camera/main.qml
+++ /dev/null
@@ -1,223 +0,0 @@
-import QtQuick 2.0
-import QtMultimedia 5.0
-//import QtSensors 5.0
-import CameraUtils 1.0
-
-Rectangle {
-    id: root
-    color: "black"
-
-    property real contentScale: root.width / 1280
-    property int contentRotation: 0
-
-    Text {
-        anchors.centerIn: parent
-        color: "white"
-        font.pixelSize: 30
-        text: "Camera service is not available..."
-        visible: camera.cameraStatus === Camera.UnavailableStatus
-    }
-
-    CameraUtils {
-        id: cameraUtils
-    }
-
-    Camera {
-        id: camera
-        property bool updateFocusPointMode: true
-        property bool captureWhenLocked: false
-
-        Component.onCompleted: cameraUtils.setCamera(camera)
-
-        digitalZoom: controls.requestedZoom
-        captureMode: Camera.CaptureStillImage
-
-        onCaptureModeChanged: {
-            if (camera.captureMode === Camera.CaptureVideo) {
-                controls.focusMode = Camera.FocusContinuous;
-                camera.unlock();
-            } else {
-                controls.focusMode = Camera.FocusAuto;
-            }
-        }
-
-        onLockStatusChanged: {
-            if (camera.lockStatus === Camera.Locked && captureWhenLocked) {
-                camera.imageCapture.capture();
-                captureWhenLocked = false;
-            }
-        }
-
-        focus {
-            onFocusModeChanged: {
-                camera.unlock();
-                if (camera.updateFocusPointMode)
-                    camera.focus.focusPointMode = Camera.FocusPointAuto
-            }
-            onCustomFocusPointChanged: {
-                if (camera.focus.focusPointMode === Camera.FocusPointCustom
-                        && camera.focus.focusMode !== Camera.FocusAuto
-                        && camera.focus.focusMode !== Camera.FocusMacro) {
-                    camera.updateFocusPointMode = false;
-                    camera.focus.focusMode = Camera.FocusAuto
-                    controls.focusMode = Camera.FocusAuto
-                    camera.updateFocusPointMode = true;
-                }
-            }
-        }
-
-        onCameraStatusChanged: {
-            if (cameraStatus === Camera.ActiveStatus) {
-                controls.exposureMode = camera.exposure.exposureMode
-                controls.exposureCompensation = camera.exposure.exposureCompensation
-                controls.whiteBalanceMode = camera.imageProcessing.whiteBalanceMode
-                controls.flashMode = Camera.FlashAuto
-                if (camera.captureMode === Camera.CaptureStillImage)
-                    controls.focusMode = camera.focus.focusMode
-                else
-                    camera.focus.focusMode = Camera.FocusContinuous
-            }
-        }
-
-        imageCapture {
-            onImageExposed: capturePreview.show()
-            onImageCaptured: {
-                camera.unlock();
-                capturePreview.setPreview(preview);
-            }
-            onCaptureFailed: print(requestId + " " + message)
-        }
-
-        videoRecorder {
-            //            mediaContainer: "mp4"
-            //            audioCodec: "aac"
-            //            audioSampleRate: 48000
-            //            audioBitRate: 192000
-            //            audioChannels: 2
-            //            videoCodec: "h264"
-            //            resolution: Qt.size(960, 720)
-            onResolutionChanged: {
-                if (camera.videoRecorder.resolution == Qt.size(1920, 1080))
-                    camera.videoRecorder.videoBitRate = 20000000;
-                else if (camera.videoRecorderresolution == Qt.size(1280, 720))
-                    camera.videoRecorder.videoBitRate = 10000000;
-                else
-                    camera.videoRecorder.videoBitRate = 5000000;
-            }
-        }
-
-    }
-
-    VideoOutput {
-        id: viewfinder
-        source: camera
-        anchors.fill: parent
-        fillMode: VideoOutput.PreserveAspectFit
-    }
-
-    //    OrientationSensor {
-    //        active: true
-    //        onReadingChanged: {
-    //            if (reading.orientation === OrientationReading.TopUp)
-    //                root.contentRotation = -90;
-    //            else if (reading.orientation === OrientationReading.RightUp)
-    //                root.contentRotation = 0;
-    //            else if (reading.orientation === OrientationReading.LeftUp)
-    //                root.contentRotation = 180;
-    //            else if (reading.orientation === OrientationReading.TopDown)
-    //                root.contentRotation = 90;
-    //        }
-    //    }
-
-    //    RotationSensor {
-    //        active: (camera.cameraStatus === Camera.ActiveStatus)
-    //        dataRate: 20
-    //        property real lastxvalue: 0
-    //        property real lastyvalue: 0
-    //        property real lastzvalue: 0
-
-    //        onActiveChanged: {
-    //            lastxvalue = 0
-    //            lastyvalue = 0
-    //            lastzvalue = 0
-    //        }
-
-    //        onReadingChanged: {
-    //            if (lastxvalue != 0 && camera.focus.focusMode === Camera.FocusContinuous && camera.lockStatus === Camera.Locked && camera.imageCapture.ready) {
-    //                if (Math.abs(reading.x - lastxvalue) > 3 || Math.abs(reading.y - lastyvalue) > 3 || Math.abs(reading.z - lastzvalue) > 3)
-    //                    camera.unlock();
-    //            }
-    //            lastxvalue = reading.x;
-    //            lastyvalue = reading.y;
-    //            lastzvalue = reading.z;
-    //        }
-    //    }
-
-    Controls {
-        id: controls
-        visible: camera.cameraStatus === Camera.ActiveStatus
-
-        actualZoom: camera.digitalZoom
-        maximumZoom: camera.maximumDigitalZoom
-
-        onCameraModeChanged: camera.captureMode = controls.cameraMode
-
-        onFlashModeChanged: if (visible) camera.flash.mode = controls.flashMode
-        onFocusModeChanged: if (visible) camera.focus.focusMode = controls.focusMode
-        onExposureModeChanged: if (visible) camera.exposure.exposureMode = controls.exposureMode
-        onExposureCompensationChanged: if (visible) camera.exposure.exposureCompensation = controls.exposureCompensation
-        onWhiteBalanceModeChanged: if (visible) camera.imageProcessing.whiteBalanceMode = controls.whiteBalanceMode
-        onResolutionChanged: {
-            if (controls.resolution != null) {
-                if (camera.captureMode === Camera.CaptureStillImage)
-                    camera.imageCapture.resolution = controls.resolution;
-                else
-                    camera.videoRecorder.resolution = controls.resolution;
-            }
-        }
-
-        onSearchAndLock: {
-            camera.searchAndLock();
-        }
-
-        captureReady: camera.imageCapture.ready
-        onCapture: {
-            if (camera.captureMode === Camera.CaptureVideo) {
-                if (camera.videoRecorder.recorderState === CameraRecorder.RecordingState) {
-                    camera.videoRecorder.stop();
-                } else {
-                    camera.videoRecorder.record();
-                }
-            } else {
-                if ((camera.focus.focusMode === Camera.FocusAuto || camera.focus.focusMode === Camera.FocusMacro)
-                        && camera.focus.focusPointMode === Camera.FocusPointAuto
-                        && camera.lockStatus === Camera.Unlocked) {
-                    camera.captureWhenLocked = true;
-                    camera.searchAndLock();
-                } else {
-                    camera.imageCapture.capture();
-                }
-            }
-        }
-    }
-
-    //    CameraControlButton {
-    //        anchors.left: parent.left
-    //        anchors.leftMargin: 30
-    //        anchors.bottom: parent.bottom
-    //        anchors.bottomMargin: 20
-    //        title: camera.cameraStatus === Camera.ActiveStatus ? "Stop" : "Start"
-
-    //        onClicked: {
-    //            if (camera.cameraStatus === Camera.ActiveStatus)
-    //                camera.cameraState = Camera.UnloadedState
-    //            else
-    //                camera.start();
-    //        }
-    //    }
-
-    CapturePreview {
-        id: capturePreview
-    }
-
-}
diff --git a/basicsuite/Controls Layouts/description.txt b/basicsuite/Controls Layouts/description.txt
deleted file mode 100644
index 393f0dd..0000000
--- a/basicsuite/Controls Layouts/description.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The "Controls Layout" demonstration aims to show some of the features available in the layout system of the Qt Quick Controls. The layout system in Qt Quick Controls adds GridLayout, RowLayout and ColumnLayout which interact with size-hints from individual controls, making it possible to create interfaces that adapt to various dimensions and still look good.
-
-The example has been adapted slightly to run inside this launcher, the original is available in the Qt Quick Controls repository.
diff --git a/basicsuite/Controls Layouts/main.qml b/basicsuite/Controls Layouts/main.qml
deleted file mode 100644
index b12b6c8..0000000
--- a/basicsuite/Controls Layouts/main.qml
+++ /dev/null
@@ -1,118 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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.Layouts 1.0
-
-Rectangle {
-
-    gradient: Gradient {
-        GradientStop { position: 0; color: "white" }
-        GradientStop { position: 1; color: "lightgray" }
-    }
-
-    property int margin: 11
-    width: 1280
-    height: 720
-
-    ColumnLayout {
-        id: mainLayout
-        anchors.fill: parent
-        anchors.margins: margin
-        GroupBox {
-            id: rowBox
-            title: "Row layout"
-            Layout.fillWidth: true
-
-            RowLayout {
-                id: rowLayout
-                anchors.fill: parent
-                TextField {
-                    placeholderText: "This wants to grow horizontally"
-                    Layout.fillWidth: true
-                }
-                Button {
-                    text: "Button"
-                }
-            }
-        }
-
-        GroupBox {
-            id: gridBox
-            title: "Grid layout"
-            Layout.fillWidth: true
-
-            GridLayout {
-                id: gridLayout
-                rows: 3
-                flow: GridLayout.TopToBottom
-                anchors.fill: parent
-
-                Label { text: "Line 1" }
-                Label { text: "Line 2" }
-                Label { text: "Line 3" }
-
-                TextField { }
-                TextField { }
-                TextField { }
-
-                TextArea {
-                    text: "This widget spans over three rows in the GridLayout.\n"
-                        + "All items in the GridLayout are implicitly positioned from top to bottom."
-                    Layout.rowSpan: 3
-                    Layout.fillHeight: true
-                    Layout.fillWidth: true
-                }
-            }
-        }
-        TextArea {
-            id: t3
-            text: "This fills the whole cell"
-            Layout.minimumHeight: 30
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-        }
-    }
-}
diff --git a/basicsuite/Controls Layouts/preview_l.jpg b/basicsuite/Controls Layouts/preview_l.jpg
deleted file mode 100644
index 03df43a..0000000
--- a/basicsuite/Controls Layouts/preview_l.jpg
+++ /dev/null
diff --git a/basicsuite/Controls Touch/content/AndroidDelegate.qml b/basicsuite/Controls Touch/content/AndroidDelegate.qml
deleted file mode 100644
index 36a439a..0000000
--- a/basicsuite/Controls Touch/content/AndroidDelegate.qml
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: 88
-
-    property alias text: textitem.text
-    signal clicked
-
-    Rectangle {
-        anchors.fill: parent
-        color: "#11ffffff"
-        visible: mouse.pressed
-    }
-
-    Text {
-        id: textitem
-        color: "white"
-        font.pixelSize: 32
-        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
-        source: "../images/navigation_next_item.png"
-    }
-
-    MouseArea {
-        id: mouse
-        anchors.fill: parent
-        onClicked: root.clicked()
-
-    }
-}
diff --git a/basicsuite/Controls Touch/content/ButtonPage.qml b/basicsuite/Controls Touch/content/ButtonPage.qml
deleted file mode 100644
index f431a52..0000000
--- a/basicsuite/Controls Touch/content/ButtonPage.qml
+++ /dev/null
@@ -1,120 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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
-
-        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 (stackView) stackView.pop()
-        }
-
-    }
-
-    Component {
-        id: touchStyle
-        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: 23
-                        renderType: Text.NativeRendering
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/Controls Touch/content/ProgressBarPage.qml b/basicsuite/Controls Touch/content/ProgressBarPage.qml
deleted file mode 100644
index dc0f552..0000000
--- a/basicsuite/Controls Touch/content/ProgressBarPage.qml
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: 400
-            value: progress
-        }
-
-        ProgressBar {
-            anchors.margins: 20
-            style: touchStyle
-            width: 400
-            value: 1 - progress
-        }
-
-        ProgressBar {
-            anchors.margins: 20
-            style: touchStyle
-            value: 1
-            width: 400
-        }
-
-    }
-
-    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/Controls Touch/content/SliderPage.qml b/basicsuite/Controls Touch/content/SliderPage.qml
deleted file mode 100644
index 8eb9190..0000000
--- a/basicsuite/Controls Touch/content/SliderPage.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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
-
-    Column {
-        spacing: 12
-        anchors.centerIn: parent
-
-        Slider {
-            anchors.margins: 20
-            style: touchStyle
-            value: 0
-        }
-        Slider {
-            anchors.margins: 20
-            style: touchStyle
-            value: 0.5
-        }
-        Slider {
-            anchors.margins: 20
-            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: 400
-                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/Controls Touch/content/TabBarPage.qml b/basicsuite/Controls Touch/content/TabBarPage.qml
deleted file mode 100644
index 7651a3c..0000000
--- a/basicsuite/Controls Touch/content/TabBarPage.qml
+++ /dev/null
@@ -1,102 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: styleData.selected ? "../images/tab_selected.png":"../images/tabs_standard.png"
-                    Text {
-                        anchors.centerIn: parent
-                        color: "white"
-                        text: styleData.title.toUpperCase()
-                        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/Controls Touch/content/TextInputPage.qml b/basicsuite/Controls Touch/content/TextInputPage.qml
deleted file mode 100644
index 605afef..0000000
--- a/basicsuite/Controls Touch/content/TextInputPage.qml
+++ /dev/null
@@ -1,106 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: 320
-                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/Controls Touch/main.qml b/basicsuite/Controls Touch/main.qml
deleted file mode 100644
index e4d2562..0000000
--- a/basicsuite/Controls Touch/main.qml
+++ /dev/null
@@ -1,148 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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"
-
-Item {
-    width: 800
-    height: 1280
-
-    Rectangle {
-        color: "#212126"
-        anchors.fill: parent
-    }
-
-    // Implements back key navigation
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Back) {
-            if (stackView.depth > 1) {
-                stackView.pop();
-                event.accepted = true;
-            } else { Qt.quit(); }
-        }
-    }
-
-    BorderImage {
-        id: toolbar
-        border.bottom: 8
-        source: "images/toolbar.png"
-        width: parent.width
-        height: 100
-
-        Rectangle {
-            id: backButton
-            width: opacity ? 60 : 0
-            anchors.left: parent.left
-            anchors.leftMargin: 20
-            opacity: stackView.depth > 1 ? 1 : 0
-            anchors.verticalCenter: parent.verticalCenter
-            antialiasing: true
-            height: 60
-            radius: 4
-            color: backmouse.pressed ? "#222" : "transparent"
-            Behavior on opacity { NumberAnimation{} }
-            Image {
-                anchors.verticalCenter: parent.verticalCenter
-                source: "images/navigation_previous_item.png"
-            }
-            MouseArea {
-                id: backmouse
-                anchors.fill: parent
-                anchors.margins: -10
-                onClicked: stackView.pop()
-            }
-        }
-
-        Text {
-            font.pixelSize: 42
-            Behavior on x { NumberAnimation{ easing.type: Easing.OutCubic} }
-            x: backButton.x + backButton.width + 20
-            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: stackView
-        anchors.fill: parent
-        anchors.topMargin: toolbar.height
-
-        initialItem: Item {
-            width: parent.width
-            height: parent.height
-            ListView {
-                model: pageModel
-                anchors.fill: parent
-                delegate: AndroidDelegate {
-                    text: title
-                    onClicked: stackView.push(Qt.resolvedUrl(page))
-                }
-            }
-        }
-    }
-
-}
diff --git a/basicsuite/Graphical Effects/Checkers.qml b/basicsuite/Graphical Effects/Checkers.qml
deleted file mode 100644
index 9ebdcff..0000000
--- a/basicsuite/Graphical Effects/Checkers.qml
+++ /dev/null
@@ -1,28 +0,0 @@
-import QtQuick 2.0
-
-
-// The checkers background
-ShaderEffect {
-
-    property real tileSize: 16
-    property color color1: Qt.rgba(0.7, 0.7, 0.7, 1);
-    property color color2: Qt.rgba(0.6, 0.6, 0.6, 1);
-
-    property size _pixelSize: Qt.size(Math.PI * width / tileSize, Math.PI * height / tileSize);
-
-    fragmentShader:
-        "
-        uniform lowp vec4 color1;
-        uniform lowp vec4 color2;
-        uniform lowp float qt_Opacity;
-        uniform highp vec2 _pixelSize;
-        varying highp vec2 qt_TexCoord0;
-        void main() {
-            highp vec2 tc = sign(sin(qt_TexCoord0 * _pixelSize));
-            if (tc.x != tc.y)
-                gl_FragColor = color1 * qt_Opacity;
-            else
-                gl_FragColor = color2 * qt_Opacity;
-        }
-        "
-}
diff --git a/basicsuite/Graphical Effects/description.txt b/basicsuite/Graphical Effects/description.txt
deleted file mode 100644
index 8623c2c..0000000
--- a/basicsuite/Graphical Effects/description.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This example shows the Qt Quick 2.0 ShaderEffect type and the QtGraphicalEffect module. Qt Quick 2.0 provides the ability to use inline GLSL in your Qt Quick applications to create stunning visual effects. However, as UIs typically reuse many of the same effects, the QtGraphicalEffects module provides a set of predefined, commonly used effects. This includes blur, drop-shadows, glow, blending, opacity maskes and more.
-
diff --git a/basicsuite/Graphical Effects/effect_BrightnessContrast.qml b/basicsuite/Graphical Effects/effect_BrightnessContrast.qml
deleted file mode 100644
index 97ccb48..0000000
--- a/basicsuite/Graphical Effects/effect_BrightnessContrast.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-
-    id: root
-
-    property real inputX: 0.7;
-    property real feedbackX: effect.brightness
-    property string nameX: "Brightness"
-
-    property real inputY: 0.8;
-    property real feedbackY: effect.contrast
-    property string nameY: "Contrast"
-
-    Image {
-        id: image
-        source: "images/bug.jpg"
-        anchors.centerIn: parent
-        visible: false
-    }
-
-    BrightnessContrast {
-        id: effect;
-
-        source: image
-        anchors.fill: source
-
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-
-        brightness: inputX * 2 - 1;
-        contrast: inputY * 2 - 1;
-    }
-
-}
diff --git a/basicsuite/Graphical Effects/effect_Colorize.qml b/basicsuite/Graphical Effects/effect_Colorize.qml
deleted file mode 100644
index 06c977e..0000000
--- a/basicsuite/Graphical Effects/effect_Colorize.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-    id: root
-
-    property real inputX: 0.6;
-    property real feedbackX: effect.hue
-    property string nameX: "Hue"
-
-    property real inputY: 0.7
-    property real feedbackY: effect.saturation
-    property string nameY: "Saturation"
-
-    Image {
-        id: image
-        source: "images/bug.jpg"
-        width: Math.min(root.width, root.height) * 0.8;
-        height: width
-        sourceSize: Qt.size(width, height);
-        anchors.centerIn: parent
-    }
-
-    Colorize {
-        id: effect;
-
-        source: image
-        anchors.fill: source
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-
-        hue: root.inputX * 2 - 1;
-        saturation: root.inputY
-    }
-}
diff --git a/basicsuite/Graphical Effects/effect_CustomDissolve.qml b/basicsuite/Graphical Effects/effect_CustomDissolve.qml
deleted file mode 100644
index bd843bd..0000000
--- a/basicsuite/Graphical Effects/effect_CustomDissolve.qml
+++ /dev/null
@@ -1,125 +0,0 @@
-import QtQuick 2.0
-
-Item {
-
-
-    width: 700
-    height: 600
-    id: root
-
-    property real inputX: 0.5;
-    property real feedbackX: inputX
-    property string nameX: "Dissolution"
-
-    property real inputY: 0.5;
-    property real feedbackY: effect.amplitude
-    property string nameY: "Amplitude"
-
-    Rectangle {
-        id: sourceItem
-        anchors.centerIn: parent
-        width: text.width + 50
-        height: text.height + 20
-        gradient: Gradient {
-            GradientStop { position: 0; color: "steelblue" }
-            GradientStop { position: 1; color: "black" }
-        }
-        border.color: "lightsteelblue"
-        border.width: 2
-
-//?        color: "transparent"
-
-        radius: 10
-
-        layer.enabled: true
-        layer.smooth: true
-        layer.sourceRect: Qt.rect(-1, -1, width + 2, height + 2);
-
-        visible: false
-
-        Text {
-            id: text
-            font.pixelSize: root.height * 0.08
-            anchors.centerIn: parent;
-            text: "Code Less, Create More!"
-            color: "lightsteelblue"
-            style: Text.Raised
-
-        }
-    }
-
-    ShaderEffect {
-
-        id: effect
-
-        anchors.fill: sourceItem;
-
-        property variant source: sourceItem;
-
-        property real t: (1 + tlength) * (1 - root.inputX) - tlength;
-        property real tlength: 1.0
-        property real amplitude: 2.0 * height * root.inputY;
-
-        mesh: "40x4"
-
-        vertexShader:
-            "
-            uniform highp mat4 qt_Matrix;
-            uniform lowp float t;
-            uniform lowp float tlength;
-            uniform highp float amplitude;
-
-            attribute highp vec4 qt_Vertex;
-            attribute highp vec2 qt_MultiTexCoord0;
-
-            varying highp vec2 vTexCoord;
-            varying lowp float vOpacity;
-
-            void main() {
-                vTexCoord = qt_MultiTexCoord0;
-
-                vec4 pos = qt_Vertex;
-
-                lowp float tt = smoothstep(t, t+tlength, qt_MultiTexCoord0.x);
-
-                vOpacity = 1.0 - tt;
-
-                pos.y += (amplitude * (qt_MultiTexCoord0.y * 2.0 - 1.0) * (-2.0 * tt)
-                          + 3.0 * amplitude * (qt_MultiTexCoord0.y * 2.0 - 1.0)
-                          + amplitude * sin(0.0 + tt * 2.14152 * qt_MultiTexCoord0.x)
-                          + amplitude * sin(0.0 + tt * 7.4567)
-                         ) * tt;
-
-                pos.x += amplitude * sin(6.0 + tt * 4.4567) * tt;
-
-                gl_Position = qt_Matrix * pos;
-            }
-            "
-        fragmentShader:
-            "
-            uniform sampler2D source;
-
-            uniform lowp float t;
-            uniform lowp float tlength;
-            uniform lowp float qt_Opacity;
-
-            varying highp vec2 vTexCoord;
-            varying lowp float vOpacity;
-
-            // Noise function from: http://stackoverflow.com/questions/4200224/random-noise-functions-for-glsl
-            highp float rand(vec2 n) {
-                return fract(sin(dot(n.xy, vec2(12.9898, 78.233))) * 43758.5453);
-            }
-
-            void main() {
-                lowp vec4 tex = texture2D(source, vTexCoord);
-                lowp float opacity = 1.0 - smoothstep(0.9, 1.0, vOpacity);
-                lowp float particlify = smoothstep(1.0 - vOpacity, 1.0, rand(vTexCoord)) * vOpacity;
-                gl_FragColor = tex * mix(vOpacity, particlify, opacity) * qt_Opacity;
-            }
-
-            "
-
-    }
-
-}
diff --git a/basicsuite/Graphical Effects/effect_CustomWave.qml b/basicsuite/Graphical Effects/effect_CustomWave.qml
deleted file mode 100644
index 66e91be..0000000
--- a/basicsuite/Graphical Effects/effect_CustomWave.qml
+++ /dev/null
@@ -1,118 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    id: root
-
-    property real inputX: 0.9;
-    property real feedbackX: shader.zrot
-    property string nameX: "Rotation"
-
-    property real inputY: 0.7
-    property real feedbackY: shader.amp
-    property string nameY: "Amplitude"
-
-
-    ShaderEffect {
-        id: shader
-        width: height
-        height: parent.height
-        anchors.centerIn: parent;
-        scale: height > root.height * 0.8 ? root.height * 0.8 / height : 1;
-
-        blending: true
-
-        mesh: "50x50"
-
-        property variant size: Qt.size(width, height);
-
-        property variant source: Image { source: "images/bug.jpg" }
-
-        property real amp: root.inputY * 0.1;
-
-        property real xrot: 2 / 8 * Math.PI;
-
-        property real zrot: -root.inputX * Math.PI * 2
-
-        property real time: 0
-        NumberAnimation on time {
-            id: timeAnimation
-            from: 0;
-            to: Math.PI * 2;
-            duration: 3457;
-            loops: Animation.Infinite
-            running: true;
-        }
-
-        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/basicsuite/Graphical Effects/effect_Displacement.qml b/basicsuite/Graphical Effects/effect_Displacement.qml
deleted file mode 100644
index c25827c..0000000
--- a/basicsuite/Graphical Effects/effect_Displacement.qml
+++ /dev/null
@@ -1,40 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-
-    id: root
-
-    property real inputX: 0.1;
-
-    property real feedbackX: effect.displacement
-
-    property string nameX: "Displacement"
-
-    Image {
-        id: image
-        source: "images/bug.jpg"
-        anchors.centerIn: parent
-        visible: false
-    }
-
-    Image {
-        id: displacementMap
-        source: "images/glass_normal.png"
-        smooth: true
-        visible: false
-    }
-
-    Displace {
-        id: effect;
-
-        source: image
-        displacementSource: displacementMap
-        anchors.fill: source
-
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-
-        displacement: inputX
-    }
-
-}
diff --git a/basicsuite/Graphical Effects/effect_DropShadow.qml b/basicsuite/Graphical Effects/effect_DropShadow.qml
deleted file mode 100644
index 125fe64..0000000
--- a/basicsuite/Graphical Effects/effect_DropShadow.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-
-    id: root
-
-    property real inputX: 0.5;
-    property real inputY: 0.2;
-
-    property real feedbackX: effect.radius
-    property real feedbackY: effect.spread
-
-    property string nameX: "Radius"
-    property string nameY: "Spread"
-
-    Image {
-        id: image
-        source: "images/butterfly.png"
-        anchors.centerIn: parent
-        visible: false
-    }
-
-    DropShadow {
-        id: effect;
-
-        source: image
-        anchors.fill: source
-
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-
-        samples: 4
-
-        radius: root.inputX * 7
-        spread: root.inputY;
-
-        color: Qt.rgba(0, 0, 0, 0.4);
-
-        verticalOffset: 30.5
-        horizontalOffset: 30.5
-    }
-
-}
diff --git a/basicsuite/Graphical Effects/effect_GaussianBlur.qml b/basicsuite/Graphical Effects/effect_GaussianBlur.qml
deleted file mode 100644
index f9a029c..0000000
--- a/basicsuite/Graphical Effects/effect_GaussianBlur.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-
-    id: root
-
-    property real inputX: 0.5;
-    property real inputY: 1
-
-    property real feedbackX: effect.radius
-    property real feedbackY: effect.deviation
-
-    property string nameX: "Radius"
-    property string nameY: "Deviation"
-
-    Image {
-        id: image
-        source: "images/bug.jpg"
-        width: Math.min(root.width, root.height) * 0.8;
-        height: width
-        sourceSize: Qt.size(width, height);
-        anchors.centerIn: parent
-    }
-
-    GaussianBlur {
-        id: effect;
-
-        source: image
-        anchors.fill: source
-
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-        samples: 4
-
-        deviation: root.inputY * 20;
-        radius: root.inputX * 7
-    }
-
-}
diff --git a/basicsuite/Graphical Effects/effect_Glow.qml b/basicsuite/Graphical Effects/effect_Glow.qml
deleted file mode 100644
index dd7a078..0000000
--- a/basicsuite/Graphical Effects/effect_Glow.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-
-    id: root
-
-    property real inputX: 0.5;
-    property real inputY: 0.2;
-
-    property real feedbackX: effect.radius
-    property real feedbackY: effect.spread
-
-    property string nameX: "Radius"
-    property string nameY: "Spread"
-
-    Image {
-        id: image
-        source: "images/butterfly.png"
-        anchors.centerIn: parent
-        visible: false
-    }
-
-    Glow {
-        id: effect;
-
-        source: image
-        anchors.fill: source
-
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-
-        samples: 4
-
-        radius: root.inputX * 7
-        spread: root.inputY;
-
-        color: Qt.rgba(1, 0, 1, 1);
-    }
-}
diff --git a/basicsuite/Graphical Effects/effect_HueSaturation.qml b/basicsuite/Graphical Effects/effect_HueSaturation.qml
deleted file mode 100644
index 4e3846a..0000000
--- a/basicsuite/Graphical Effects/effect_HueSaturation.qml
+++ /dev/null
@@ -1,34 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-    id: root
-
-    property real inputX: 0.6;
-    property real feedbackX: effect.hue
-    property string nameX: "Hue"
-
-    property real inputY: 0.2
-    property real feedbackY: effect.saturation
-    property string nameY: "Saturation"
-
-    Image {
-        id: image
-        source: "images/bug.jpg"
-        width: Math.min(root.width, root.height) * 0.8;
-        height: width
-        sourceSize: Qt.size(width, height);
-        anchors.centerIn: parent
-    }
-
-    HueSaturation {
-        id: effect;
-
-        source: image
-        anchors.fill: source
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-
-        hue: root.inputX * 2 - 1;
-        saturation: root.inputY * 2 - 1
-    }
-}
diff --git a/basicsuite/Graphical Effects/effect_OpacityMask.qml b/basicsuite/Graphical Effects/effect_OpacityMask.qml
deleted file mode 100644
index e292ba4..0000000
--- a/basicsuite/Graphical Effects/effect_OpacityMask.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-
-    id: root
-
-    Image {
-        id: image
-        source: "images/bug.jpg"
-        anchors.centerIn: parent
-        visible: false
-    }
-
-    Image {
-        id: mask
-        source: "images/butterfly.png"
-        visible: false
-    }
-
-    OpacityMask {
-        id: effect;
-
-        source: image
-        maskSource: mask
-        anchors.fill: source
-
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-    }
-}
diff --git a/basicsuite/Graphical Effects/effect_ThresholdMask.qml b/basicsuite/Graphical Effects/effect_ThresholdMask.qml
deleted file mode 100644
index 24b73fc..0000000
--- a/basicsuite/Graphical Effects/effect_ThresholdMask.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-import QtQuick 2.0
-import QtGraphicalEffects 1.0
-
-Item {
-
-    id: root
-
-    property real inputX: 0.5;
-    property real inputY: 0.2;
-
-    property real feedbackX: effect.threshold
-    property real feedbackY: effect.spread
-
-    property string nameX: "Threshold"
-    property string nameY: "Spread"
-
-    Image {
-        id: image
-        source: "images/bug.jpg"
-        anchors.centerIn: parent
-        visible: false
-    }
-
-    Image {
-        id: mask
-        source: "images/fog.png"
-        visible: false
-    }
-
-    ThresholdMask {
-        id: effect;
-
-        source: image
-        maskSource: mask;
-        anchors.fill: source
-
-        scale: source.height > root.height * 0.8 ? root.height / source.height * 0.8 : 1;
-
-        threshold: root.inputX
-        spread: root.inputY
-    }
-
-}
diff --git a/basicsuite/Graphical Effects/main.qml b/basicsuite/Graphical Effects/main.qml
deleted file mode 100644
index b4f148b..0000000
--- a/basicsuite/Graphical Effects/main.qml
+++ /dev/null
@@ -1,191 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    id: root
-
-    width: 1280
-    height: 720
-
-    Checkers {
-        id: checkers;
-        anchors.fill: parent
-        anchors.leftMargin: list.width
-        tileSize: 32
-    }
-
-    Loader {
-        id: loader
-        anchors.fill: checkers;
-    }
-
-    Rectangle {
-        id: listBackground
-        anchors.left: parent.left
-        anchors.right: checkers.left
-        anchors.top: parent.top
-        anchors.bottom: parent.bottom
-        color: "black"
-    }
-
-    ListModel {
-        id: listModel
-        ListElement { name: "Brignthness / Contrast"; file: "effect_BrightnessContrast.qml" }
-        ListElement { name: "Colorize"; file: "effect_Colorize.qml" }
-        ListElement { name: "Displacement"; file: "effect_Displacement.qml" }
-        ListElement { name: "Drop Shadow"; file: "effect_DropShadow.qml" }
-        ListElement { name: "Gaussian Blur"; file: "effect_GaussianBlur.qml" }
-        ListElement { name: "Glow"; file: "effect_Glow.qml" }
-        ListElement { name: "Hue / Saturation"; file: "effect_HueSaturation.qml" }
-        ListElement { name: "Opacity Mask"; file: "effect_OpacityMask.qml" }
-        ListElement { name: "Threshold Mask"; file: "effect_ThresholdMask.qml" }
-        ListElement { name: "Wave (custom)"; file: "effect_CustomWave.qml" }
-        ListElement { name: "Dissolve (custom)"; file: "effect_CustomDissolve.qml" }
-    }
-
-    ListView
-    {
-        id: list
-        anchors.top: parent.top
-        anchors.left: parent.left
-        width: parent.width / 4
-        height: parent.height - width
-
-        clip: true
-        focus: true
-
-        highlightMoveDuration: 0
-
-        onCurrentItemChanged: {
-            var entry = listModel.get(currentIndex);
-            loader.source = entry.file;
-        }
-
-        model: listModel
-
-        highlight: Rectangle {
-            color: "steelblue"
-        }
-
-        delegate: Item {
-            id: delegateRoot
-
-            width: list.width
-            height: root.height * 0.05
-
-            Rectangle {
-                width: parent.width
-                height: 3
-                anchors.bottom: parent.bottom
-                gradient: Gradient {
-                    GradientStop { position: 0; color: "transparent" }
-                    GradientStop { position: 0.5; color: "lightgray" }
-                    GradientStop { position: 1; color: "transparent" }
-                }
-            }
-
-            Text {
-                color: "white"
-                font.pixelSize: parent.height * 0.5
-                anchors.verticalCenter: parent.verticalCenter
-                anchors.verticalCenterOffset: -2
-                x: parent.width * 0.1
-                text: name
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: list.currentIndex = index;
-            }
-        }
-    }
-
-    Canvas {
-        id: canvas
-        anchors.fill: controller
-        anchors.margins: 10
-
-        property real padding: 20
-
-        onPaint: {
-            var ctx = canvas.getContext("2d");
-
-            var w = canvas.width
-            var h = canvas.height;
-
-
-            ctx.fillStyle = "rgb(50, 50, 50)"
-            ctx.beginPath();
-            ctx.roundedRect(0, 0, w, h, w * 0.1, w * 0.1);
-            ctx.fill();
-
-            var margin = canvas.padding;
-            var segmentSize = 4
-            ctx.strokeStyle = "gray"
-            ctx.beginPath();
-            ctx.moveTo(margin, margin);
-            ctx.lineTo(margin, h-margin);
-            ctx.moveTo(margin, h - margin);
-            ctx.lineTo(w-margin, h - margin);
-
-            var segmentCount = 11
-            for (var i = 0; i<segmentCount; ++i) {
-                var offset = margin + i * (w - margin * 2) / (segmentCount - 1);
-                ctx.moveTo(margin - segmentSize, offset);
-                ctx.lineTo(margin + segmentSize, offset);
-                ctx.moveTo(offset, h - margin - segmentSize);
-                ctx.lineTo(offset, h - margin + segmentSize);
-            }
-
-            ctx.stroke();
-        }
-    }
-
-    Text {
-        id: labelX
-        anchors.bottom: canvas.bottom
-        x: canvas.width * 0.4
-        anchors.bottomMargin: 2
-        text: (loader.item != undefined && typeof loader.item.nameX != 'undefined' ? loader.item.nameX : "")
-              + (loader.item != undefined && typeof loader.item.feedbackX != 'undefined' ? ": " + loader.item.feedbackX.toFixed(2) : "");
-
-        color: "white"
-        font.pixelSize: canvas.padding * 0.5
-    }
-
-    Text {
-        id: labelY
-
-        anchors.verticalCenter: canvas.verticalCenter
-        anchors.verticalCenterOffset: canvas.height * 0.15
-        anchors.left: canvas.left
-        transformOrigin: Item.TopLeft
-        rotation: -90
-        text: (loader.item != undefined && typeof loader.item.nameY != 'undefined' ? loader.item.nameY : "")
-              + (loader.item != undefined && typeof loader.item.feedbackY != 'undefined' ? ": " + loader.item.feedbackY.toFixed(2) : "");
-        color: "white"
-        font.pixelSize: canvas.padding * 0.5
-    }
-
-    MouseArea {
-        id: controller
-
-        anchors.top: list.bottom;
-        anchors.left: parent.left
-        anchors.right: checkers.left
-        anchors.bottom: parent.bottom;
-
-        onPositionChanged: {
-            var effect = loader.item;
-            function bound(val) { return Math.max(0, Math.min(1, val)); }
-            if (effect != undefined) {
-                if (typeof effect.inputX != 'undefined')
-                    effect.inputX = bound(mouseX / controller.width);
-                if (typeof effect.inputY != 'undefined')
-                    effect.inputY = bound(1 - mouseY / controller.height);
-            }
-        }
-
-    }
-
-
-}
diff --git a/basicsuite/Launcher Settings/BrightnessController.qml b/basicsuite/Launcher Settings/BrightnessController.qml
deleted file mode 100644
index 84eee8b..0000000
--- a/basicsuite/Launcher Settings/BrightnessController.qml
+++ /dev/null
@@ -1,9 +0,0 @@
-import QtDroid.Utils 1.0
-import QtQuick 2.0
-
-QtObject {
-    function setBrightness(value)
-    {
-        DroidUtils.setDisplayBrightness(value)
-    }
-}
diff --git a/basicsuite/Launcher Settings/NetworkController.qml b/basicsuite/Launcher Settings/NetworkController.qml
deleted file mode 100644
index 3ec36ac..0000000
--- a/basicsuite/Launcher Settings/NetworkController.qml
+++ /dev/null
@@ -1,21 +0,0 @@
-import QtDroid.Utils 1.0
-import QtQuick 2.0
-
-QtObject {
-
-    function getIPAddress()
-    {
-        return DroidUtils.getIPAddress()
-    }
-
-    function getHostname()
-    {
-        return DroidUtils.getHostname()
-    }
-
-    function setHostname(value)
-    {
-        return DroidUtils.setHostname(value)
-    }
-
-}
diff --git a/basicsuite/Launcher Settings/PoweroffAction.qml b/basicsuite/Launcher Settings/PoweroffAction.qml
deleted file mode 100644
index fd0e215..0000000
--- a/basicsuite/Launcher Settings/PoweroffAction.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick.Controls 1.0
-import QtDroid.Utils 1.0
-
-Action
-{
-    text: "Power Off!"
-    onTriggered: DroidUtils.powerOffSystem()();
-}
diff --git a/basicsuite/Launcher Settings/RebootAction.qml b/basicsuite/Launcher Settings/RebootAction.qml
deleted file mode 100644
index cdf84a5..0000000
--- a/basicsuite/Launcher Settings/RebootAction.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick.Controls 1.0
-import QtDroid.Utils 1.0
-
-Action
-{
-    text: "Reboot"
-    onTriggered: DroidUtils.rebootSystem();
-}
diff --git a/basicsuite/Launcher Settings/main.qml b/basicsuite/Launcher Settings/main.qml
deleted file mode 100644
index 140aebb..0000000
--- a/basicsuite/Launcher Settings/main.qml
+++ /dev/null
@@ -1,152 +0,0 @@
-import QtQuick 2.0
-
-import QtQuick.Controls 1.0
-import QtQuick.Layouts 1.0
-
-Rectangle {
-    id: root;
-
-    gradient: Gradient {
-        GradientStop { position: 0; color: "white" }
-        GradientStop { position: 1; color: "lightgray" }
-    }
-
-    width: 1280
-    height: 800
-
-    property int margin: 10
-
-    Loader {
-        id: rebootActionLoader
-        source: "RebootAction.qml"
-    }
-
-    Loader {
-        id: poweroffActionLoader
-        source: "PoweroffAction.qml"
-    }
-
-    Loader {
-        id: brightnessControllerLoader
-        source: "BrightnessController.qml"
-    }
-
-    Loader {
-        id: networkControllerLoader
-        source: "NetworkController.qml"
-    }
-
-    Flickable {
-        anchors.top: parent.top
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.margins: margin
-        anchors.topMargin: 50
-        height: parent.height
-        width: mainLayout.width
-
-        contentHeight: mainLayout.height
-        contentWidth: mainLayout.width
-
-        ColumnLayout {
-            id: mainLayout
-
-            height: implicitHeight;
-            width: Math.min(root.width, root.height);
-
-            GroupBox {
-                id: powerOptions
-                title: "Power Options"
-
-                Layout.fillWidth: true
-
-                RowLayout {
-                    id: powerButtonColumn
-
-                    anchors.fill: parent
-
-                    Button {
-                        text: "Shut Down"
-                        Layout.fillWidth: true
-                        action: poweroffActionLoader.item;
-                        enabled: action != undefined
-                    }
-
-                    Button {
-                        text: "Reboot"
-                        Layout.fillWidth: true
-                        action: rebootActionLoader.item;
-                        enabled: action != undefined
-                    }
-                }
-
-            }
-
-            GroupBox {
-                id: displayOptions
-                title: "Display Options"
-
-                Layout.fillWidth: true
-
-                GridLayout {
-                    id: displayGrid
-
-                    rows: 2
-                    flow: GridLayout.TopToBottom
-                    anchors.fill: parent
-
-                    Label { text: "Brightness: "; }
-                    Label { text: "Display FPS: "; }
-
-                    Slider {
-                        maximumValue: 255
-                        minimumValue: 1
-                        value: 255
-                        Layout.fillWidth: true
-                        onValueChanged: {
-                            if (brightnessControllerLoader.item != undefined) {
-                                brightnessControllerLoader.item.setBrightness(value);
-                            }
-                        }
-                    }
-                    CheckBox {
-                        onCheckedChanged: engine.fpsEnabled = checked;
-                    }
-                }
-            }
-
-            GroupBox {
-                id: networkOptions
-                title: "Network Options"
-
-                Layout.fillWidth: true
-
-                GridLayout {
-                    id: networkGrid
-
-                    rows: 2
-                    columns: 3
-                    flow: GridLayout.TopToBottom
-                    anchors.fill: parent
-
-                    Label { text: "Hostname: "; }
-                    Label { text: "IP address: "; }
-
-                    TextField {
-                        id: hostname
-                        text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getHostname(); }
-                        Layout.fillWidth: true
-                    }
-
-                    Label { text: if (networkControllerLoader.item != undefined) { networkControllerLoader.item.getIPAddress(); } }
-
-                    Button {
-                        text: "Change hostname"
-                        onClicked: networkControllerLoader.item.setHostname(hostname.text);
-                        enabled: networkControllerLoader.item != undefined
-                    }
-
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/Launcher Settings/preview_l.jpg b/basicsuite/Launcher Settings/preview_l.jpg
deleted file mode 100644
index 118edc4..0000000
--- a/basicsuite/Launcher Settings/preview_l.jpg
+++ /dev/null
diff --git a/basicsuite/Media Player/ControlBar.qml b/basicsuite/Media Player/ControlBar.qml
deleted file mode 100755
index 1778728..0000000
--- a/basicsuite/Media Player/ControlBar.qml
+++ /dev/null
@@ -1,285 +0,0 @@
-
-import QtQuick 2.0
-import QtMultimedia 5.0
-
-Rectangle {
-    id: controlBar
-    height: 150
-    color: "#88333333"
-
-    property MediaPlayer mediaPlayer: null
-    property bool isMouseAbove: false
-
-    signal openFile()
-    signal openCamera()
-    signal openURL()
-    signal openFX()
-    signal toggleFullScreen()
-
-    state: "VISIBLE"
-
-    onMediaPlayerChanged: {
-        if (mediaPlayer === null)
-            return;
-        volumeControl.volume = mediaPlayer.volume;
-    }
-
-//    MouseArea {
-//        anchors.fill: controlBar
-//        hoverEnabled: true
-
-//        onEntered: controlBar.isMouseAbove = true;
-//        onExited: controlBar.isMouseAbove = false;
-//    }
-
-    function statusString(stat)
-    {
-        if (stat === MediaPlayer.NoMedia)
-            return "No Media";
-        else if (stat === MediaPlayer.Loading)
-            return "Loading";
-        else if (stat === MediaPlayer.Loaded)
-            return "Loaded";
-        else if (stat === MediaPlayer.Buffering)
-            return "Buffering";
-        else if (stat === MediaPlayer.Stalled)
-            return "Stalled";
-        else if (stat === MediaPlayer.Buffered)
-            return "Buffered";
-        else if (stat === MediaPlayer.EndOfMedia)
-            return "EndOfMedia";
-        else if (stat === MediaPlayer.InvalidMedia)
-            return "InvalidMedia";
-        else if (stat === MediaPlayer.UnknownStatus)
-            return "UnknownStatus";
-    }
-
-//    Text {
-//        id: statusText
-//        anchors.left: parent.left
-//        anchors.bottom: parent.top
-//        anchors.bottomMargin: 12
-//        font.pixelSize: 18
-//        color: "white"
-//        text: "Status: " + statusString(mediaPlayer.status)
-//    }
-
-//    Text {
-//        anchors.verticalCenter: statusText.verticalCenter
-//        anchors.left: statusText.right
-//        anchors.leftMargin: 16
-//        font.pixelSize: 18
-//        color: "white"
-//        text: Math.round(mediaPlayer.bufferProgress * 100.0) + "%"
-//    }
-
-    VolumeControl {
-        id: volumeControl
-        anchors.verticalCenter: playbackControl.verticalCenter
-        anchors.left: controlBar.left
-        anchors.leftMargin: 15
-        onVolumeChanged: mediaPlayer.volume = volume
-
-        Component.onCompleted: {
-            volumeControl.volume = 0.5;
-        }
-
-        Connections {
-            target: mediaPlayer
-            onVolumeChanged: volumeControl.volume = mediaPlayer.volume
-        }
-    }
-
-    //Playback Controls
-    PlaybackControl {
-        id: playbackControl
-        anchors.horizontalCenter: controlBar.horizontalCenter
-        anchors.bottom: seekControl.top
-        anchors.bottomMargin: 20
-
-        onPlayButtonPressed: {
-            if (isPlaying) {
-                mediaPlayer.pause();
-            } else {
-                mediaPlayer.play();
-            }
-        }
-
-        onReverseButtonPressed: {
-            if (mediaPlayer.seekable) {
-                //Subtract 10 seconds
-                mediaPlayer.seek(normalizeSeek(Math.round(-mediaPlayer.duration * 0.1)));
-            }
-        }
-
-        onForwardButtonPressed: {
-            if (mediaPlayer.seekable) {
-                //Add 10 seconds
-                mediaPlayer.seek(normalizeSeek(Math.round(mediaPlayer.duration * 0.1)));
-            }
-        }
-
-        onStopButtonPressed: mediaPlayer.stop();
-    }
-
-    //Toolbar Controls
-    Row {
-        id: toolbarMenuButtons
-        anchors.right: controlBar.right
-        anchors.rightMargin: 15
-        anchors.verticalCenter: playbackControl.verticalCenter
-        spacing: 22
-
-        ImageButton {
-            id: fxButton
-            imageSource: "images/FXButton.png"
-            checkable: true
-            checked: effectSelectionPanel.visible
-            onClicked: {
-                openFX();
-            }
-        }
-        ImageButton {
-            id: fileButton
-            imageSource: "images/FileButton.png"
-            onClicked: {
-                openFile();
-            }
-        }
-        ImageButton {
-            id: urlButton
-            imageSource: "images/UrlButton.png"
-            onClicked: {
-                openURL();
-            }
-        }
-    }
-
-//    ImageButton {
-//        id: fullscreenButton
-//        imageSource: "images/FullscreenButton.png"
-//        onClicked: {
-//            //Toggle fullscreen
-//            toggleFullScreen();
-//        }
-//        checkable: true
-//        checked: applicationWindow.isFullScreen
-//        anchors.right: controlBar.right
-//        anchors.top: controlBar.top
-//        anchors.rightMargin: 15
-//        anchors.topMargin: 15
-//    }
-
-    //Seek controls
-    SeekControl {
-        id: seekControl
-        anchors.bottom: controlBar.bottom
-        anchors.bottomMargin: 10
-        anchors.right: controlBar.right
-        anchors.left: controlBar.left
-        anchors.rightMargin: 15
-        anchors.leftMargin: 15
-        enabled: playbackControl.isPlaybackEnabled
-
-        duration: mediaPlayer.duration
-
-        onSeekValueChanged: {
-            mediaPlayer.seek(newPosition);
-            position = mediaPlayer.position;
-        }
-
-        Component.onCompleted: {
-            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;
-        }
-        onPlaybackStateChanged: {
-            if (mediaPlayer.playbackState === MediaPlayer.PlayingState) {
-                playbackControl.isPlaying = true;
-                applicationWindow.resetTimer();
-            } else {
-                show();
-                playbackControl.isPlaying = false;
-            }
-        }
-
-        onSeekableChanged: {
-            // console.log("seekableChanged: " + mediaPlayer.seekable);
-            seekControl.seekable = mediaPlayer.seekable;
-        }
-    }
-
-    function hide() {
-        controlBar.state = "HIDDEN";
-    }
-
-    function show() {
-        controlBar.state = "VISIBLE";
-    }
-
-    //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;
-    }
-
-    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/Media Player/ImageButton.qml b/basicsuite/Media Player/ImageButton.qml
deleted file mode 100755
index 274efd5..0000000
--- a/basicsuite/Media Player/ImageButton.qml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-import QtQuick 2.0
-
-Item {
-    id: root
-
-    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
-
-    opacity: enabled ? 1.0 : 0.3
-    signal clicked
-
-    width: image.width
-    height: image.height
-
-    Image {
-        id: image
-        anchors.centerIn: parent
-        visible: true
-        opacity: pressed ? 0.6 : 1
-        smooth: true
-    }
-
-//    ColorOverlay {
-//        id: glowEffect
-//        anchors.fill: image
-//        source: image
-//        color: pressed ? "#22000000" : checked ? "orange" : "white"
-//        visible: checked || hover || pressed
-//    }
-
-    MouseArea {
-        id: mouseArea
-        hoverEnabled: true
-        anchors.fill: root
-        onPositionChanged: applicationWindow.resetTimer()
-        onClicked: root.clicked();
-    }
-}
diff --git a/basicsuite/Media Player/Intro.qml b/basicsuite/Media Player/Intro.qml
deleted file mode 100644
index a5dbb2a..0000000
--- a/basicsuite/Media Player/Intro.qml
+++ /dev/null
@@ -1,48 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    color: "#111111"
-
-//    Image {
-//        anchors.fill: parent
-//        source: "images/gradient.png"
-//    }
-
-    Image {
-        id: logo
-        anchors.centerIn: root
-        anchors.verticalCenterOffset: -60
-        source: "images/qt-logo.png"
-        opacity: 0.5
-
-    }
-//    Rectangle {
-//        id: button
-//        opacity: mouse.containsMouse ? 1 : 0
-//        Behavior on opacity {NumberAnimation{duration: 100}}
-//        color: mouse.pressed ? "#11000000" : "#11ffffff"
-//        anchors.top: logo.bottom
-//        anchors.horizontalCenter: parent.horizontalCenter
-//        border.color: "#33ffffff"
-//        width: text.width + 40
-//        height: text.height + 4
-//        antialiasing: true
-//        radius: 4
-//        MouseArea {
-//            id: mouse
-//            anchors.fill: parent
-//            hoverEnabled: true
-//            onClicked: applicationWindow.openVideo()
-//        }
-//    }
-
-//    Text {
-//        id: text
-//        color: "#44ffffff"
-//        text: "Open File"
-//        font.bold: true
-//        font.pixelSize: 18
-//        anchors.centerIn: button
-//    }
-}
diff --git a/basicsuite/Media Player/MetadataView.qml b/basicsuite/Media Player/MetadataView.qml
deleted file mode 100644
index b0b907b..0000000
--- a/basicsuite/Media Player/MetadataView.qml
+++ /dev/null
@@ -1,173 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-
-    property variant mediaPlayer: null
-
-    anchors.fill: parent
-    color: "#AA000000"
-    Behavior on opacity { NumberAnimation { } }
-    opacity: 0
-
-    Rectangle {
-        height: column.height + 30
-        width: 500
-        color: "#BB222222"
-        anchors.centerIn: parent
-        anchors.verticalCenterOffset: -50
-
-
-        Column {
-            id: column
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.margins: 15
-            spacing: 12
-
-            Text {
-                text: "Media Type: " + (mediaPlayer ? mediaPlayer.metaData.mediaType : "")
-                visible: mediaPlayer && mediaPlayer.metaData.mediaType !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Title: " + (mediaPlayer ? mediaPlayer.metaData.title : "")
-                visible: mediaPlayer && mediaPlayer.metaData.title !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Artist: " + (mediaPlayer ? mediaPlayer.metaData.leadPerformer : "")
-                visible: mediaPlayer && mediaPlayer.metaData.leadPerformer !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Artist: " + (mediaPlayer ? mediaPlayer.metaData.contributingArtist : "")
-                visible: mediaPlayer && mediaPlayer.metaData.contributingArtist !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Album: " + (mediaPlayer ? mediaPlayer.metaData.albumTitle : "")
-                visible: mediaPlayer && mediaPlayer.metaData.albumTitle !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Album Artist: " + (mediaPlayer ? mediaPlayer.metaData.albumArtist : "")
-                visible: mediaPlayer && mediaPlayer.metaData.albumArtist !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Author: " + (mediaPlayer ? mediaPlayer.metaData.author : "")
-                visible: mediaPlayer && mediaPlayer.metaData.author !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Composer: " + (mediaPlayer ? mediaPlayer.metaData.composer : "")
-                visible: mediaPlayer && mediaPlayer.metaData.composer !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Writer: " + (mediaPlayer ? mediaPlayer.metaData.writer : "")
-                visible: mediaPlayer && mediaPlayer.metaData.writer !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Genre: " + (mediaPlayer ? mediaPlayer.metaData.genre : "")
-                visible: mediaPlayer && mediaPlayer.metaData.genre !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Track Number: " + (mediaPlayer ? mediaPlayer.metaData.trackNumber : "")
-                visible: mediaPlayer && mediaPlayer.metaData.trackNumber !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Year: " + (mediaPlayer ? mediaPlayer.metaData.year : "")
-                visible: mediaPlayer && mediaPlayer.metaData.year !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Duration: " + (mediaPlayer ? Qt.formatTime(new Date(mediaPlayer.metaData.duration), mediaPlayer.metaData.duration >= 3600000 ? "H:mm:ss" : "m:ss") : "")
-                visible: mediaPlayer && mediaPlayer.metaData.duration !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Resolution: " + (mediaPlayer && mediaPlayer.metaData.resolution !== undefined ? (mediaPlayer.metaData.resolution.width + "x" + mediaPlayer.metaData.resolution.height) : "")
-                visible: mediaPlayer && mediaPlayer.metaData.resolution !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Audio Bitrate: " + (mediaPlayer ? Math.round(mediaPlayer.metaData.audioBitRate / 1000) + " kbps"  : "")
-                visible: mediaPlayer && mediaPlayer.metaData.audioBitRate !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Video Bitrate: " + (mediaPlayer ? Math.round(mediaPlayer.metaData.videoBitRate / 1000) + " kbps" : "")
-                visible: mediaPlayer && mediaPlayer.metaData.videoBitRate !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-            Text {
-                text: "Date: " + (mediaPlayer ? Qt.formatDate(mediaPlayer.metaData.date) : "")
-                visible: mediaPlayer && mediaPlayer.metaData.date !== undefined
-                color: "white"
-                font.pixelSize: 24
-                width: parent.width
-                wrapMode: Text.WordWrap
-            }
-        }
-    }
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: root.opacity = 0
-        enabled: root.opacity !== 0
-    }
-}
diff --git a/basicsuite/Media Player/PlaybackControl.qml b/basicsuite/Media Player/PlaybackControl.qml
deleted file mode 100755
index 2dc609f..0000000
--- a/basicsuite/Media Player/PlaybackControl.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-import QtQuick 2.0
-
-Row {
-    id: root
-    spacing: 26
-    height: playButton.height
-
-    property bool isPlaybackEnabled: false
-    property bool isPlaying: false
-
-    signal forwardButtonPressed()
-    signal reverseButtonPressed()
-    signal playButtonPressed()
-    signal stopButtonPressed()
-
-    //Playback Controls
-    ImageButton {
-        id: rateReverseButton
-        enabled: isPlaybackEnabled
-        imageSource: "images/RateButtonReverse.png"
-        anchors.verticalCenter: root.verticalCenter
-        onClicked: {
-            reverseButtonPressed();
-        }
-    }
-    ImageButton {
-        id: playButton
-        enabled: isPlaybackEnabled
-        imageSource: !isPlaying ? "images/PlayButton.png" : "images/PauseButton.png"
-        anchors.verticalCenter: root.verticalCenter
-//        anchors.right: rateForwardButton.left
-//        anchors.rightMargin: 10
-        onClicked: {
-            playButtonPressed();
-        }
-    }
-//    Rectangle{
-//        enabled: isPlaybackEnabled
-//        color: "white"
-//        opacity: enabled ? 1 : 0.3
-//        width: playButton.width
-//        height: width
-//        anchors.verticalCenter: root.verticalCenter
-//        MouseArea {
-//            anchors.fill: parent
-//            onClicked: stopButtonPressed();
-//        }
-//    }
-
-    ImageButton {
-        id: rateForwardButton
-        enabled: isPlaybackEnabled
-        imageSource: "images/RateButtonForward.png"
-        anchors.verticalCenter: root.verticalCenter
-        onClicked: {
-            forwardButtonPressed();
-        }
-    }
-}
diff --git a/basicsuite/Media Player/SeekControl.qml b/basicsuite/Media Player/SeekControl.qml
deleted file mode 100755
index fa0842d..0000000
--- a/basicsuite/Media Player/SeekControl.qml
+++ /dev/null
@@ -1,83 +0,0 @@
-import QtQuick 2.0
-
-Item {
-    id: root
-    height: seekSlider.height
-
-    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
-        text: "00:00"
-        font.pixelSize: 20
-        color: "#cccccc"
-    }
-
-    Slider {
-        id: seekSlider
-        anchors.leftMargin: 30
-        anchors.rightMargin: 30
-        anchors.left: elapsedText.right
-        anchors.right: remainingText.left
-        anchors.verticalCenter: root.verticalCenter
-        mutable: root.seekable
-        enabled: root.enabled
-
-        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
-        text: "00:00"
-        font.pixelSize: 20
-        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/Media Player/Slider.qml b/basicsuite/Media Player/Slider.qml
deleted file mode 100644
index 17fd8cd..0000000
--- a/basicsuite/Media Player/Slider.qml
+++ /dev/null
@@ -1,98 +0,0 @@
-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/Media Player/UrlBar.qml b/basicsuite/Media Player/UrlBar.qml
deleted file mode 100644
index cfada41..0000000
--- a/basicsuite/Media Player/UrlBar.qml
+++ /dev/null
@@ -1,80 +0,0 @@
-import QtQuick 2.0
-
-Rectangle {
-    id: root
-    height: 50
-    signal urlAccepted(string text)
-    color: "#cc222222"
-    Behavior on opacity { NumberAnimation{} }
-    onOpacityChanged: {
-        if (opacity == 1)
-            urlInput.focus = true
-        else if (opacity == 0)
-            urlInput.focus = false
-    }
-
-    Keys.onEscapePressed: root.opacity = 0
-
-    MouseArea {
-        anchors.fill: parent
-        onClicked: root.opacity = 0
-    }
-
-    Text {
-        anchors.bottom: urlBar.top
-        anchors.left: urlBar.left
-        anchors.bottomMargin: 8
-        text: "Enter URL"
-        color: "white"
-        font.pixelSize: 20
-    }
-
-    BorderImage {
-        id: urlBar
-        source: "images/ControlBar.png"
-        border.top: 12
-        border.bottom: 12
-        border.left: 12
-        border.right: 12
-        height: 70
-        anchors.centerIn: parent
-        anchors.verticalCenterOffset: -170
-        width: 600
-
-        Rectangle {
-            anchors.fill: parent
-            anchors.margins: 16
-            color: "#66ffffff"
-            border.color: "#bbffffff"
-            radius: 2
-            antialiasing: true
-
-            TextInput {
-                id: urlInput
-                selectionColor: "#aaffffff"
-                selectedTextColor: "black"
-                selectByMouse: true
-                anchors.fill: parent
-                anchors.margins: 5
-                font.pixelSize: 24
-                color: "black"
-                text: "http://"
-                onAccepted: root.urlAccepted(urlInput.text);
-
-            }
-        }
-    }
-
-//    Rectangle {
-//        anchors.right: urlBar.left
-//        anchors.rightMargin: 32
-//        anchors.verticalCenter: urlBar.verticalCenter
-//        height: 70
-//        width: 70
-//        color: "gray"
-//        MouseArea {
-//            anchors.fill: parent
-//            onClicked: { urlInput.text = ""; urlInput.paste(); }
-//        }
-//    }
-}
diff --git a/basicsuite/Media Player/VolumeControl.qml b/basicsuite/Media Player/VolumeControl.qml
deleted file mode 100755
index e814b99..0000000
--- a/basicsuite/Media Player/VolumeControl.qml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-import QtQuick 2.0
-
-Item {
-    id: root
-    width: 210
-    height: volumeUp.height
-
-    property alias volume: volumeSlider.value
-
-    //Volume Controls
-    ImageButton {
-        id: volumeDown
-        imageSource: "images/VolumeDown.png"
-        anchors.verticalCenter: root.verticalCenter
-        anchors.left: root.left
-        scale: 1.4
-        onClicked: {
-            root.volume = 0.0;
-        }
-    }
-    Slider {
-        id: volumeSlider
-        anchors.left: volumeDown.right
-        anchors.leftMargin: 22
-        anchors.rightMargin: 22
-        anchors.right: volumeUp.left
-        maximum: 1.0
-        minimum: 0.0
-        anchors.verticalCenter: root.verticalCenter
-        anchors.verticalCenterOffset: 1
-    }
-
-    ImageButton {
-        id: volumeUp
-        imageSource: "images/VolumeUp.png"
-        anchors.verticalCenter: root.verticalCenter
-        anchors.verticalCenterOffset: 1
-        anchors.right: root.right
-        scale: 1.4
-        onClicked: {
-            root.volume = 1.0
-        }
-    }
-}
diff --git a/basicsuite/Media Player/description.txt b/basicsuite/Media Player/description.txt
deleted file mode 100644
index bf034e5..0000000
--- a/basicsuite/Media Player/description.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-The Media Player example demonstrates the use of the media playback features of Qt Multimedia with Qt Quick.
-
-It can play from a file or from Internet, both videos and music.
diff --git a/basicsuite/Photo Gallery/description.txt b/basicsuite/Photo Gallery/description.txt
deleted file mode 100644
index a619aee..0000000
--- a/basicsuite/Photo Gallery/description.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is simple photo gallery, indexing images found in /data/images.
diff --git a/basicsuite/Photo Gallery/main.qml b/basicsuite/Photo Gallery/main.qml
deleted file mode 100644
index b2779e8..0000000
--- a/basicsuite/Photo Gallery/main.qml
+++ /dev/null
@@ -1,255 +0,0 @@
-import QtQuick 2.0
-import Qt.labs.folderlistmodel 1.0
-
-Item {
-    id: root
-
-    width: 320
-    height: 480
-
-    Rectangle {
-        anchors.fill: parent
-        color: "black"
-    }
-
-    FolderListModel {
-        id: imageList
-        folder: "/data/images"
-        nameFilters: ["*.png", "*.jpg"]
-
-        showDirs: false
-    }
-
-    Text {
-        id: noImages
-        color: "white"
-        visible: grid.count == 0
-        text: "No images in " + imageList.folder
-        anchors.centerIn: parent
-    }
-
-    GridView {
-        id: grid
-
-        anchors.fill: parent
-
-        cellHeight: root.width / 3
-        cellWidth: cellHeight
-
-        model: imageList
-
-//        NumberAnimation on contentY { from: 0; to: 2000; duration: 3000; loops: 1; easing.type: Easing.InOutCubic }
-
-        delegate: Rectangle {
-
-            id: box
-            color: "white"
-            width: grid.cellWidth
-            height: grid.cellHeight
-            scale: 0.97
-            rotation: 2;
-            antialiasing: true
-
-            Rectangle {
-                id: sepia
-                color: "#b08050"
-                width: image.width
-                height: image.height
-                anchors.centerIn: parent
-
-                property real fakeOpacity: image.status == Image.Ready ? 1.5 : 0
-                Behavior on fakeOpacity { NumberAnimation { duration: 1000 } }
-
-                opacity: fakeOpacity
-                visible: image.opacity <= 0.99;
-                antialiasing: true
-            }
-
-            Image {
-                id: image
-                source: filePath
-                width: grid.cellWidth * 0.9
-                height: grid.cellHeight * 0.9
-                anchors.centerIn: sepia
-                asynchronous: true
-                opacity: sepia.fakeOpacity - .5
-                sourceSize.width: width;
-                antialiasing: true
-            }
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: {
-                    root.showBigImage(filePath, box.x - grid.contentX, box.y - grid.contentY, image);
-                }
-            }
-        }
-    }
-
-    function showBigImage(filePath, itemX, itemY, image) {
-        fakeBigImage.x = itemX;
-        fakeBigImage.y = itemY;
-        fakeBigImage.sourceSize = image.sourceSize;
-        fakeBigImage.source = filePath;
-
-        beginEnterLargeAnimation.running = true;
-    }
-
-    property int time: 500;
-    property real xPos: width < height ? 0 : width / 2 - height / 2;
-    property real yPos: width < height ? height / 2 - width / 2: 0;
-    property real size: Math.min(width, height);
-
-    states: [
-        State { name: "grid" },
-        State { name: "enter-large" },
-        State { name: "large" },
-        State { name: "exit-large" }
-    ]
-
-    SequentialAnimation {
-        id: beginEnterLargeAnimation
-        PropertyAction { target: mouseArea; property: "enabled"; value: "true" }
-        PropertyAction { target: fakeBigImage; property: "rotation"; value: 2; }
-        PropertyAction { target: fakeBigImage; property: "scale"; value: 0.97 * 0.9; }
-        PropertyAction { target: fakeBigImage; property: "width"; value: grid.cellWidth; }
-        PropertyAction { target: fakeBigImage; property: "height"; value: grid.cellHeight; }
-        PropertyAction { target: fakeBigImage; property: "visible"; value: true; }
-
-        ParallelAnimation {
-            NumberAnimation { target: fakeBigImage; property: "rotation"; to: 0; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: fakeBigImage; property: "scale"; to: 1; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: fakeBigImage; property: "x"; to: root.xPos; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: fakeBigImage; property: "y"; to: root.yPos; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: fakeBigImage; property: "width"; to: root.size; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: fakeBigImage; property: "height"; to: root.size; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: grid; property: "opacity"; to: 0; duration: root.time; easing.type: Easing.InOutCubic }
-        }
-        ScriptAction {
-            script: {
-
-                bigImage = realBigImageComponent.createObject(root);
-                bigImage.source = fakeBigImage.source;
-            }
-        }
-    }
-
-    property Item bigImage;
-    property real targetRotation: 0;
-    property real targetWidth: 0
-    property real targetHeight: 0
-    property bool bigImageShowing: false;
-
-    SequentialAnimation {
-        id: finalizeEnterLargeAnimation
-        ScriptAction { script: {
-                fakeBigImage.anchors.centerIn = root;
-            }
-        }
-        ParallelAnimation {
-            NumberAnimation { target: bigImage; property: "opacity"; to: 1; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: fakeBigImage; property: "rotation"; to: root.targetRotation; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: bigImage; property: "rotation"; to: root.targetRotation; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: fakeBigImage; property: "width"; to: root.targetWidth; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: fakeBigImage; property: "height"; to: root.targetHeight; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: bigImage; property: "width"; to: root.targetWidth; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: bigImage; property: "height"; to: root.targetHeight; duration: root.time; easing.type: Easing.InOutCubic }
-        }
-        PropertyAction { target: fakeBigImage; property: "visible"; value: false }
-        PropertyAction { target: root; property: "bigImageShowing"; value: true }
-    }
-
-    SequentialAnimation {
-        id: backToGridAnimation
-        ParallelAnimation {
-            NumberAnimation { target: bigImage; property: "opacity"; to: 0; duration: root.time; easing.type: Easing.InOutCubic }
-            NumberAnimation { target: grid; property: "opacity"; to: 1; duration: root.time; easing.type: Easing.InOutCubic }
-        }
-        PropertyAction { target: fakeBigImage; property: "source"; value: "" }
-        PropertyAction { target: root; property: "bigImageShowing"; value: false }
-        PropertyAction { target: mouseArea; property: "enabled"; value: false }
-        ScriptAction { script: {
-                bigImage.destroy();
-                fakeBigImage.anchors.centerIn = undefined
-            }
-        }
-    }
-
-    Image {
-        id: fakeBigImage
-        width: grid.cellWidth
-        height: grid.cellHeight
-        visible: false
-        antialiasing: true
-    }
-
-    Component {
-        id: realBigImageComponent
-
-        Image {
-            id: realBigImage
-
-            anchors.centerIn: parent;
-
-            asynchronous: true;
-
-            // Bound size to the current display size, to try to avoid any GL_MAX_TEXTURE_SIZE issues.
-            sourceSize: Qt.size(Math.max(root.width, root.height), Math.max(root.width, root.height));
-
-            opacity: 0
-            onStatusChanged: {
-
-                if (status != Image.Ready)
-                    return;
-
-                var imageIsLandscape = width > height;
-                var screenIsLandscape = root.width > root.height;
-
-                var targetScale;
-
-                // Rotation needed...
-                if (imageIsLandscape != screenIsLandscape && width != height) {
-                    root.targetRotation = 90;
-                    var aspect = width / height
-                    var screenAspect = root.height / root.width
-
-                    if (aspect > screenAspect) {
-                        targetScale = root.height / width
-                    } else {
-                        targetScale = root.width / height;
-                    }
-                } else {
-                    root.targetRotation = 0;
-                    var aspect = height / width;
-                    var screenAspect = root.height / root.width
-
-                    if (aspect > screenAspect) {
-                        targetScale = root.height / height
-                    } else {
-                        targetScale = root.width / width;
-                    }
-                }
-
-                root.targetWidth = width * targetScale
-                root.targetHeight = height * targetScale;
-
-                width = root.size
-                height = root.size;
-
-                finalizeEnterLargeAnimation.running = true;
-            }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        enabled: false
-
-        onClicked: {
-            if (root.bigImageShowing)
-                backToGridAnimation.running = true;
-        }
-    }
-
-}
diff --git a/basicsuite/Qt5 Cinematic Demo/Qt5_CinematicExperience.qmlproject b/basicsuite/Qt5 Cinematic Demo/Qt5_CinematicExperience.qmlproject
deleted file mode 100644
index fd24655..0000000
--- a/basicsuite/Qt5 Cinematic Demo/Qt5_CinematicExperience.qmlproject
+++ /dev/null
@@ -1,20 +0,0 @@
-/* File generated by Qt Creator, version 2.4.1 */
-
-import QmlProject 1.1
-
-Project {
-    mainFile: "Qt5_CinematicExperience.qml"
-
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ "../exampleplugin" ]
-}
diff --git a/basicsuite/Qt5 Cinematic Demo/README b/basicsuite/Qt5 Cinematic Demo/README
deleted file mode 100644
index 1f16c7e..0000000
--- a/basicsuite/Qt5 Cinematic Demo/README
+++ /dev/null
@@ -1,49 +0,0 @@
-
-INTRO
-==========
-
-This UX demo application presents some graphical features of Qt5. 
-The name 'Cinematic Experience' reflects how it's possible to build user 
-interfaces with increased dynamics.
-
-
-RUNNING
-==========
-
-To run this application you need relatively recent build of Qt5:
-- http://qt-project.org
-- http://qt.gitorious.org/qt/qt5
-
-There are two different ways to run the application:
-
-1) If your target platform contains 'qmlscene' binary, just use it:
----
-cd Qt5_CinematicExperience
-[path to Qt5]/qtbase/bin/qmlscene Qt5_CinematicExperience.qml
----
-
-2) Alternatively, a simple launcher is provided to start the application:
----
-cd Qt5_CinematicExperience
-[path to Qt5]/qtbase/bin/qmake
-make
-./Qt5_CinematicExperience
----
-
-The run application in fullscreen mode, use '--fullscreen' parameter for 
-qmlscene or launcher. If you want to tweak the window resolution, 
-modify 'width' and 'height' properties in Qt5_CinematicExperience.qml
-
-
-LICENSE
-==========
-
-Source codes are licensed under a Creative Commons Attribution 3.0 Unported 
-License. http://creativecommons.org/licenses/by/3.0/
-
-No attribution required, but feel free to mention us or 
-contact info@quitcoding.com
-
-Qt, and the Qt logo are trademarks of Nokia Corporation
-Movie reviews copyright © IMDb.com
-DVD cover icons from http://www.iconarchive.com
diff --git a/basicsuite/Qt5 Cinematic Demo/content/images/heading.png b/basicsuite/Qt5 Cinematic Demo/content/images/heading.png
deleted file mode 100644
index 509b12b..0000000
--- a/basicsuite/Qt5 Cinematic Demo/content/images/heading.png
+++ /dev/null
diff --git a/basicsuite/Qt5 Cinematic Demo/content/images/heading_big.png b/basicsuite/Qt5 Cinematic Demo/content/images/heading_big.png
deleted file mode 100644
index ec37388..0000000
--- a/basicsuite/Qt5 Cinematic Demo/content/images/heading_big.png
+++ /dev/null
diff --git a/basicsuite/Qt5 Cinematic Demo/description.txt b/basicsuite/Qt5 Cinematic Demo/description.txt
deleted file mode 100644
index 449cc28..0000000
--- a/basicsuite/Qt5 Cinematic Demo/description.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The Qt5 Cinematic Experience is a demo by "QUIt Coding", a small group of talented individuals enjoying software development with cutting edge technologies. They are official members of the Qt Ambassador Program.
-
-The demo shows off a number features of Qt Quick 2.0. A nicely styled list control with movie covers with lighting effects. Particles and transitions. The information roll-down curvy curtain and is implemented using inline GLSL in the QML file.
-
-The source code for this demo and more awesome looking Qt Quick stuff is available from quitcoding.com.
diff --git a/basicsuite/Qt5 Launch Presentation/CameraSlide.qml b/basicsuite/Qt5 Launch Presentation/CameraSlide.qml
deleted file mode 100644
index 564b467..0000000
--- a/basicsuite/Qt5 Launch Presentation/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/basicsuite/Qt5 Launch Presentation/CanvasSlide.qml b/basicsuite/Qt5 Launch Presentation/CanvasSlide.qml
deleted file mode 100644
index d972b41..0000000
--- a/basicsuite/Qt5 Launch Presentation/CanvasSlide.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 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"
-
-
-
-    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/basicsuite/Qt5 Launch Presentation/OpacityTransitionPresentation.qml b/basicsuite/Qt5 Launch Presentation/OpacityTransitionPresentation.qml
deleted file mode 100644
index dc7cc02..0000000
--- a/basicsuite/Qt5 Launch Presentation/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: deck.transitionTime; easing.type: Easing.OutQuart }
-            NumberAnimation { target: fromSlide; property: "scale"; from: 1; to: 0.7; 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: 1.1; 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 }
-    }
-
-    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/basicsuite/Qt5 Launch Presentation/VideoSlide.qml b/basicsuite/Qt5 Launch Presentation/VideoSlide.qml
deleted file mode 100644
index d5abd89..0000000
--- a/basicsuite/Qt5 Launch Presentation/VideoSlide.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
-import QtMultimedia 5
-import "presentation"
-
-import QtGraphicalEffects 1.0
-
-Slide {
-
-    id: slide
-
-    title: "Qt Multimedia - Video"
-
-    Video {
-        id: video
-
-        anchors.fill: parent
-        source: "bunny.mov"
-        autoLoad: true;
-
-        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;
-    }
-
-    NormalMapGenerator {
-        anchors.left: theItem.right
-        width: 256
-        height: 128
-        id: normalMap
-        source: theItem;
-        visible: false
-    }
-
-    centeredText: video.hasVideo ? "" : "'bunny.mov' 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/basicsuite/Qt5 Launch Presentation/WebKitSlideContent.qml b/basicsuite/Qt5 Launch Presentation/WebKitSlideContent.qml
deleted file mode 100644
index ea5a364..0000000
--- a/basicsuite/Qt5 Launch Presentation/WebKitSlideContent.qml
+++ /dev/null
@@ -1,84 +0,0 @@
-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/basicsuite/Qt5 Launch Presentation/WebkitSlide.qml b/basicsuite/Qt5 Launch Presentation/WebkitSlide.qml
deleted file mode 100644
index edb8e4c..0000000
--- a/basicsuite/Qt5 Launch Presentation/WebkitSlide.qml
+++ /dev/null
@@ -1,19 +0,0 @@
-import QtQuick 2.0
-import "presentation"
-
-Slide {
-    id: slide
-
-    title: "Qt WebKit - WebView"
-
-    Loader {
-        id: webkitLoader
-
-        anchors.fill: parent
-
-        source: "WebKitSlideContent.qml"
-    }
-
-    centeredText: webkitLoader.status == Loader.Error ? "Qt WebKit not installed or otherwise failed to load" : ""
-}
-
diff --git a/basicsuite/Qt5 Launch Presentation/description.txt b/basicsuite/Qt5 Launch Presentation/description.txt
deleted file mode 100644
index 48d03f3..0000000
--- a/basicsuite/Qt5 Launch Presentation/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/basicsuite/Qt5 Launch Presentation/particles/velocityfrommotion.qml b/basicsuite/Qt5 Launch Presentation/particles/velocityfrommotion.qml
deleted file mode 100644
index 2aa3617..0000000
--- a/basicsuite/Qt5 Launch Presentation/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/basicsuite/Qt5 Particles Demo/content/burstandpulse.qml b/basicsuite/Qt5 Particles Demo/content/burstandpulse.qml
deleted file mode 100644
index c44c8dc..0000000
--- a/basicsuite/Qt5 Particles Demo/content/burstandpulse.qml
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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 {
-    width: 320
-    height: 480
-    color: "black"
-    property bool lastWasPulse: false
-    Timer {
-        interval: 3500
-        triggeredOnStart: true
-        running: true
-        repeat: true
-        onTriggered: {
-        //! [0]
-            if (lastWasPulse) {
-                burstEmitter.burst(500);
-                lastWasPulse = false;
-            } else {
-                pulseEmitter.pulse(500);
-                lastWasPulse = true;
-            }
-        //! [0]
-        }
-    }
-    ParticleSystem {
-        id: particles
-        anchors.fill: parent
-        ImageParticle {
-            source: "../images/star.png"
-            alpha: 0
-            colorVariation: 0.6
-        }
-
-        Emitter {
-            id: burstEmitter
-            x: parent.width/2
-            y: parent.height/3
-            emitRate: 1000
-            lifeSpan: 2000
-            enabled: false
-            velocity: AngleDirection{magnitude: 64; angleVariation: 360}
-            size: 24
-            sizeVariation: 8
-            Text {
-                anchors.centerIn: parent
-                color: "white"
-                font.pixelSize: 18
-                text: "Burst"
-            }
-        }
-        Emitter {
-            id: pulseEmitter
-            x: parent.width/2
-            y: 2*parent.height/3
-            emitRate: 1000
-            lifeSpan: 2000
-            enabled: false
-            velocity: AngleDirection{magnitude: 64; angleVariation: 360}
-            size: 24
-            sizeVariation: 8
-            Text {
-                anchors.centerIn: parent
-                color: "white"
-                font.pixelSize: 18
-                text: "Pulse"
-            }
-        }
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/content/customemitter.qml b/basicsuite/Qt5 Particles Demo/content/customemitter.qml
deleted file mode 100644
index bcf7da3..0000000
--- a/basicsuite/Qt5 Particles Demo/content/customemitter.qml
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: 360
-    height: 600
-    running: true
-    Rectangle {
-        z: -1
-        anchors.fill: parent
-        color: "black"
-    }
-
-    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: "../images/particle4.png"
-        alpha: 0.0
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/content/emitmask.qml b/basicsuite/Qt5 Particles Demo/content/emitmask.qml
deleted file mode 100644
index 575f9a1..0000000
--- a/basicsuite/Qt5 Particles Demo/content/emitmask.qml
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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 {
-    color: "goldenrod"
-    width: 400
-    height: 400
-    ParticleSystem {
-        width: 300
-        height: 300
-        anchors.centerIn: parent
-
-        ImageParticle {
-            source: "../images/particle.png"
-            z: 2
-            anchors.fill: parent
-            color: "#336666CC"
-            colorVariation: 0.0
-        }
-
-        Emitter {
-            anchors.fill: parent
-            emitRate: 6000
-            lifeSpan: 720
-            size: 10
-            //! [0]
-            shape: MaskShape {
-                source: "../images/starfish_mask.png"
-            }
-            //! [0]
-        }
-
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/content/maximumemitted.qml b/basicsuite/Qt5 Particles Demo/content/maximumemitted.qml
deleted file mode 100644
index cf87159..0000000
--- a/basicsuite/Qt5 Particles Demo/content/maximumemitted.qml
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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 {
-    color: "black"
-    width: 360
-    height: 540
-    ParticleSystem {
-        id: sys
-        anchors.fill: parent
-        onEmptyChanged: if (empty) sys.pause();
-
-        ImageParticle {
-            system: sys
-            id: cp
-            source: "../images/particle.png"
-            colorVariation: 0.4
-            color: "#000000FF"
-        }
-
-        Emitter {
-            //burst on click
-            id: bursty
-            system: sys
-            enabled: ma.pressed
-            x: ma.mouseX
-            y: ma.mouseY
-            emitRate: 16000
-            maximumEmitted: 4000
-            acceleration: AngleDirection {angleVariation: 360; magnitude: 360; }
-            size: 8
-            endSize: 16
-            sizeVariation: 4
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onPressed: sys.resume()
-            id: ma
-        }
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/content/shapeanddirection.qml b/basicsuite/Qt5 Particles Demo/content/shapeanddirection.qml
deleted file mode 100644
index 9d5ea98..0000000
--- a/basicsuite/Qt5 Particles Demo/content/shapeanddirection.qml
+++ /dev/null
@@ -1,112 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: root
-    width: 360
-    height: 540
-    color: "black"
-    Image {
-        anchors.fill: parent
-        source: "../images/portal_bg.png"
-    }
-
-    ParticleSystem {
-        id: particles
-        anchors.fill: parent
-
-        ImageParticle {
-            groups: ["center","edge"]
-            anchors.fill: parent
-            source: "../images/particle.png"
-            colorVariation: 0.1
-            color: "#009999FF"
-        }
-
-        Emitter {
-            anchors.fill: parent
-            group: "center"
-            emitRate: 400
-            lifeSpan: 2000
-            size: 20
-            sizeVariation: 2
-            endSize: 0
-            //! [0]
-            shape: EllipseShape {fill: false}
-            velocity: TargetDirection {
-                targetX: root.width/2
-                targetY: root.height/2
-                proportionalMagnitude: true
-                magnitude: 0.5
-            }
-            //! [0]
-        }
-
-        Emitter {
-            anchors.fill: parent
-            group: "edge"
-            startTime: 2000
-            emitRate: 2000
-            lifeSpan: 2000
-            size: 28
-            sizeVariation: 2
-            endSize: 16
-            shape: EllipseShape {fill: false}
-            velocity: TargetDirection {
-                targetX: root.width/2
-                targetY: root.height/2
-                proportionalMagnitude: true
-                magnitude: 0.1
-                magnitudeVariation: 0.1
-            }
-            acceleration: TargetDirection {
-                targetX: root.width/2
-                targetY: root.height/2
-                targetVariation: 200
-                proportionalMagnitude: true
-                magnitude: 0.1
-                magnitudeVariation: 0.1
-            }
-        }
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/content/trailemitter.qml b/basicsuite/Qt5 Particles Demo/content/trailemitter.qml
deleted file mode 100644
index d876bbb..0000000
--- a/basicsuite/Qt5 Particles Demo/content/trailemitter.qml
+++ /dev/null
@@ -1,176 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: root
-    width: 360
-    height: 540
-    color: "black"
-
-    ParticleSystem {
-        id: particles
-        anchors.fill: parent
-
-        ImageParticle {
-            id: smoke
-            system: particles
-            anchors.fill: parent
-            groups: ["A", "B"]
-            source: "../images/particle.png"
-            colorVariation: 0
-            color: "#00111111"
-        }
-        ImageParticle {
-            id: flame
-            anchors.fill: parent
-            system: particles
-            groups: ["C", "D"]
-            source: "../images/particle.png"
-            colorVariation: 0.1
-            color: "#00ff400f"
-        }
-
-        Emitter {
-            id: fire
-            system: particles
-            group: "C"
-
-            y: parent.height
-            width: parent.width
-
-            emitRate: 350
-            lifeSpan: 3500
-
-            acceleration: PointDirection { y: -17; xVariation: 3 }
-            velocity: PointDirection {xVariation: 3}
-
-            size: 24
-            sizeVariation: 8
-            endSize: 4
-        }
-
-        TrailEmitter {
-            id: fireSmoke
-            group: "B"
-            system: particles
-            follow: "C"
-            width: root.width
-            height: root.height - 68
-
-            emitRatePerParticle: 1
-            lifeSpan: 2000
-
-            velocity: PointDirection {y:-17*6; yVariation: -17; xVariation: 3}
-            acceleration: PointDirection {xVariation: 3}
-
-            size: 36
-            sizeVariation: 8
-            endSize: 16
-        }
-
-        TrailEmitter {
-            id: fireballFlame
-            anchors.fill: parent
-            system: particles
-            group: "D"
-            follow: "E"
-
-            emitRatePerParticle: 120
-            lifeSpan: 180
-            emitWidth: TrailEmitter.ParticleSize
-            emitHeight: TrailEmitter.ParticleSize
-            emitShape: EllipseShape{}
-
-            size: 16
-            sizeVariation: 4
-            endSize: 4
-        }
-
-        TrailEmitter {
-            id: fireballSmoke
-            anchors.fill: parent
-            system: particles
-            group: "A"
-            follow: "E"
-
-            emitRatePerParticle: 128
-            lifeSpan: 2400
-            emitWidth: TrailEmitter.ParticleSize
-            emitHeight: TrailEmitter.ParticleSize
-            emitShape: EllipseShape{}
-
-            velocity: PointDirection {yVariation: 16; xVariation: 16}
-            acceleration: PointDirection {y: -16}
-
-            size: 24
-            sizeVariation: 8
-            endSize: 8
-        }
-
-        Emitter {
-            id: balls
-            system: particles
-            group: "E"
-
-            y: parent.height
-            width: parent.width
-
-            emitRate: 2
-            lifeSpan: 7000
-
-            velocity: PointDirection {y:-17*4*2; xVariation: 6*6}
-            acceleration: PointDirection {y: 17*2; xVariation: 6*6}
-
-            size: 8
-            sizeVariation: 4
-        }
-
-        Turbulence { //A bit of turbulence makes the smoke look better
-            anchors.fill: parent
-            groups: ["A","B"]
-            strength: 32
-            system: particles
-        }
-    }
-}
-
diff --git a/basicsuite/Qt5 Particles Demo/content/velocityfrommotion.qml b/basicsuite/Qt5 Particles Demo/content/velocityfrommotion.qml
deleted file mode 100644
index 40698b1..0000000
--- a/basicsuite/Qt5 Particles Demo/content/velocityfrommotion.qml
+++ /dev/null
@@ -1,312 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: root
-
-    height: 540
-    width: 360
-
-    gradient: Gradient {
-        GradientStop { position: 0; color: "#000020" }
-        GradientStop { position: 1; color: "#000000" }
-    }
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: root
-    }
-
-    ParticleSystem { id: sys1 }
-    ImageParticle {
-        system: sys1
-        source: "../images/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: "../images/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: "../images/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: "../images/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
-    }
-
-
-
-    color: "white"
-
-    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/basicsuite/Qt5 Particles Demo/doc/src/emitters.qdoc b/basicsuite/Qt5 Particles Demo/doc/src/emitters.qdoc
deleted file mode 100644
index 5644ab1..0000000
--- a/basicsuite/Qt5 Particles Demo/doc/src/emitters.qdoc
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** 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 Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-/*!
-    \title QtQuick.Particles Examples - Emitters
-    \example quick/particles/emitters
-    \brief This is a collection of examples using Emitters in the QML particle system.
-    \image qml-emitters-example.png
-
-    This is a collection of small QML examples relating to using Emitters in the particle system.
-    Each example is a small QML file emphasizing a particular element or feature.
-
-    Velocity from motion gives the effect of strong particle motion through primarily moving the emitters:
-    \snippet quick/particles/emitters/content/velocityfrommotion.qml 0
-
-    Burst and pulse calls the burst and pulse methods on two idential emitters.
-    \snippet quick/particles/emitters/content/burstandpulse.qml 0
-    Note how burst takes an argument of number of particles to emit, and pulse takes an argument of number of milliseconds to emit for.
-    This gives a slightly different behaviour, which is easy to see in this example.
-
-    Custom Emitter connects to the emitParticles signal to set arbitrary values on particle data as they're emitted;
-    \snippet quick/particles/emitters/content/customemitter.qml 0
-    This is used to emit curving particles in six rotating spokes.
-
-    Emit mask sets an image mask on the Emitter, to emit out of an arbitrary shape.
-    \snippet quick/particles/emitters/content/emitmask.qml 0
-
-    Maximum emitted emits no more than a certain number of particles at a time. This example makes it easy to see what happens when the limit is reached.
-
-    Shape and Direction emits particles out of an unfilled Ellipse shape, using a TargetDirection
-    \snippet quick/particles/emitters/content/shapeanddirection.qml 0
-    This sends the particles towards the center of the ellipse with proportional speed, keeping the ellipse outline as they move to the center.
-
-    TrailEmitter uses that element to add smoke particles to trail the fire particles in the scene.
-    \snippet quick/particles/emitters/content/customemitter.qml 0
-
-*/
diff --git a/basicsuite/Qt5 Particles Demo/main.cpp b/basicsuite/Qt5 Particles Demo/main.cpp
deleted file mode 100644
index 66e7ce4..0000000
--- a/basicsuite/Qt5 Particles Demo/main.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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$
-**
-****************************************************************************/
-#include "../../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(particles/emitters/emitters)
diff --git a/basicsuite/Qt5 Particles Demo/main.qml b/basicsuite/Qt5 Particles Demo/main.qml
deleted file mode 100644
index 2b9a338..0000000
--- a/basicsuite/Qt5 Particles Demo/main.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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 "shared" as Examples
-
-Item {
-    height: 480
-    width: 320
-    Examples.LauncherList {
-        id: ll
-        anchors.fill: parent
-        Component.onCompleted: {
-            addExample("Velocity from Motion", "Particle motion just by moving emitters",  Qt.resolvedUrl("content/velocityfrommotion.qml"));
-            addExample("Burst and Pulse", "Emit imperatively",  Qt.resolvedUrl("content/burstandpulse.qml"));
-            addExample("Custom Emitter", "Custom starting state",  Qt.resolvedUrl("content/customemitter.qml"));
-            addExample("Emit Mask", "Emit arbitrary shapes",  Qt.resolvedUrl("content/emitmask.qml"));
-            addExample("Maximum Emitted", "Put a limit on emissions",  Qt.resolvedUrl("content/maximumemitted.qml"));
-            addExample("Shape and Direction", "Creates a portal effect",  Qt.resolvedUrl("content/shapeanddirection.qml"));
-            addExample("TrailEmitter", "Emit from other particles",  Qt.resolvedUrl("content/trailemitter.qml"));
-        }
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/shared/Button.qml b/basicsuite/Qt5 Particles Demo/shared/Button.qml
deleted file mode 100644
index 9bbc01a..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/Button.qml
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: container
-
-    property string text: "Button"
-    property string subText: ""
-    signal clicked
-    property alias containsMouse: mouseArea.containsMouse
-    property alias pressed: mouseArea.pressed
-    implicitHeight: col.height
-    height: implicitHeight
-    width: buttonLabel.width + 20
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        onClicked: container.clicked()
-        hoverEnabled: true
-    }
-
-    Column {
-        spacing: 2
-        id: col
-        anchors.verticalCenter: parent.verticalCenter
-        width: parent.width
-        Text {
-            id: buttonLabel
-            anchors.left: parent.left
-            anchors.leftMargin: 10
-            anchors.right: parent.right
-            anchors.rightMargin: 10
-            text: container.text
-            color: "black"
-            font.pixelSize: 22
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            styleColor: "white"
-            style: Text.Raised
-
-        }
-        Text {
-            id: buttonLabel2
-            anchors.left: parent.left
-            anchors.leftMargin: 10
-            text: container.subText
-            wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            color: "#666"
-            font.pixelSize: 12
-        }
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/shared/LauncherList.qml b/basicsuite/Qt5 Particles Demo/shared/LauncherList.qml
deleted file mode 100644
index 4336cf3..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/LauncherList.qml
+++ /dev/null
@@ -1,148 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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 {
-    //model is a list of {"name":"somename", "url":"file:///some/url/mainfile.qml"}
-    //function used to add to model A) to enforce scheme B) to allow Qt.resolveUrl in url assignments
-
-    function addExample(name, desc, url)
-    {
-        myModel.append({"name":name, "description":desc, "url":url})
-    }
-    function hideExample()
-    {
-        ei.visible = false;
-    }
-
-    ListView {
-        clip: true
-        delegate: SimpleLauncherDelegate{exampleItem: ei}
-        model: ListModel {id:myModel}
-        anchors.fill: parent
-        visible: !ei.visible
-    }
-
-    Item {
-        id: ei
-        visible: false
-        clip: true
-        property url exampleUrl
-        onExampleUrlChanged: visible = (exampleUrl == '' ? false : true); //Setting exampleUrl automatically shows example
-        anchors.fill: parent
-        anchors.bottomMargin: 40
-        MouseArea{
-            anchors.fill: parent
-            enabled: ei.visible
-            //Eats mouse events
-        }
-        Loader{
-            focus: true
-            source: ei.exampleUrl
-            anchors.fill: parent
-        }
-    }
-    Rectangle {
-        id: bar
-        visible: ei.visible
-        anchors.bottom: parent.bottom
-        width: parent.width
-        height: 40
-
-        Rectangle {
-            height: 1
-            color: "#ccc"
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-        }
-
-        Rectangle {
-            height: 1
-            color: "#fff"
-            anchors.top: parent.top
-            anchors.topMargin: 1
-            anchors.left: parent.left
-            anchors.right: parent.right
-        }
-
-        gradient: Gradient {
-            GradientStop { position: 0 ; color: "#eee" }
-            GradientStop { position: 1 ; color: "#ccc" }
-        }
-
-        MouseArea{
-            anchors.fill: parent
-            enabled: ei.visible
-            //Eats mouse events
-        }
-
-        Image {
-            id: back
-            source: "images/back.png"
-            anchors.verticalCenter: parent.verticalCenter
-            anchors.verticalCenterOffset: 2
-            anchors.left: parent.left
-            anchors.leftMargin: 16
-
-            MouseArea {
-                id: mouse
-                hoverEnabled: true
-                anchors.centerIn: parent
-                width: 38
-                height: 31
-                anchors.verticalCenterOffset: -1
-                onClicked: ei.exampleUrl = ""
-                Rectangle {
-                    anchors.fill: parent
-                    opacity: mouse.pressed ? 1 : 0
-                    Behavior on opacity { NumberAnimation{ duration: 100 }}
-                    gradient: Gradient {
-                        GradientStop { position: 0 ; color: "#22000000" }
-                        GradientStop { position: 0.2 ; color: "#11000000" }
-                    }
-                    border.color: "darkgray"
-                    antialiasing: true
-                    radius: 4
-                }
-            }
-        }
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/shared/SimpleLauncherDelegate.qml b/basicsuite/Qt5 Particles Demo/shared/SimpleLauncherDelegate.qml
deleted file mode 100644
index e891266..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/SimpleLauncherDelegate.qml
+++ /dev/null
@@ -1,89 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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: container
-    property Item exampleItem
-    width: ListView.view.width
-    height: button.implicitHeight + 22
-
-    gradient: Gradient {
-        GradientStop {
-            position: 0
-            Behavior on color {ColorAnimation { duration: 100 }}
-            color: button.pressed ? "#e0e0e0" : "#fff"
-        }
-        GradientStop {
-            position: 1
-            Behavior on color {ColorAnimation { duration: 100 }}
-            color: button.pressed ? "#e0e0e0" : button.containsMouse ? "#f5f5f5" : "#eee"
-        }
-    }
-
-    Image {
-        id: image
-        opacity: 0.7
-        Behavior on opacity {NumberAnimation {duration: 100}}
-        source: "images/next.png"
-        anchors.verticalCenter: parent.verticalCenter
-        anchors.right: parent.right
-        anchors.rightMargin: 16
-    }
-
-    Button {
-        id: button
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.bottom: parent.bottom
-        anchors.right:image.left
-        text: name
-        subText: description
-        onClicked: exampleItem.exampleUrl = url;
-    }
-
-    Rectangle {
-        height: 1
-        color: "#ccc"
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        anchors.right: parent.right
-    }
-}
diff --git a/basicsuite/Qt5 Particles Demo/shared/shared.h b/basicsuite/Qt5 Particles Demo/shared/shared.h
deleted file mode 100644
index eab15f3..0000000
--- a/basicsuite/Qt5 Particles Demo/shared/shared.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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$
-**
-****************************************************************************/
-#include <QDir>
-#include <QGuiApplication>
-#include <QQmlEngine>
-#include <QQuickView>
-#define DECLARATIVE_EXAMPLE_MAIN(NAME) int main(int argc, char* argv[]) \
-{\
-    QGuiApplication app(argc,argv);\
-    QQuickView view;\
-    view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));\
-    view.setSource(QUrl("qrc:///" #NAME ".qml")); \
-    if (QGuiApplication::platformName() == QLatin1String("qnx") || \
-          QGuiApplication::platformName() == QLatin1String("eglfs")) {\
-        view.setResizeMode(QQuickView::SizeRootObjectToView);\
-        view.showFullScreen();\
-    } else {\
-        view.show();\
-    }\
-    return app.exec();\
-}
diff --git a/basicsuite/Qt5Everywhere/Button.qml b/basicsuite/Qt5Everywhere/Button.qml
deleted file mode 100644
index 43e93b8..0000000
--- a/basicsuite/Qt5Everywhere/Button.qml
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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/Qt5Everywhere/Cloud.qml b/basicsuite/Qt5Everywhere/Cloud.qml
deleted file mode 100644
index b399308..0000000
--- a/basicsuite/Qt5Everywhere/Cloud.qml
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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/Qt5Everywhere/DialogButton.qml b/basicsuite/Qt5Everywhere/DialogButton.qml
deleted file mode 100644
index 7f24e5d..0000000
--- a/basicsuite/Qt5Everywhere/DialogButton.qml
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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/Qt5Everywhere/Element.qml b/basicsuite/Qt5Everywhere/Element.qml
deleted file mode 100644
index 097a3fc..0000000
--- a/basicsuite/Qt5Everywhere/Element.qml
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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/Qt5Everywhere/Group.qml b/basicsuite/Qt5Everywhere/Group.qml
deleted file mode 100644
index 6ee3304..0000000
--- a/basicsuite/Qt5Everywhere/Group.qml
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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/Qt5Everywhere/HelpScreen.qml b/basicsuite/Qt5Everywhere/HelpScreen.qml
deleted file mode 100644
index 3fb540c..0000000
--- a/basicsuite/Qt5Everywhere/HelpScreen.qml
+++ /dev/null
@@ -1,329 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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.in