Fix install paths of demos and examples.

Install all demos and examples to the qtquick1 subdirectory of
the examples install location, demos under a demos folder,
declarative examples under a declarative folder and the common
viewer code under a helper folder.

This mirrors the directory structure of the src directory and
ensures the examples sources can be built from the install
location.

Task-number: QTBUG-26663
Change-Id: I406f4fa58e5f004eb1aef5902fa2d6267517943d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

521 files changed, 131 insertions, 628 deletions

diff --git a/demos/declarative/demos.qmlproject b/demos/declarative/demos.qmlproject
deleted file mode 100644
index d4909f86..00000000
--- a/demos/declarative/demos.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* 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/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
deleted file mode 100644
index ad075967..00000000
--- a/demos/declarative/minehunt/minehunt.pro
+++ /dev/null
@@ -1,48 +0,0 @@
-# Add more folders to ship with the application, here
-folder_01.source = qml/minehunt
-folder_01.target = qml
-DEPLOYMENTFOLDERS = folder_01
-
-# Additional import path used to resolve QML modules in Creator's code model
-QML_IMPORT_PATH =
-
-symbian:TARGET.UID3 = 0xE1CB8EBB
-
-# Smart Installer package's UID
-# This UID is from the protected range and therefore the package will
-# fail to install if self-signed. By default qmake uses the unprotected
-# range value if unprotected UID is defined for the application and
-# 0x2002CCCF value if protected UID is given to the application
-#symbian:DEPLOYMENT.installer_header = 0x2002CCCF
-
-symbian:{
-    TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-    include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
-    qmlminehuntfiles.files = MinehuntCore minehunt.qml
-    DEPLOYMENT += qmlminehuntfiles
-}
-
-# Allow network access on Symbian
-symbian:TARGET.CAPABILITY += NetworkServices
-
-# If your application uses the Qt Mobility libraries, uncomment the following
-# lines and add the respective components to the MOBILITY variable.
-# CONFIG += mobility
-# MOBILITY +=
-
-# Speed up launching on MeeGo/Harmattan when using applauncherd daemon
-# CONFIG += qdeclarative-boostable
-
-# Add dependency to Symbian components
-# CONFIG += qt-components
-
-HEADERS += minehunt.h
-SOURCES += main.cpp minehunt.cpp
-RESOURCES = minehunt.qrc
-
-# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/minehunt
-exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
-else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
-qtcAddDeployment()
diff --git a/demos/demos.pro b/demos/demos.pro
deleted file mode 100644
index f80ed204..00000000
--- a/demos/demos.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TEMPLATE    = subdirs
-SUBDIRS += declarative helper
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644
index 57d0aab3..00000000
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ /dev/null
@@ -1,190 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlapplicationviewer.h"
-
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtQuick1/QDeclarativeComponent>
-#include <QtQuick1/QDeclarativeEngine>
-#include <QtQuick1/QDeclarativeContext>
-#include <QtWidgets/QApplication>
-
-#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
-
-#ifdef HARMATTAN_BOOSTER
-#include <MDeclarativeCache>
-#endif
-
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-
-#include <qt_private/qdeclarativedebughelper_p.h>
-
-#if !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
-    QmlJsDebuggingEnabler()
-    {
-        QDeclarativeDebugHelper::enableDebugging();
-    }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-class QmlApplicationViewerPrivate
-{
-    QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
-
-    QString mainQmlFile;
-    QDeclarativeView *view;
-    friend class QmlApplicationViewer;
-    QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_MAC
-    if (!QDir::isAbsolutePath(path))
-        return QString::fromLatin1("%1/../Resources/%2")
-                .arg(QCoreApplication::applicationDirPath(), path);
-#else
-    const QString pathInInstallDir =
-            QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
-    if (QFileInfo(pathInInstallDir).exists())
-        return pathInInstallDir;
-#endif
-    return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
-    : QDeclarativeView(parent)
-    , d(new QmlApplicationViewerPrivate(this))
-{
-    connect(engine(), SIGNAL(quit()), SLOT(close()));
-    setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
-    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
-    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
-#endif
-#endif
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView *view, QWidget *parent)
-    : QDeclarativeView(parent)
-    , d(new QmlApplicationViewerPrivate(view))
-{
-    connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
-    view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
-    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
-    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
-    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
-#endif
-#endif
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
-    delete d;
-}
-
-QmlApplicationViewer *QmlApplicationViewer::create()
-{
-#ifdef HARMATTAN_BOOSTER
-    return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
-#else
-    return new QmlApplicationViewer();
-#endif
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
-    d->mainQmlFile = d->adjustPath(file);
-    d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
-    d->view->engine()->addImportPath(d->adjustPath(path));
-}
-
-void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
-{
-    // TODO: Needs a Qt5 implmentation
-    Q_UNUSED(orientation)
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-#if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
-    d->view->showFullScreen();
-#elif defined(Q_WS_MAEMO_5)
-    d->view->showMaximized();
-#else
-    d->view->show();
-#endif
-}
-
-QApplication *createApplication(int &argc, char **argv)
-{
-#ifdef HARMATTAN_BOOSTER
-    return MDeclarativeCache::qApplication(argc, argv);
-#else
-    return new QApplication(argc, argv);
-#endif
-}
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644
index e8e4af7b..00000000
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QtQuick1/QDeclarativeView>
-
-class QmlApplicationViewer : public QDeclarativeView
-{
-    Q_OBJECT
-
-public:
-    enum ScreenOrientation {
-        ScreenOrientationLockPortrait,
-        ScreenOrientationLockLandscape,
-        ScreenOrientationAuto
-    };
-
-    explicit QmlApplicationViewer(QWidget *parent = 0);
-    virtual ~QmlApplicationViewer();
-
-    static QmlApplicationViewer *create();
-
-    void setMainQmlFile(const QString &file);
-    void addImportPath(const QString &path);
-
-    // Note that this will only have an effect on Symbian and Fremantle.
-    void setOrientation(ScreenOrientation orientation);
-
-    void showExpanded();
-
-private:
-    explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
-    class QmlApplicationViewerPrivate *d;
-};
-
-QApplication *createApplication(int &argc, char **argv);
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri
deleted file mode 100644
index 1d1c4bdb..00000000
--- a/demos/helper/qmlapplicationviewer/qmlapplicationviewer.pri
+++ /dev/null
@@ -1,156 +0,0 @@
-# This file was generated by the Qt Quick Application wizard of Qt Creator.
-# The code below adds the QmlApplicationViewer to the project and handles the
-# activation of QML debugging.
-# It is recommended not to modify this file, since newer versions of Qt Creator
-# may offer an updated version of it.
-
-QT += quick1 widgets
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
-
-# Include JS debugger library if QMLJSDEBUGGER_PATH is set
-!isEmpty(QMLJSDEBUGGER_PATH) {
-    include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
-} else {
-    DEFINES -= QMLJSDEBUGGER
-}
-
-contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
-    DEFINES += HARMATTAN_BOOSTER
-}
-# This file was generated by an application wizard of Qt Creator.
-# The code below handles deployment to Symbian and Maemo, aswell as copying
-# of the application data to shadow build directories on desktop.
-# It is recommended not to modify this file, since newer versions of Qt Creator
-# may offer an updated version of it.
-
-defineTest(qtcAddDeployment) {
-for(deploymentfolder, DEPLOYMENTFOLDERS) {
-    item = item$${deploymentfolder}
-    itemsources = $${item}.sources
-    $$itemsources = $$eval($${deploymentfolder}.source)
-    itempath = $${item}.path
-    $$itempath= $$eval($${deploymentfolder}.target)
-    export($$itemsources)
-    export($$itempath)
-    DEPLOYMENT += $$item
-}
-
-MAINPROFILEPWD = $$_PRO_FILE_PWD_
-
-symbian {
-    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
-    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-} else:win32 {
-    copyCommand =
-    for(deploymentfolder, DEPLOYMENTFOLDERS) {
-        source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
-        source = $$replace(source, /, \\)
-        sourcePathSegments = $$split(source, \\)
-        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
-        target = $$replace(target, /, \\)
-        target ~= s,\\\\\\.?\\\\,\\,
-        !isEqual(source,$$target) {
-            !isEmpty(copyCommand):copyCommand += &&
-            isEqual(QMAKE_DIR_SEP, \\) {
-                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
-            } else {
-                source = $$replace(source, \\\\, /)
-                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
-                target = $$replace(target, \\\\, /)
-                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
-            }
-        }
-    }
-    !isEmpty(copyCommand) {
-        copyCommand = @echo Copying application data... && $$copyCommand
-        copydeploymentfolders.commands = $$copyCommand
-        first.depends = $(first) copydeploymentfolders
-        export(first.depends)
-        export(copydeploymentfolders.commands)
-        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
-    }
-} else:unix {
-    maemo5 {
-        installPrefix = /opt/$${TARGET}
-        target.path = $${installPrefix}/bin
-        desktopfile.files = $${TARGET}.desktop
-        desktopfile.path = /usr/share/applications/hildon
-        icon.files = $${TARGET}64.png
-        icon.path = /usr/share/icons/hicolor/64x64/apps
-    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
-        installPrefix = /opt/$${TARGET}
-        target.path = $${installPrefix}/bin
-        desktopfile.files = $${TARGET}_harmattan.desktop
-        desktopfile.path = /usr/share/applications
-        icon.files = $${TARGET}80.png
-        icon.path = /usr/share/icons/hicolor/80x80/apps
-    } else { # Assumed to be a Desktop Unix
-        installPrefix = $$desktopInstallPrefix
-        target.path = $${installPrefix}
-        sources.files = *.cpp *.h *.desktop *.png *.pro *.qml *.qmlproject *.svg
-        sources.path = $$desktopInstallPrefix
-        export(sources.files)
-        export(sources.path)
-        INSTALLS += sources
-        copyCommand =
-        for(deploymentfolder, DEPLOYMENTFOLDERS) {
-            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
-            source = $$replace(source, \\\\, /)
-            macx {
-                target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
-            } else {
-                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
-            }
-            target = $$replace(target, \\\\, /)
-            sourcePathSegments = $$split(source, /)
-            targetFullPath = $$target/$$last(sourcePathSegments)
-            targetFullPath ~= s,/\\.?/,/,
-            !isEqual(source,$$targetFullPath) {
-                !isEmpty(copyCommand):copyCommand += &&
-                copyCommand += $(MKDIR) \"$$target\"
-                copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
-            }
-        }
-        !isEmpty(copyCommand) {
-            copyCommand = @echo Copying application data... && $$copyCommand
-            copydeploymentfolders.commands = $$copyCommand
-            first.depends = $(first) copydeploymentfolders
-            export(first.depends)
-            export(copydeploymentfolders.commands)
-            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
-        }
-    }
-    for(deploymentfolder, DEPLOYMENTFOLDERS) {
-        item = item$${deploymentfolder}
-        itemfiles = $${item}.files
-        $$itemfiles = $$eval($${deploymentfolder}.source)
-        itempath = $${item}.path
-        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
-        export($$itemfiles)
-        export($$itempath)
-        INSTALLS += $$item
-    }
-
-    !isEmpty(desktopfile.path) {
-        export(icon.files)
-        export(icon.path)
-        export(desktopfile.files)
-        export(desktopfile.path)
-        INSTALLS += icon desktopfile
-    }
-
-    export(target.path)
-    INSTALLS += target
-}
-
-export (ICON)
-export (INSTALLS)
-export (DEPLOYMENT)
-export (TARGET.EPOCHEAPSIZE)
-export (TARGET.CAPABILITY)
-export (LIBS)
-export (QMAKE_EXTRA_TARGETS)
-}
diff --git a/demos/symbianpkgrules.pri b/demos/symbianpkgrules.pri
deleted file mode 100644
index ef6dfd84..00000000
--- a/demos/symbianpkgrules.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-!symbian: error(Only include this file for Symbian platforms)
-
-RSS_RULES ="group_name=\"QtDemos\";"
-
-nokiaVendor = "Nokia, Qt"
-vendorinfo = \
-    "; Localised Vendor name" \
-    "%{$$addLanguageDependentPkgItem(nokiaVendor)}" \
-    " " \
-    "; Unique Vendor name" \
-    ":\"$$nokiaVendor\"" \
-    " "
-
-demos_deployment.pkg_prerules += vendorinfo
-DEPLOYMENT += demos_deployment
-
-isEmpty(ICON):contains(TEMPLATE, ".*app"):contains(QT, gui):contains(CONFIG, qt):!contains(CONFIG, "no_icon") {
-    ICON = $$QT_SOURCE_TREE/src/s60installs/qt.svg
-}
diff --git a/examples/declarative/animation/basics/color-animation/color-animation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro
index 914cdb2f..2573cc55 100644
--- a/examples/declarative/animation/basics/color-animation/color-animation.pro
+++ b/examples/declarative/animation/basics/color-animation/color-animation.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE959F610
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/basics/color-animation
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/color-animation
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/basics/property-animation/property-animation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro
index 296d1980..efc9a48a 100644
--- a/examples/declarative/animation/basics/property-animation/property-animation.pro
+++ b/examples/declarative/animation/basics/property-animation/property-animation.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE4032BC6
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/basics/property-animation
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/property-animation
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
index a2fbc641..74215e21 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEB6022A4
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/behaviors/behavior-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/behaviors/behavior-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro
index 9129c2c8..af1086de 100644
--- a/examples/declarative/animation/easing/easing.pro
+++ b/examples/declarative/animation/easing/easing.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEAA54148
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/easing
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/easing
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro
index 79a6649a..5b8c53af 100644
--- a/examples/declarative/animation/states/states.pro
+++ b/examples/declarative/animation/states/states.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE9200E0A
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/states
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/states
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
index fcb9149d..0d9b33c9 100644
--- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro
@@ -10,22 +10,13 @@ SOURCES += imageprovider.cpp
 OTHER_FILES += imageprovider.json
 
 sources.files = $$SOURCES imageprovider.qml imageprovider.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/imageprovider
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/imageprovider/ImageProviderCore
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore
 
 ImageProviderCore_sources.files = \
     ImageProviderCore/qmldir 
-ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/imageprovider/ImageProviderCore
+ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/imageprovider/ImageProviderCore
 
 INSTALLS = sources ImageProviderCore_sources target
 
-symbian:{
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-    TARGET.EPOCALLOWDLLDATA = 1
-
-    importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir
-    importFiles.path = ImageProviderCore
-    DEPLOYMENT += importFiles
-}
-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
diff --git a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
index 4cc2d599..d988171b 100644
--- a/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+++ b/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
@@ -35,7 +35,7 @@ SOURCES += main.cpp
 RESOURCES += networkaccessmanagerfactory.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/networkaccessmanagerfactory
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/networkaccessmanagerfactory
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro
index d04b24c3..a0f08844 100644
--- a/examples/declarative/cppextensions/plugins/plugins.pro
+++ b/examples/declarative/cppextensions/plugins/plugins.pro
@@ -17,16 +17,11 @@ qdeclarativesources.files += \
     com/nokia/TimeExample/hour.png \
     com/nokia/TimeExample/minute.png
 
-qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/plugins/com/nokia/TimeExample
+qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample
 
 sources.files += plugins.pro plugin.cpp plugins.qml README
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/plugins/com/nokia/TimeExample
+sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins/com/nokia/TimeExample
 
 INSTALLS += qdeclarativesources sources target
 
-symbian {
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-    TARGET.EPOCALLOWDLLDATA = 1
-}
-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
index f92d1b4a..90afcd38 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
@@ -42,7 +42,7 @@ RESOURCES += \
     gridlayout.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/qgraphicslayouts/qgraphicsgridlayout
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
index 9b4e4c09..c06f8e6d 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -43,7 +43,7 @@ RESOURCES += \
     linearlayout.qrc
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/qgraphicslayouts/qgraphicslinearlayout
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
index 9c3307e6..3a451551 100644
--- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro
+++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro
@@ -10,18 +10,8 @@ SOURCES += qwidgets.cpp
 OTHER_FILES += qwidgets.json
 
 sources.files += qwidgets.pro qwidgets.cpp qwidgets.qml
-sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/plugins
-target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/plugins
+sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins
+target.path += $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/plugins
 
 INSTALLS += sources target
 
-symbian:{
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-    TARGET.EPOCALLOWDLLDATA = 1
-
-    importFiles.files = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir
-    importFiles.path = QWidgets
-
-    DEPLOYMENT += importFiles
-}
-maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
index 7bf39d09..92af7535 100644
--- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
+++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
@@ -5,7 +5,7 @@ SOURCES += main.cpp \
 HEADERS += person.h
 RESOURCES += adding.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/adding
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS adding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/adding
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/adding
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
index a489df5a..ab1bd45f 100644
--- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
+++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += attached.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/attached
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS attached.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/attached
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/attached
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
index 43a652ff..b818f79d 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
+++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
@@ -9,7 +9,7 @@ HEADERS += person.h \
            happybirthdaysong.h
 RESOURCES += binding.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/binding
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS binding.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/binding
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/binding
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
index 217195f5..882a71b9 100644
--- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
+++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += coercion.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/coercion
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS coercion.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/coercion
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/coercion
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro
index d73aa522..0244f8bb 100644
--- a/examples/declarative/cppextensions/referenceexamples/default/default.pro
+++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += default.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/default
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS default.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/default
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/default
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
index bacace58..ffc161ad 100644
--- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
+++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
@@ -5,7 +5,7 @@ SOURCES += main.cpp \
 HEADERS += lineedit.h
 RESOURCES += extended.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/extended
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extended.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/extended
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/extended
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
index 1078611a..0ce0bad9 100644
--- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
+++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += grouped.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/grouped
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grouped.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/grouped
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/grouped
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
index 8c84e238..8c8288a3 100644
--- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
+++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += methods.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/methods
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS methods.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/methods
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/methods
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
index 53acba31..13f8bb0f 100644
--- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
+++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += properties.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/properties
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS properties.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/properties
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/properties
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
index 4d9cf168..3baff92e 100644
--- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
+++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
@@ -7,7 +7,7 @@ HEADERS += person.h \
            birthdayparty.h
 RESOURCES += signal.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/signal
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS signal.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/signal
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/signal
 INSTALLS += target sources
diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
index df638b4e..6db7514f 100644
--- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
+++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
@@ -9,7 +9,7 @@ HEADERS += person.h \
            happybirthdaysong.h
 RESOURCES += valuesource.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/valuesource
+target.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS valuesource.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/cppextensions/referenceexamples/valuesource
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/cppextensions/referenceexamples/valuesource
 INSTALLS += target sources
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index 2f6bfc39..b4e8f07c 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -28,5 +28,5 @@ sources.files = \
    cppextensions \
    xml
 
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative
 INSTALLS += sources
diff --git a/examples/declarative/i18n/i18n.pro b/examples/declarative/i18n/i18n.pro
index 2dd0b9b8..74773cc8 100644
--- a/examples/declarative/i18n/i18n.pro
+++ b/examples/declarative/i18n/i18n.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE069582C
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/i18n
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/i18n
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/examples/declarative/imageelements/borderimage/borderimage.pro b/examples/declarative/imageelements/borderimage/borderimage.pro
index e4aff0d3..fc7ae0b3 100644
--- a/examples/declarative/imageelements/borderimage/borderimage.pro
+++ b/examples/declarative/imageelements/borderimage/borderimage.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEBB4D123
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/imageelements/borderimage
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/borderimage
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/imageelements/image/image.pro b/examples/declarative/imageelements/image/image.pro
index 8f20751e..297d3d4a 100644
--- a/examples/declarative/imageelements/image/image.pro
+++ b/examples/declarative/imageelements/image/image.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE5D64785
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/imageelements/image
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/image
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/imageelements/shadows/shadows.pro b/examples/declarative/imageelements/shadows/shadows.pro
index 71b4f6b6..b817bf79 100644
--- a/examples/declarative/imageelements/shadows/shadows.pro
+++ b/examples/declarative/imageelements/shadows/shadows.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE2C00C58
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/imageelements/shadows
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/imageelements/shadows
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/keyinteraction/focus/focus.pro b/examples/declarative/keyinteraction/focus/focus.pro
index 09806605..94ca6950 100644
--- a/examples/declarative/keyinteraction/focus/focus.pro
+++ b/examples/declarative/keyinteraction/focus/focus.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEC9F742D
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/keyinteraction/focus
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/keyinteraction/focus
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
index de2b8b1f..1c6b132c 100644
--- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
+++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro
@@ -36,7 +36,7 @@ SOURCES = main.cpp model.cpp
 HEADERS = model.h
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/abstractitemmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/abstractitemmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/gridview/gridview.pro b/examples/declarative/modelviews/gridview/gridview.pro
index 09927b53..950ebb1b 100644
--- a/examples/declarative/modelviews/gridview/gridview.pro
+++ b/examples/declarative/modelviews/gridview/gridview.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE53E8FDC
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/gridview-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/gridview-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
index 97528489..43e1ec47 100644
--- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
+++ b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE49D962F
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/listview/dynamiclist
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/dynamiclist
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
index 25d907a8..15aa8383 100644
--- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
+++ b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEEA16F93
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/listview/expandingdelegates
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/expandingdelegates
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/highlight/highlight.pro b/examples/declarative/modelviews/listview/highlight/highlight.pro
index 002ffd06..6611c352 100644
--- a/examples/declarative/modelviews/listview/highlight/highlight.pro
+++ b/examples/declarative/modelviews/listview/highlight/highlight.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE9439941
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/listview/highlight
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlight
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
index 418c08d6..a02ea9b4 100644
--- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
+++ b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE7A0AE23
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/listview/highlightranges
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/highlightranges
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/listview/sections/sections.pro b/examples/declarative/modelviews/listview/sections/sections.pro
index c1014b17..f515250d 100644
--- a/examples/declarative/modelviews/listview/sections/sections.pro
+++ b/examples/declarative/modelviews/listview/sections/sections.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEA0874F7
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/listview/sections
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/listview/sections
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
index 5b3c2588..97ce4f31 100644
--- a/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
+++ b/examples/declarative/modelviews/objectlistmodel/objectlistmodel.pro
@@ -37,7 +37,7 @@ SOURCES += main.cpp \
 HEADERS += dataobject.h
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/objectlistmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/objectlistmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/package/package.pro b/examples/declarative/modelviews/package/package.pro
index 2205fdc7..f510fde7 100644
--- a/examples/declarative/modelviews/package/package.pro
+++ b/examples/declarative/modelviews/package/package.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/package
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/package
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/parallax/parallax.pro b/examples/declarative/modelviews/parallax/parallax.pro
index 820e1060..3eff0134 100644
--- a/examples/declarative/modelviews/parallax/parallax.pro
+++ b/examples/declarative/modelviews/parallax/parallax.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/parallax
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/parallax
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/pathview/pathview.pro b/examples/declarative/modelviews/pathview/pathview.pro
index c18da644..62fabf16 100644
--- a/examples/declarative/modelviews/pathview/pathview.pro
+++ b/examples/declarative/modelviews/pathview/pathview.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE51EA833
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/pathview-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/pathview-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
index 5957300b..47431445 100644
--- a/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
+++ b/examples/declarative/modelviews/stringlistmodel/stringlistmodel.pro
@@ -35,7 +35,7 @@ QT += widgets
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/stringlistmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/stringlistmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
index a960019b..1a015e87 100644
--- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
+++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE722A922
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/modelviews/visualitemmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/modelviews/visualitemmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/positioners/positioners.pro b/examples/declarative/positioners/positioners.pro
index a050ec53..ab648a29 100644
--- a/examples/declarative/positioners/positioners.pro
+++ b/examples/declarative/positioners/positioners.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE6D726D3
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/positioners
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/positioners
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/examples/declarative/shadereffects/shadereffects.pro b/examples/declarative/shadereffects/shadereffects.pro
index 9cab9edb..c4554347 100644
--- a/examples/declarative/shadereffects/shadereffects.pro
+++ b/examples/declarative/shadereffects/shadereffects.pro
@@ -39,7 +39,7 @@ symbian {
 }
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/shadereffects
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/shadereffects
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/examples/declarative/sqllocalstorage/sqllocalstorage.pro b/examples/declarative/sqllocalstorage/sqllocalstorage.pro
index 14749b85..54633fa4 100644
--- a/examples/declarative/sqllocalstorage/sqllocalstorage.pro
+++ b/examples/declarative/sqllocalstorage/sqllocalstorage.pro
@@ -34,7 +34,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/sqllocalstorage
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/sqllocalstorage
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/examples/declarative/text/fonts/availableFonts/availableFonts.pro b/examples/declarative/text/fonts/availableFonts/availableFonts.pro
index 45240e5c..63b78924 100644
--- a/examples/declarative/text/fonts/availableFonts/availableFonts.pro
+++ b/examples/declarative/text/fonts/availableFonts/availableFonts.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE696D9F7
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/text/fonts/availableFonts
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/availableFonts
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/banner/banner.pro b/examples/declarative/text/fonts/banner/banner.pro
index b15d1004..67b95824 100644
--- a/examples/declarative/text/fonts/banner/banner.pro
+++ b/examples/declarative/text/fonts/banner/banner.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEBAA8CBE
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/text/fonts/banner
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/banner
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/fonts/fonts.pro b/examples/declarative/text/fonts/fonts/fonts.pro
index db85f3a9..00f02df8 100644
--- a/examples/declarative/text/fonts/fonts/fonts.pro
+++ b/examples/declarative/text/fonts/fonts/fonts.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE4CA52B6
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/text/fonts/fonts
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/fonts
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/fonts/hello/hello.pro b/examples/declarative/text/fonts/hello/hello.pro
index 15a8874a..f53a634a 100644
--- a/examples/declarative/text/fonts/hello/hello.pro
+++ b/examples/declarative/text/fonts/hello/hello.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE4A6D856
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/text/fonts/hello
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/fonts/hello
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/text/textselection/textselection.pro b/examples/declarative/text/textselection/textselection.pro
index 918c8e2e..c7d7bf7c 100644
--- a/examples/declarative/text/textselection/textselection.pro
+++ b/examples/declarative/text/textselection/textselection.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEFBED80D
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/text/textselection
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/text/textselection
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
index d2a860bd..a6a86641 100644
--- a/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
+++ b/examples/declarative/threading/threadedlistmodel/threadedlistmodel.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/threading/threadedlistmodel
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/threadedlistmodel
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/threading/workerscript/workerscript.pro b/examples/declarative/threading/workerscript/workerscript.pro
index aa7e52de..3ec5d845 100644
--- a/examples/declarative/threading/workerscript/workerscript.pro
+++ b/examples/declarative/threading/workerscript/workerscript.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/threading/workerscript
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/threading/workerscript
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
index b6a6236e..3275e289 100644
--- a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
+++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimentalgestures.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE3FF6816
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/touchinteraction/gestures/experimental-gestures
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/gestures/experimental-gestures
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
index 017e516d..87ffad0a 100644
--- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
+++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/mouseareaexample.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xECA7EEBE
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/touchinteraction/mousearea/mousearea-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/mousearea/mousearea-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/touchinteraction/pincharea/pincharea.pro b/examples/declarative/touchinteraction/pincharea/pincharea.pro
index 551b2277..5c807c18 100644
--- a/examples/declarative/touchinteraction/pincharea/pincharea.pro
+++ b/examples/declarative/touchinteraction/pincharea/pincharea.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/touchinteraction/pincharea
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/touchinteraction/pincharea
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/clocks/clocks.pro b/examples/declarative/toys/clocks/clocks.pro
index e1c26292..db063411 100644
--- a/examples/declarative/toys/clocks/clocks.pro
+++ b/examples/declarative/toys/clocks/clocks.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE96223F9
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/toys/clocks
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/clocks
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/corkboards/corkboards.pro b/examples/declarative/toys/corkboards/corkboards.pro
index a685704a..33951293 100644
--- a/examples/declarative/toys/corkboards/corkboards.pro
+++ b/examples/declarative/toys/corkboards/corkboards.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEAF97D84
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/toys/corkboards
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/corkboards
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.pro b/examples/declarative/toys/dynamicscene/dynamicscene.pro
index 401819a2..6eb8a90e 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.pro
+++ b/examples/declarative/toys/dynamicscene/dynamicscene.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEE509F2D
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/toys/dynamicscene
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/dynamicscene
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/tic-tac-toe/tictactoe.pro b/examples/declarative/toys/tic-tac-toe/tictactoe.pro
index 38bd456a..b3878323 100644
--- a/examples/declarative/toys/tic-tac-toe/tictactoe.pro
+++ b/examples/declarative/toys/tic-tac-toe/tictactoe.pro
@@ -36,7 +36,7 @@ TARGET = tic-tac-toe
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/toys/tic-tac-toe
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tic-tac-toe
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/toys/tvtennis/tvtennis.pro b/examples/declarative/toys/tvtennis/tvtennis.pro
index 543e4ed0..b285a87e 100644
--- a/examples/declarative/toys/tvtennis/tvtennis.pro
+++ b/examples/declarative/toys/tvtennis/tvtennis.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE6511DAE
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/toys/tvtennis
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/toys/tvtennis
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
index b6b2afbb..f07b9614 100644
--- a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
+++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEB1C54E8
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/dialcontrol
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/dialcontrol
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/flipable/flipable.pro b/examples/declarative/ui-components/flipable/flipable.pro
index 5647772a..f92f0865 100644
--- a/examples/declarative/ui-components/flipable/flipable.pro
+++ b/examples/declarative/ui-components/flipable/flipable.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE31D80B6
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/flipable
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/flipable
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/main/main.pro b/examples/declarative/ui-components/main/main.pro
index 9f930321..70f036a3 100644
--- a/examples/declarative/ui-components/main/main.pro
+++ b/examples/declarative/ui-components/main/main.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE647B679
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/main
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/main
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/progressbar/progressbar.pro b/examples/declarative/ui-components/progressbar/progressbar.pro
index f46d40d5..296daa28 100644
--- a/examples/declarative/ui-components/progressbar/progressbar.pro
+++ b/examples/declarative/ui-components/progressbar/progressbar.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEAA2206D
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/progressbar
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/progressbar
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/scrollbar/scrollbar.pro b/examples/declarative/ui-components/scrollbar/scrollbar.pro
index d8af272c..8a43c7a1 100644
--- a/examples/declarative/ui-components/scrollbar/scrollbar.pro
+++ b/examples/declarative/ui-components/scrollbar/scrollbar.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/scrollbar
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/scrollbar
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/searchbox/searchbox.pro b/examples/declarative/ui-components/searchbox/searchbox.pro
index 9ca4069b..10772693 100644
--- a/examples/declarative/ui-components/searchbox/searchbox.pro
+++ b/examples/declarative/ui-components/searchbox/searchbox.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/searchbox
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/searchbox
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.pro b/examples/declarative/ui-components/slideswitch/slideswitch.pro
index 3aae49a2..547064d8 100644
--- a/examples/declarative/ui-components/slideswitch/slideswitch.pro
+++ b/examples/declarative/ui-components/slideswitch/slideswitch.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xEAB2005A
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/slideswitch
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/slideswitch
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/spinner/spinner.pro b/examples/declarative/ui-components/spinner/spinner.pro
index 0390a3c3..445e6343 100644
--- a/examples/declarative/ui-components/spinner/spinner.pro
+++ b/examples/declarative/ui-components/spinner/spinner.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/spinner
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/spinner
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/ui-components/tabwidget/tabwidget.pro b/examples/declarative/ui-components/tabwidget/tabwidget.pro
index 9ddfff40..1a1fff28 100644
--- a/examples/declarative/ui-components/tabwidget/tabwidget.pro
+++ b/examples/declarative/ui-components/tabwidget/tabwidget.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/ui-components/tabwidget
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/ui-components/tabwidget
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
index 2045c988..9034add7 100644
--- a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
+++ b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro
@@ -35,7 +35,7 @@ symbian:TARGET.UID3 = 0xE83495FC
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/xml/xmlhttprequest-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/xml/xmlhttprequest-example
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/calculator/calculator.desktop b/examples/demos/calculator/calculator.desktop
index 854120f2..854120f2 100644
--- a/demos/declarative/calculator/calculator.desktop
+++ b/examples/demos/calculator/calculator.desktop
diff --git a/demos/declarative/calculator/calculator.pro b/examples/demos/calculator/calculator.pro
index c41b6000..62425195 100644
--- a/demos/declarative/calculator/calculator.pro
+++ b/examples/demos/calculator/calculator.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/calculator
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/calculator
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/calculator/calculator.qmlproject b/examples/demos/calculator/calculator.qmlproject
index 88ca3caa..88ca3caa 100644
--- a/demos/declarative/calculator/calculator.qmlproject
+++ b/examples/demos/calculator/calculator.qmlproject
diff --git a/demos/declarative/calculator/calculator.svg b/examples/demos/calculator/calculator.svg
index 566acfad..566acfad 100644
--- a/demos/declarative/calculator/calculator.svg
+++ b/examples/demos/calculator/calculator.svg
diff --git a/demos/declarative/calculator/calculator64.png b/examples/demos/calculator/calculator64.png
index 707d5c4e..707d5c4e 100644
--- a/demos/declarative/calculator/calculator64.png
+++ b/examples/demos/calculator/calculator64.png
diff --git a/demos/declarative/calculator/calculator80.png b/examples/demos/calculator/calculator80.png
index 6ad8096c..6ad8096c 100644
--- a/demos/declarative/calculator/calculator80.png
+++ b/examples/demos/calculator/calculator80.png
diff --git a/demos/declarative/calculator/calculator_harmattan.desktop b/examples/demos/calculator/calculator_harmattan.desktop
index 574521d8..574521d8 100644
--- a/demos/declarative/calculator/calculator_harmattan.desktop
+++ b/examples/demos/calculator/calculator_harmattan.desktop
diff --git a/demos/declarative/calculator/main.cpp b/examples/demos/calculator/main.cpp
index 1a4a4804..1a4a4804 100644
--- a/demos/declarative/calculator/main.cpp
+++ b/examples/demos/calculator/main.cpp
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/Button.qml b/examples/demos/calculator/qml/calculator/CalculatorCore/Button.qml
index 8dd9c5ae..8dd9c5ae 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/Button.qml
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/Button.qml
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/Display.qml b/examples/demos/calculator/qml/calculator/CalculatorCore/Display.qml
index ead9856c..ead9856c 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/Display.qml
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/Display.qml
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/calculator.js b/examples/demos/calculator/qml/calculator/CalculatorCore/calculator.js
index 7c363c7f..7c363c7f 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/calculator.js
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/calculator.js
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-.png b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-.png
index 544e5145..544e5145 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-.png
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-.png
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-blue.png b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-blue.png
index 5f92de32..5f92de32 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-blue.png
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-blue.png
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-green.png b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-green.png
index 36c93914..36c93914 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-green.png
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-green.png
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-purple.png b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-purple.png
index 347cbbea..347cbbea 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-purple.png
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-purple.png
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-red.png b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-red.png
index 3b335891..3b335891 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/button-red.png
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/images/button-red.png
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/display.png b/examples/demos/calculator/qml/calculator/CalculatorCore/images/display.png
index 9507f438..9507f438 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/images/display.png
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/images/display.png
diff --git a/demos/declarative/calculator/qml/calculator/CalculatorCore/qmldir b/examples/demos/calculator/qml/calculator/CalculatorCore/qmldir
index a926b93f..a926b93f 100644
--- a/demos/declarative/calculator/qml/calculator/CalculatorCore/qmldir
+++ b/examples/demos/calculator/qml/calculator/CalculatorCore/qmldir
diff --git a/demos/declarative/calculator/qml/calculator/calculator.qml b/examples/demos/calculator/qml/calculator/calculator.qml
index 90ba67b1..90ba67b1 100644
--- a/demos/declarative/calculator/qml/calculator/calculator.qml
+++ b/examples/demos/calculator/qml/calculator/calculator.qml
diff --git a/demos/declarative/declarative.pro b/examples/demos/demos.pro
index 6a636a7f..6a636a7f 100644
--- a/demos/declarative/declarative.pro
+++ b/examples/demos/demos.pro
diff --git a/demos/declarative/flickr/flickr.desktop b/examples/demos/flickr/flickr.desktop
index 8467f39b..8467f39b 100644
--- a/demos/declarative/flickr/flickr.desktop
+++ b/examples/demos/flickr/flickr.desktop
diff --git a/demos/declarative/flickr/flickr.pro b/examples/demos/flickr/flickr.pro
index d607fa0b..753c1cea 100644
--- a/demos/declarative/flickr/flickr.pro
+++ b/examples/demos/flickr/flickr.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/flickr
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/flickr
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/flickr/flickr.qmlproject b/examples/demos/flickr/flickr.qmlproject
index 3a6d8210..3a6d8210 100644
--- a/demos/declarative/flickr/flickr.qmlproject
+++ b/examples/demos/flickr/flickr.qmlproject
diff --git a/demos/declarative/flickr/flickr.svg b/examples/demos/flickr/flickr.svg
index 566acfad..566acfad 100644
--- a/demos/declarative/flickr/flickr.svg
+++ b/examples/demos/flickr/flickr.svg
diff --git a/demos/declarative/flickr/flickr64.png b/examples/demos/flickr/flickr64.png
index 707d5c4e..707d5c4e 100644
--- a/demos/declarative/flickr/flickr64.png
+++ b/examples/demos/flickr/flickr64.png
diff --git a/demos/declarative/flickr/flickr80.png b/examples/demos/flickr/flickr80.png
index 6ad8096c..6ad8096c 100644
--- a/demos/declarative/flickr/flickr80.png
+++ b/examples/demos/flickr/flickr80.png
diff --git a/demos/declarative/flickr/flickr_harmattan.desktop b/examples/demos/flickr/flickr_harmattan.desktop
index 19cf6264..19cf6264 100644
--- a/demos/declarative/flickr/flickr_harmattan.desktop
+++ b/examples/demos/flickr/flickr_harmattan.desktop
diff --git a/demos/declarative/flickr/main.cpp b/examples/demos/flickr/main.cpp
index b296f720..b296f720 100644
--- a/demos/declarative/flickr/main.cpp
+++ b/examples/demos/flickr/main.cpp
diff --git a/demos/declarative/flickr/qml/flickr/common/Progress.qml b/examples/demos/flickr/qml/flickr/common/Progress.qml
index 8f7b2dc7..8f7b2dc7 100644
--- a/demos/declarative/flickr/qml/flickr/common/Progress.qml
+++ b/examples/demos/flickr/qml/flickr/common/Progress.qml
diff --git a/demos/declarative/flickr/qml/flickr/common/RssModel.qml b/examples/demos/flickr/qml/flickr/common/RssModel.qml
index 7ac51b8b..7ac51b8b 100644
--- a/demos/declarative/flickr/qml/flickr/common/RssModel.qml
+++ b/examples/demos/flickr/qml/flickr/common/RssModel.qml
diff --git a/demos/declarative/flickr/qml/flickr/common/ScrollBar.qml b/examples/demos/flickr/qml/flickr/common/ScrollBar.qml
index f2cf6e15..f2cf6e15 100644
--- a/demos/declarative/flickr/qml/flickr/common/ScrollBar.qml
+++ b/examples/demos/flickr/qml/flickr/common/ScrollBar.qml
diff --git a/demos/declarative/flickr/qml/flickr/common/Slider.qml b/examples/demos/flickr/qml/flickr/common/Slider.qml
index ff1863b8..ff1863b8 100644
--- a/demos/declarative/flickr/qml/flickr/common/Slider.qml
+++ b/examples/demos/flickr/qml/flickr/common/Slider.qml
diff --git a/demos/declarative/flickr/qml/flickr/common/qmldir b/examples/demos/flickr/qml/flickr/common/qmldir
index adc2479b..adc2479b 100644
--- a/demos/declarative/flickr/qml/flickr/common/qmldir
+++ b/examples/demos/flickr/qml/flickr/common/qmldir
diff --git a/demos/declarative/flickr/qml/flickr/flickr-90.qml b/examples/demos/flickr/qml/flickr/flickr-90.qml
index 51cf6a1b..51cf6a1b 100644
--- a/demos/declarative/flickr/qml/flickr/flickr-90.qml
+++ b/examples/demos/flickr/qml/flickr/flickr-90.qml
diff --git a/demos/declarative/flickr/qml/flickr/flickr.qml b/examples/demos/flickr/qml/flickr/flickr.qml
index 77c743dc..77c743dc 100644
--- a/demos/declarative/flickr/qml/flickr/flickr.qml
+++ b/examples/demos/flickr/qml/flickr/flickr.qml
diff --git a/demos/declarative/flickr/qml/flickr/mobile/Button.qml b/examples/demos/flickr/qml/flickr/mobile/Button.qml
index 406e2b8b..406e2b8b 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/Button.qml
+++ b/examples/demos/flickr/qml/flickr/mobile/Button.qml
diff --git a/demos/declarative/flickr/qml/flickr/mobile/GridDelegate.qml b/examples/demos/flickr/qml/flickr/mobile/GridDelegate.qml
index a93a9b57..a93a9b57 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/GridDelegate.qml
+++ b/examples/demos/flickr/qml/flickr/mobile/GridDelegate.qml
diff --git a/demos/declarative/flickr/qml/flickr/mobile/ImageDetails.qml b/examples/demos/flickr/qml/flickr/mobile/ImageDetails.qml
index 04b69e1c..04b69e1c 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/ImageDetails.qml
+++ b/examples/demos/flickr/qml/flickr/mobile/ImageDetails.qml
diff --git a/demos/declarative/flickr/qml/flickr/mobile/ListDelegate.qml b/examples/demos/flickr/qml/flickr/mobile/ListDelegate.qml
index 3c3950ba..3c3950ba 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/ListDelegate.qml
+++ b/examples/demos/flickr/qml/flickr/mobile/ListDelegate.qml
diff --git a/demos/declarative/flickr/qml/flickr/mobile/TitleBar.qml b/examples/demos/flickr/qml/flickr/mobile/TitleBar.qml
index c6b32c93..c6b32c93 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/TitleBar.qml
+++ b/examples/demos/flickr/qml/flickr/mobile/TitleBar.qml
diff --git a/demos/declarative/flickr/qml/flickr/mobile/ToolBar.qml b/examples/demos/flickr/qml/flickr/mobile/ToolBar.qml
index 204359fe..204359fe 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/ToolBar.qml
+++ b/examples/demos/flickr/qml/flickr/mobile/ToolBar.qml
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/gloss.png b/examples/demos/flickr/qml/flickr/mobile/images/gloss.png
index 5d370cd9..5d370cd9 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/gloss.png
+++ b/examples/demos/flickr/qml/flickr/mobile/images/gloss.png
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/lineedit.png b/examples/demos/flickr/qml/flickr/mobile/images/lineedit.png
index 2cc38dc3..2cc38dc3 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/lineedit.png
+++ b/examples/demos/flickr/qml/flickr/mobile/images/lineedit.png
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/lineedit.sci b/examples/demos/flickr/qml/flickr/mobile/images/lineedit.sci
index 054bff78..054bff78 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/lineedit.sci
+++ b/examples/demos/flickr/qml/flickr/mobile/images/lineedit.sci
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/quit.png b/examples/demos/flickr/qml/flickr/mobile/images/quit.png
index 5bda1b6e..5bda1b6e 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/quit.png
+++ b/examples/demos/flickr/qml/flickr/mobile/images/quit.png
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/stripes.png b/examples/demos/flickr/qml/flickr/mobile/images/stripes.png
index 9f36727e..9f36727e 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/stripes.png
+++ b/examples/demos/flickr/qml/flickr/mobile/images/stripes.png
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/titlebar.png b/examples/demos/flickr/qml/flickr/mobile/images/titlebar.png
index 51c90082..51c90082 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/titlebar.png
+++ b/examples/demos/flickr/qml/flickr/mobile/images/titlebar.png
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/titlebar.sci b/examples/demos/flickr/qml/flickr/mobile/images/titlebar.sci
index 0418d94c..0418d94c 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/titlebar.sci
+++ b/examples/demos/flickr/qml/flickr/mobile/images/titlebar.sci
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/toolbutton.png b/examples/demos/flickr/qml/flickr/mobile/images/toolbutton.png
index 11310013..11310013 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/toolbutton.png
+++ b/examples/demos/flickr/qml/flickr/mobile/images/toolbutton.png
diff --git a/demos/declarative/flickr/qml/flickr/mobile/images/toolbutton.sci b/examples/demos/flickr/qml/flickr/mobile/images/toolbutton.sci
index 9e4f9653..9e4f9653 100644
--- a/demos/declarative/flickr/qml/flickr/mobile/images/toolbutton.sci
+++ b/examples/demos/flickr/qml/flickr/mobile/images/toolbutton.sci
diff --git a/demos/declarative/minehunt/README b/examples/demos/minehunt/README
index 3849ca5f..3849ca5f 100644
--- a/demos/declarative/minehunt/README
+++ b/examples/demos/minehunt/README
diff --git a/demos/declarative/minehunt/main.cpp b/examples/demos/minehunt/main.cpp
index 7d1e8c5c..7d1e8c5c 100644
--- a/demos/declarative/minehunt/main.cpp
+++ b/examples/demos/minehunt/main.cpp
diff --git a/demos/declarative/minehunt/minehunt.cpp b/examples/demos/minehunt/minehunt.cpp
index facbec37..facbec37 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/examples/demos/minehunt/minehunt.cpp
diff --git a/demos/declarative/minehunt/minehunt.h b/examples/demos/minehunt/minehunt.h
index a0ae23fa..a0ae23fa 100644
--- a/demos/declarative/minehunt/minehunt.h
+++ b/examples/demos/minehunt/minehunt.h
diff --git a/examples/demos/minehunt/minehunt.pro b/examples/demos/minehunt/minehunt.pro
new file mode 100644
index 00000000..d89b8ff7
--- /dev/null
+++ b/examples/demos/minehunt/minehunt.pro
@@ -0,0 +1,28 @@
+# Add more folders to ship with the application, here
+folder_01.source = qml/minehunt
+folder_01.target = qml
+DEPLOYMENTFOLDERS = folder_01
+
+# Additional import path used to resolve QML modules in Creator's code model
+QML_IMPORT_PATH =
+
+# If your application uses the Qt Mobility libraries, uncomment the following
+# lines and add the respective components to the MOBILITY variable.
+# CONFIG += mobility
+# MOBILITY +=
+
+# Speed up launching on MeeGo/Harmattan when using applauncherd daemon
+# CONFIG += qdeclarative-boostable
+
+# Add dependency to Symbian components
+# CONFIG += qt-components
+
+HEADERS += minehunt.h
+SOURCES += main.cpp minehunt.cpp
+RESOURCES = minehunt.qrc
+
+# Please do not modify the following two lines. Required for deployment.
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/minehunt
+exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()
diff --git a/demos/declarative/minehunt/minehunt.qmlproject b/examples/demos/minehunt/minehunt.qmlproject
index 1f8b659f..1f8b659f 100644
--- a/demos/declarative/minehunt/minehunt.qmlproject
+++ b/examples/demos/minehunt/minehunt.qmlproject
diff --git a/demos/declarative/minehunt/minehunt.qrc b/examples/demos/minehunt/minehunt.qrc
index 4694beb1..4694beb1 100644
--- a/demos/declarative/minehunt/minehunt.qrc
+++ b/examples/demos/minehunt/minehunt.qrc
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml b/examples/demos/minehunt/qml/minehunt/MinehuntCore/Explosion.qml
index 489ee6a4..489ee6a4 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Explosion.qml
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/Explosion.qml
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml b/examples/demos/minehunt/qml/minehunt/MinehuntCore/Tile.qml
index e2c7f44e..e2c7f44e 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/Tile.qml
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/Tile.qml
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/back.png
index f6b3f0b4..f6b3f0b4 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/back.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/back.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/background.png
index 3734a277..3734a277 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/background.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/background.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png
index 61ad0a92..61ad0a92 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb-color.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png
index a9925755..a9925755 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/bomb.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png
index cf00aafe..cf00aafe 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-sad.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png
index f9c2335d..f9c2335d 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile-big.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png
index 3d66d725..3d66d725 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/face-smile.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png
index aadad0f1..aadad0f1 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag-color.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag.png
index 39cde4df..39cde4df 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/flag.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/flag.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/front.png
index 834331bd..834331bd 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/front.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/front.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/quit.png
index b822057d..b822057d 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/quit.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/quit.png
diff --git a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/star.png
index 37723591..37723591 100644
--- a/demos/declarative/minehunt/qml/minehunt/MinehuntCore/pics/star.png
+++ b/examples/demos/minehunt/qml/minehunt/MinehuntCore/pics/star.png
diff --git a/demos/declarative/minehunt/qml/minehunt/minehunt.qml b/examples/demos/minehunt/qml/minehunt/minehunt.qml
index 25e2fd13..25e2fd13 100644
--- a/demos/declarative/minehunt/qml/minehunt/minehunt.qml
+++ b/examples/demos/minehunt/qml/minehunt/minehunt.qml
diff --git a/demos/declarative/photoviewer/main.cpp b/examples/demos/photoviewer/main.cpp
index 9b730f57..9b730f57 100644
--- a/demos/declarative/photoviewer/main.cpp
+++ b/examples/demos/photoviewer/main.cpp
diff --git a/demos/declarative/photoviewer/photoviewer.desktop b/examples/demos/photoviewer/photoviewer.desktop
index 4246b9f3..4246b9f3 100644
--- a/demos/declarative/photoviewer/photoviewer.desktop
+++ b/examples/demos/photoviewer/photoviewer.desktop
diff --git a/demos/declarative/photoviewer/photoviewer.pro b/examples/demos/photoviewer/photoviewer.pro
index 72b43155..cdd2e5ec 100644
--- a/demos/declarative/photoviewer/photoviewer.pro
+++ b/examples/demos/photoviewer/photoviewer.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/photoviewer
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/photoviewer
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/photoviewer/photoviewer.qmlproject b/examples/demos/photoviewer/photoviewer.qmlproject
index 025a3a8f..025a3a8f 100644
--- a/demos/declarative/photoviewer/photoviewer.qmlproject
+++ b/examples/demos/photoviewer/photoviewer.qmlproject
diff --git a/demos/declarative/photoviewer/photoviewer.svg b/examples/demos/photoviewer/photoviewer.svg
index 566acfad..566acfad 100644
--- a/demos/declarative/photoviewer/photoviewer.svg
+++ b/examples/demos/photoviewer/photoviewer.svg
diff --git a/demos/declarative/photoviewer/photoviewer64.png b/examples/demos/photoviewer/photoviewer64.png
index 707d5c4e..707d5c4e 100644
--- a/demos/declarative/photoviewer/photoviewer64.png
+++ b/examples/demos/photoviewer/photoviewer64.png
diff --git a/demos/declarative/photoviewer/photoviewer80.png b/examples/demos/photoviewer/photoviewer80.png
index 6ad8096c..6ad8096c 100644
--- a/demos/declarative/photoviewer/photoviewer80.png
+++ b/examples/demos/photoviewer/photoviewer80.png
diff --git a/demos/declarative/photoviewer/photoviewer_harmattan.desktop b/examples/demos/photoviewer/photoviewer_harmattan.desktop
index 2dced148..2dced148 100644
--- a/demos/declarative/photoviewer/photoviewer_harmattan.desktop
+++ b/examples/demos/photoviewer/photoviewer_harmattan.desktop
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml
index 6d9c4d6a..6d9c4d6a 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/AlbumDelegate.qml
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml
index 8a9870ce..8a9870ce 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/BusyIndicator.qml
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml
index 2a9e2521..2a9e2521 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Button.qml
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml
index 42648717..42648717 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/EditableButton.qml
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index 9324074d..9324074d 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/PhotoDelegate.qml
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml
index d96a398b..d96a398b 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/ProgressBar.qml
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml
index 839d2013..839d2013 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/RssModel.qml
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml
index af2e40a3..af2e40a3 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/Tag.qml
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png
index 431af854..431af854 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/box-shadow.png
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png
index 664c2b14..664c2b14 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/busy.png
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png
index 1847ab52..1847ab52 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/images/cardboard.png
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir
index d3c247f2..d3c247f2 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/qmldir
diff --git a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js
index e8ef93a8..e8ef93a8 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js
+++ b/examples/demos/photoviewer/qml/photoviewer/PhotoViewerCore/script/script.js
diff --git a/demos/declarative/photoviewer/qml/photoviewer/i18n/base.ts b/examples/demos/photoviewer/qml/photoviewer/i18n/base.ts
index 1accfd2f..1accfd2f 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/i18n/base.ts
+++ b/examples/demos/photoviewer/qml/photoviewer/i18n/base.ts
diff --git a/demos/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.qm b/examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.qm
index c24fcbc4..c24fcbc4 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.qm
+++ b/examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.qm
diff --git a/demos/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.ts b/examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.ts
index 9f892db6..9f892db6 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/i18n/qml_fr.ts
+++ b/examples/demos/photoviewer/qml/photoviewer/i18n/qml_fr.ts
diff --git a/demos/declarative/photoviewer/qml/photoviewer/photoviewer.qml b/examples/demos/photoviewer/qml/photoviewer/photoviewer.qml
index f8fba4dc..f8fba4dc 100644
--- a/demos/declarative/photoviewer/qml/photoviewer/photoviewer.qml
+++ b/examples/demos/photoviewer/qml/photoviewer/photoviewer.qml
diff --git a/demos/declarative/rssnews/main.cpp b/examples/demos/rssnews/main.cpp
index 80e31820..80e31820 100644
--- a/demos/declarative/rssnews/main.cpp
+++ b/examples/demos/rssnews/main.cpp
diff --git a/demos/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml b/examples/demos/rssnews/qml/rssnews/content/BusyIndicator.qml
index 38c7e892..38c7e892 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/BusyIndicator.qml
+++ b/examples/demos/rssnews/qml/rssnews/content/BusyIndicator.qml
diff --git a/demos/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml b/examples/demos/rssnews/qml/rssnews/content/CategoryDelegate.qml
index 488bf9b6..488bf9b6 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/CategoryDelegate.qml
+++ b/examples/demos/rssnews/qml/rssnews/content/CategoryDelegate.qml
diff --git a/demos/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml b/examples/demos/rssnews/qml/rssnews/content/NewsDelegate.qml
index 1610b533..1610b533 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/NewsDelegate.qml
+++ b/examples/demos/rssnews/qml/rssnews/content/NewsDelegate.qml
diff --git a/demos/declarative/rssnews/qml/rssnews/content/RssFeeds.qml b/examples/demos/rssnews/qml/rssnews/content/RssFeeds.qml
index 0c2b83cc..0c2b83cc 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/RssFeeds.qml
+++ b/examples/demos/rssnews/qml/rssnews/content/RssFeeds.qml
diff --git a/demos/declarative/rssnews/qml/rssnews/content/ScrollBar.qml b/examples/demos/rssnews/qml/rssnews/content/ScrollBar.qml
index 3b0aee4a..3b0aee4a 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/ScrollBar.qml
+++ b/examples/demos/rssnews/qml/rssnews/content/ScrollBar.qml
diff --git a/demos/declarative/rssnews/qml/rssnews/content/images/busy.png b/examples/demos/rssnews/qml/rssnews/content/images/busy.png
index 664c2b14..664c2b14 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/images/busy.png
+++ b/examples/demos/rssnews/qml/rssnews/content/images/busy.png
diff --git a/demos/declarative/rssnews/qml/rssnews/content/images/scrollbar.png b/examples/demos/rssnews/qml/rssnews/content/images/scrollbar.png
index 0228dcf9..0228dcf9 100644
--- a/demos/declarative/rssnews/qml/rssnews/content/images/scrollbar.png
+++ b/examples/demos/rssnews/qml/rssnews/content/images/scrollbar.png
diff --git a/demos/declarative/rssnews/qml/rssnews/rssnews.qml b/examples/demos/rssnews/qml/rssnews/rssnews.qml
index d6b2903c..d6b2903c 100644
--- a/demos/declarative/rssnews/qml/rssnews/rssnews.qml
+++ b/examples/demos/rssnews/qml/rssnews/rssnews.qml
diff --git a/demos/declarative/rssnews/rssnews.desktop b/examples/demos/rssnews/rssnews.desktop
index 7d02ed5f..7d02ed5f 100644
--- a/demos/declarative/rssnews/rssnews.desktop
+++ b/examples/demos/rssnews/rssnews.desktop
diff --git a/demos/declarative/rssnews/rssnews.pro b/examples/demos/rssnews/rssnews.pro
index 6b1f68c2..2d6e580f 100644
--- a/demos/declarative/rssnews/rssnews.pro
+++ b/examples/demos/rssnews/rssnews.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/rssnews
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/rssnews
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/rssnews/rssnews.qmlproject b/examples/demos/rssnews/rssnews.qmlproject
index 608be8d3..608be8d3 100644
--- a/demos/declarative/rssnews/rssnews.qmlproject
+++ b/examples/demos/rssnews/rssnews.qmlproject
diff --git a/demos/declarative/rssnews/rssnews.svg b/examples/demos/rssnews/rssnews.svg
index 566acfad..566acfad 100644
--- a/demos/declarative/rssnews/rssnews.svg
+++ b/examples/demos/rssnews/rssnews.svg
diff --git a/demos/declarative/rssnews/rssnews64.png b/examples/demos/rssnews/rssnews64.png
index 707d5c4e..707d5c4e 100644
--- a/demos/declarative/rssnews/rssnews64.png
+++ b/examples/demos/rssnews/rssnews64.png
diff --git a/demos/declarative/rssnews/rssnews80.png b/examples/demos/rssnews/rssnews80.png
index 6ad8096c..6ad8096c 100644
--- a/demos/declarative/rssnews/rssnews80.png
+++ b/examples/demos/rssnews/rssnews80.png
diff --git a/demos/declarative/rssnews/rssnews_harmattan.desktop b/examples/demos/rssnews/rssnews_harmattan.desktop
index df6303ff..df6303ff 100644
--- a/demos/declarative/rssnews/rssnews_harmattan.desktop
+++ b/examples/demos/rssnews/rssnews_harmattan.desktop
diff --git a/demos/declarative/samegame/main.cpp b/examples/demos/samegame/main.cpp
index 9e4e81de..9e4e81de 100644
--- a/demos/declarative/samegame/main.cpp
+++ b/examples/demos/samegame/main.cpp
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml b/examples/demos/samegame/qml/samegame/SamegameCore/BoomBlock.qml
index 7ec631a9..7ec631a9 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/BoomBlock.qml
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/BoomBlock.qml
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/Button.qml b/examples/demos/samegame/qml/samegame/SamegameCore/Button.qml
index 387efcaa..387efcaa 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/Button.qml
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/Button.qml
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml b/examples/demos/samegame/qml/samegame/SamegameCore/Dialog.qml
index eb48b0dd..eb48b0dd 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/Dialog.qml
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/Dialog.qml
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/background.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/background.png
index 3734a277..3734a277 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/background.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/background.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/blueStar.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStar.png
index ff9588f8..ff9588f8 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/blueStar.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStar.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/blueStone.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStone.png
index 20e43c75..20e43c75 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/blueStone.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/blueStone.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/greenStar.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStar.png
index cd068547..cd068547 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/greenStar.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStar.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/greenStone.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStone.png
index b568a190..b568a190 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/greenStone.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/greenStone.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/redStar.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/redStar.png
index 0a4dffe5..0a4dffe5 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/redStar.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/redStar.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/redStone.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/redStone.png
index 36b09a26..36b09a26 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/redStone.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/redStone.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/star.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/star.png
index defbde53..defbde53 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/star.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/star.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/yellowStone.png b/examples/demos/samegame/qml/samegame/SamegameCore/pics/yellowStone.png
index b1ce7621..b1ce7621 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/pics/yellowStone.png
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/pics/yellowStone.png
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/qmldir b/examples/demos/samegame/qml/samegame/SamegameCore/qmldir
index e17b1f5d..e17b1f5d 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/qmldir
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/qmldir
diff --git a/demos/declarative/samegame/qml/samegame/SamegameCore/samegame.js b/examples/demos/samegame/qml/samegame/SamegameCore/samegame.js
index d7b827a1..d7b827a1 100644
--- a/demos/declarative/samegame/qml/samegame/SamegameCore/samegame.js
+++ b/examples/demos/samegame/qml/samegame/SamegameCore/samegame.js
diff --git a/demos/declarative/samegame/qml/samegame/highscores/README b/examples/demos/samegame/qml/samegame/highscores/README
index eaa00fae..eaa00fae 100644
--- a/demos/declarative/samegame/qml/samegame/highscores/README
+++ b/examples/demos/samegame/qml/samegame/highscores/README
diff --git a/demos/declarative/samegame/qml/samegame/highscores/score_data.xml b/examples/demos/samegame/qml/samegame/highscores/score_data.xml
index c3fd90d9..c3fd90d9 100644
--- a/demos/declarative/samegame/qml/samegame/highscores/score_data.xml
+++ b/examples/demos/samegame/qml/samegame/highscores/score_data.xml
diff --git a/demos/declarative/samegame/qml/samegame/highscores/score_style.xsl b/examples/demos/samegame/qml/samegame/highscores/score_style.xsl
index 670354c9..670354c9 100644
--- a/demos/declarative/samegame/qml/samegame/highscores/score_style.xsl
+++ b/examples/demos/samegame/qml/samegame/highscores/score_style.xsl
diff --git a/demos/declarative/samegame/qml/samegame/highscores/scores.php b/examples/demos/samegame/qml/samegame/highscores/scores.php
index 3cceb2d7..3cceb2d7 100644
--- a/demos/declarative/samegame/qml/samegame/highscores/scores.php
+++ b/examples/demos/samegame/qml/samegame/highscores/scores.php
diff --git a/demos/declarative/samegame/qml/samegame/samegame.qml b/examples/demos/samegame/qml/samegame/samegame.qml
index 509646f3..509646f3 100644
--- a/demos/declarative/samegame/qml/samegame/samegame.qml
+++ b/examples/demos/samegame/qml/samegame/samegame.qml
diff --git a/demos/declarative/samegame/samegame.desktop b/examples/demos/samegame/samegame.desktop
index 18ad2d98..18ad2d98 100644
--- a/demos/declarative/samegame/samegame.desktop
+++ b/examples/demos/samegame/samegame.desktop
diff --git a/demos/declarative/samegame/samegame.pro b/examples/demos/samegame/samegame.pro
index fb85cd22..dc659c6e 100644
--- a/demos/declarative/samegame/samegame.pro
+++ b/examples/demos/samegame/samegame.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/samegame
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/samegame
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/samegame/samegame.qmlproject b/examples/demos/samegame/samegame.qmlproject
index c17ee1ee..c17ee1ee 100644
--- a/demos/declarative/samegame/samegame.qmlproject
+++ b/examples/demos/samegame/samegame.qmlproject
diff --git a/demos/declarative/samegame/samegame.svg b/examples/demos/samegame/samegame.svg
index 566acfad..566acfad 100644
--- a/demos/declarative/samegame/samegame.svg
+++ b/examples/demos/samegame/samegame.svg
diff --git a/demos/declarative/samegame/samegame64.png b/examples/demos/samegame/samegame64.png
index 707d5c4e..707d5c4e 100644
--- a/demos/declarative/samegame/samegame64.png
+++ b/examples/demos/samegame/samegame64.png
diff --git a/demos/declarative/samegame/samegame80.png b/examples/demos/samegame/samegame80.png
index 6ad8096c..6ad8096c 100644
--- a/demos/declarative/samegame/samegame80.png
+++ b/examples/demos/samegame/samegame80.png
diff --git a/demos/declarative/samegame/samegame_harmattan.desktop b/examples/demos/samegame/samegame_harmattan.desktop
index 1f35b8e3..1f35b8e3 100644
--- a/demos/declarative/samegame/samegame_harmattan.desktop
+++ b/examples/demos/samegame/samegame_harmattan.desktop
diff --git a/demos/declarative/snake/main.cpp b/examples/demos/snake/main.cpp
index 296d0fb4..296d0fb4 100644
--- a/demos/declarative/snake/main.cpp
+++ b/examples/demos/snake/main.cpp
diff --git a/demos/declarative/snake/qml/snake/content/Button.qml b/examples/demos/snake/qml/snake/content/Button.qml
index 19883485..19883485 100644
--- a/demos/declarative/snake/qml/snake/content/Button.qml
+++ b/examples/demos/snake/qml/snake/content/Button.qml
diff --git a/demos/declarative/snake/qml/snake/content/Cookie.qml b/examples/demos/snake/qml/snake/content/Cookie.qml
index 047b4a3f..047b4a3f 100644
--- a/demos/declarative/snake/qml/snake/content/Cookie.qml
+++ b/examples/demos/snake/qml/snake/content/Cookie.qml
diff --git a/demos/declarative/snake/qml/snake/content/HighScoreModel.qml b/examples/demos/snake/qml/snake/content/HighScoreModel.qml
index ade9e219..ade9e219 100644
--- a/demos/declarative/snake/qml/snake/content/HighScoreModel.qml
+++ b/examples/demos/snake/qml/snake/content/HighScoreModel.qml
diff --git a/demos/declarative/snake/qml/snake/content/Link.qml b/examples/demos/snake/qml/snake/content/Link.qml
index 2fb7d041..2fb7d041 100644
--- a/demos/declarative/snake/qml/snake/content/Link.qml
+++ b/examples/demos/snake/qml/snake/content/Link.qml
diff --git a/demos/declarative/snake/qml/snake/content/Skull.qml b/examples/demos/snake/qml/snake/content/Skull.qml
index 358227d8..358227d8 100644
--- a/demos/declarative/snake/qml/snake/content/Skull.qml
+++ b/examples/demos/snake/qml/snake/content/Skull.qml
diff --git a/demos/declarative/snake/qml/snake/content/pics/README b/examples/demos/snake/qml/snake/content/pics/README
index 0215132c..0215132c 100644
--- a/demos/declarative/snake/qml/snake/content/pics/README
+++ b/examples/demos/snake/qml/snake/content/pics/README
diff --git a/demos/declarative/snake/qml/snake/content/pics/background.png b/examples/demos/snake/qml/snake/content/pics/background.png
index 72dffaa8..72dffaa8 100644
--- a/demos/declarative/snake/qml/snake/content/pics/background.png
+++ b/examples/demos/snake/qml/snake/content/pics/background.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/blueStar.png b/examples/demos/snake/qml/snake/content/pics/blueStar.png
index ba7acabd..ba7acabd 100644
--- a/demos/declarative/snake/qml/snake/content/pics/blueStar.png
+++ b/examples/demos/snake/qml/snake/content/pics/blueStar.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/blueStone.png b/examples/demos/snake/qml/snake/content/pics/blueStone.png
index 356affdd..356affdd 100644
--- a/demos/declarative/snake/qml/snake/content/pics/blueStone.png
+++ b/examples/demos/snake/qml/snake/content/pics/blueStone.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/cookie.png b/examples/demos/snake/qml/snake/content/pics/cookie.png
index aec2957f..aec2957f 100644
--- a/demos/declarative/snake/qml/snake/content/pics/cookie.png
+++ b/examples/demos/snake/qml/snake/content/pics/cookie.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/eyes.svg b/examples/demos/snake/qml/snake/content/pics/eyes.svg
index 10786927..10786927 100644
--- a/demos/declarative/snake/qml/snake/content/pics/eyes.svg
+++ b/examples/demos/snake/qml/snake/content/pics/eyes.svg
diff --git a/demos/declarative/snake/qml/snake/content/pics/head.png b/examples/demos/snake/qml/snake/content/pics/head.png
index 550e0026..550e0026 100644
--- a/demos/declarative/snake/qml/snake/content/pics/head.png
+++ b/examples/demos/snake/qml/snake/content/pics/head.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/head.svg b/examples/demos/snake/qml/snake/content/pics/head.svg
index 3bf0bd2f..3bf0bd2f 100644
--- a/demos/declarative/snake/qml/snake/content/pics/head.svg
+++ b/examples/demos/snake/qml/snake/content/pics/head.svg
diff --git a/demos/declarative/snake/qml/snake/content/pics/pause.png b/examples/demos/snake/qml/snake/content/pics/pause.png
index 056d97dd..056d97dd 100644
--- a/demos/declarative/snake/qml/snake/content/pics/pause.png
+++ b/examples/demos/snake/qml/snake/content/pics/pause.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/redStar.png b/examples/demos/snake/qml/snake/content/pics/redStar.png
index cd068547..cd068547 100644
--- a/demos/declarative/snake/qml/snake/content/pics/redStar.png
+++ b/examples/demos/snake/qml/snake/content/pics/redStar.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/redStone.png b/examples/demos/snake/qml/snake/content/pics/redStone.png
index 9bb7fe42..9bb7fe42 100644
--- a/demos/declarative/snake/qml/snake/content/pics/redStone.png
+++ b/examples/demos/snake/qml/snake/content/pics/redStone.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/skull.png b/examples/demos/snake/qml/snake/content/pics/skull.png
index 63186167..63186167 100644
--- a/demos/declarative/snake/qml/snake/content/pics/skull.png
+++ b/examples/demos/snake/qml/snake/content/pics/skull.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/snake.jpg b/examples/demos/snake/qml/snake/content/pics/snake.jpg
index e91a784f..e91a784f 100644
--- a/demos/declarative/snake/qml/snake/content/pics/snake.jpg
+++ b/examples/demos/snake/qml/snake/content/pics/snake.jpg
diff --git a/demos/declarative/snake/qml/snake/content/pics/star.png b/examples/demos/snake/qml/snake/content/pics/star.png
index defbde53..defbde53 100644
--- a/demos/declarative/snake/qml/snake/content/pics/star.png
+++ b/examples/demos/snake/qml/snake/content/pics/star.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/stoneShadow.png b/examples/demos/snake/qml/snake/content/pics/stoneShadow.png
index 1bd56afd..1bd56afd 100644
--- a/demos/declarative/snake/qml/snake/content/pics/stoneShadow.png
+++ b/examples/demos/snake/qml/snake/content/pics/stoneShadow.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/yellowStar.png b/examples/demos/snake/qml/snake/content/pics/yellowStar.png
index 52fb9c4b..52fb9c4b 100644
--- a/demos/declarative/snake/qml/snake/content/pics/yellowStar.png
+++ b/examples/demos/snake/qml/snake/content/pics/yellowStar.png
diff --git a/demos/declarative/snake/qml/snake/content/pics/yellowStone.png b/examples/demos/snake/qml/snake/content/pics/yellowStone.png
index c56124a8..c56124a8 100644
--- a/demos/declarative/snake/qml/snake/content/pics/yellowStone.png
+++ b/examples/demos/snake/qml/snake/content/pics/yellowStone.png
diff --git a/demos/declarative/snake/qml/snake/content/snake.js b/examples/demos/snake/qml/snake/content/snake.js
index 837b82ad..837b82ad 100644
--- a/demos/declarative/snake/qml/snake/content/snake.js
+++ b/examples/demos/snake/qml/snake/content/snake.js
diff --git a/demos/declarative/snake/qml/snake/snake.qml b/examples/demos/snake/qml/snake/snake.qml
index fd2afff4..fd2afff4 100644
--- a/demos/declarative/snake/qml/snake/snake.qml
+++ b/examples/demos/snake/qml/snake/snake.qml
diff --git a/demos/declarative/snake/snake.desktop b/examples/demos/snake/snake.desktop
index fef60907..fef60907 100644
--- a/demos/declarative/snake/snake.desktop
+++ b/examples/demos/snake/snake.desktop
diff --git a/demos/declarative/snake/snake.pro b/examples/demos/snake/snake.pro
index d9b77189..5e27c82b 100644
--- a/demos/declarative/snake/snake.pro
+++ b/examples/demos/snake/snake.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/snake
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/snake
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/snake/snake.qmlproject b/examples/demos/snake/snake.qmlproject
index 431d2a9e..431d2a9e 100644
--- a/demos/declarative/snake/snake.qmlproject
+++ b/examples/demos/snake/snake.qmlproject
diff --git a/demos/declarative/snake/snake.svg b/examples/demos/snake/snake.svg
index 566acfad..566acfad 100644
--- a/demos/declarative/snake/snake.svg
+++ b/examples/demos/snake/snake.svg
diff --git a/demos/declarative/snake/snake64.png b/examples/demos/snake/snake64.png
index 707d5c4e..707d5c4e 100644
--- a/demos/declarative/snake/snake64.png
+++ b/examples/demos/snake/snake64.png
diff --git a/demos/declarative/snake/snake80.png b/examples/demos/snake/snake80.png
index 6ad8096c..6ad8096c 100644
--- a/demos/declarative/snake/snake80.png
+++ b/examples/demos/snake/snake80.png
diff --git a/demos/declarative/snake/snake_harmattan.desktop b/examples/demos/snake/snake_harmattan.desktop
index 10b0f792..10b0f792 100644
--- a/demos/declarative/snake/snake_harmattan.desktop
+++ b/examples/demos/snake/snake_harmattan.desktop
diff --git a/demos/declarative/twitter/main.cpp b/examples/demos/twitter/main.cpp
index 74709d23..74709d23 100644
--- a/demos/declarative/twitter/main.cpp
+++ b/examples/demos/twitter/main.cpp
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/Button.qml b/examples/demos/twitter/qml/twitter/TwitterCore/Button.qml
index fc377129..fc377129 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/Button.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/Button.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml b/examples/demos/twitter/qml/twitter/TwitterCore/FatDelegate.qml
index d514a297..d514a297 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/FatDelegate.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/FatDelegate.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/Input.qml b/examples/demos/twitter/qml/twitter/TwitterCore/Input.qml
index cc051205..cc051205 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/Input.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/Input.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/Loading.qml b/examples/demos/twitter/qml/twitter/TwitterCore/Loading.qml
index fe247542..fe247542 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/Loading.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/Loading.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml b/examples/demos/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml
index eec63df2..eec63df2 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/MultiTitleBar.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml b/examples/demos/twitter/qml/twitter/TwitterCore/RssModel.qml
index 26a77627..26a77627 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/RssModel.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/RssModel.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml b/examples/demos/twitter/qml/twitter/TwitterCore/SearchView.qml
index 32bbe5d3..32bbe5d3 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/SearchView.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/SearchView.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml b/examples/demos/twitter/qml/twitter/TwitterCore/TitleBar.qml
index d45c275b..d45c275b 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/TitleBar.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/TitleBar.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml b/examples/demos/twitter/qml/twitter/TwitterCore/ToolBar.qml
index a00f6d52..a00f6d52 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/ToolBar.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/ToolBar.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml b/examples/demos/twitter/qml/twitter/TwitterCore/UserModel.qml
index 6ee1f1bd..6ee1f1bd 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/UserModel.qml
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/UserModel.qml
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/gloss.png b/examples/demos/twitter/qml/twitter/TwitterCore/images/gloss.png
index 5d370cd9..5d370cd9 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/gloss.png
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/gloss.png
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.png b/examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.png
index 2cc38dc3..2cc38dc3 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.png
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.png
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.sci b/examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.sci
index 054bff78..054bff78 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/lineedit.sci
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/lineedit.sci
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/loading.png b/examples/demos/twitter/qml/twitter/TwitterCore/images/loading.png
index 47a1589c..47a1589c 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/loading.png
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/loading.png
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/quit.png b/examples/demos/twitter/qml/twitter/TwitterCore/images/quit.png
index 5bda1b6e..5bda1b6e 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/quit.png
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/quit.png
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/stripes.png b/examples/demos/twitter/qml/twitter/TwitterCore/images/stripes.png
index 9f36727e..9f36727e 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/stripes.png
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/stripes.png
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.png b/examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.png
index 51c90082..51c90082 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.png
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.png
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.sci b/examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.sci
index 0418d94c..0418d94c 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/titlebar.sci
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/titlebar.sci
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.png b/examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.png
index 11310013..11310013 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.png
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.png
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.sci b/examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.sci
index 9e4f9653..9e4f9653 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/images/toolbutton.sci
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/images/toolbutton.sci
diff --git a/demos/declarative/twitter/qml/twitter/TwitterCore/qmldir b/examples/demos/twitter/qml/twitter/TwitterCore/qmldir
index 84d85c28..84d85c28 100644
--- a/demos/declarative/twitter/qml/twitter/TwitterCore/qmldir
+++ b/examples/demos/twitter/qml/twitter/TwitterCore/qmldir
diff --git a/demos/declarative/twitter/qml/twitter/twitter.qml b/examples/demos/twitter/qml/twitter/twitter.qml
index 71f132ae..71f132ae 100644
--- a/demos/declarative/twitter/qml/twitter/twitter.qml
+++ b/examples/demos/twitter/qml/twitter/twitter.qml
diff --git a/demos/declarative/twitter/twitter.desktop b/examples/demos/twitter/twitter.desktop
index 5d1b851b..5d1b851b 100644
--- a/demos/declarative/twitter/twitter.desktop
+++ b/examples/demos/twitter/twitter.desktop
diff --git a/demos/declarative/twitter/twitter.pro b/examples/demos/twitter/twitter.pro
index 91bfd47f..a2c6f4a7 100644
--- a/demos/declarative/twitter/twitter.pro
+++ b/examples/demos/twitter/twitter.pro
@@ -33,7 +33,7 @@ symbian:TARGET.CAPABILITY += NetworkServices
 SOURCES += main.cpp
 
 # Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_DEMOS]/declarative/twitter
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/demos/twitter
 exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
 else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
 qtcAddDeployment()
diff --git a/demos/declarative/twitter/twitter.qmlproject b/examples/demos/twitter/twitter.qmlproject
index 3b360cf2..3b360cf2 100644
--- a/demos/declarative/twitter/twitter.qmlproject
+++ b/examples/demos/twitter/twitter.qmlproject
diff --git a/demos/declarative/twitter/twitter.svg b/examples/demos/twitter/twitter.svg
index 566acfad..566acfad 100644
--- a/demos/declarative/twitter/twitter.svg
+++ b/examples/demos/twitter/twitter.svg
diff --git a/demos/declarative/twitter/twitter64.png b/examples/demos/twitter/twitter64.png
index 707d5c4e..707d5c4e 100644
--- a/demos/declarative/twitter/twitter64.png
+++ b/examples/demos/twitter/twitter64.png
diff --git a/demos/declarative/twitter/twitter80.png b/examples/demos/twitter/twitter80.png
index 6ad8096c..6ad8096c 100644
--- a/demos/declarative/twitter/twitter80.png
+++ b/examples/demos/twitter/twitter80.png
diff --git a/demos/declarative/twitter/twitter_harmattan.desktop b/examples/demos/twitter/twitter_harmattan.desktop
index 40a4a1bc..40a4a1bc 100644
--- a/demos/declarative/twitter/twitter_harmattan.desktop
+++ b/examples/demos/twitter/twitter_harmattan.desktop
diff --git a/examples/examples.pro b/examples/examples.pro
index 03c4a217..0d688669 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,6 @@
 TEMPLATE = subdirs
-SUBDIRS += declarative
+SUBDIRS += \
+        declarative \
+        demos \
+        helper
+
diff --git a/demos/helper/helper.pro b/examples/helper/helper.pro
index 03b3dcd6..85117a0f 100644
--- a/demos/helper/helper.pro
+++ b/examples/helper/helper.pro
@@ -3,5 +3,5 @@ TEMPLATE = subdirs
 # the helpers simply need a make install target, but require no compilation 
 sources.files = \
 	qmlapplicationviewer
-sources.path = $$[QT_INSTALL_DEMOS]/helper
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/helper
 INSTALLS += sources
diff --git a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
index 0497b542..16fcf667 100644
--- a/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/examples/helper/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -95,10 +95,14 @@ QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
         return QString::fromLatin1("%1/../Resources/%2")
                 .arg(QCoreApplication::applicationDirPath(), path);
 #else
-    const QString pathInInstallDir =
+    QString pathInInstallDir =
             QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
     if (QFileInfo(pathInInstallDir).exists())
         return pathInInstallDir;
+    pathInInstallDir =
+            QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
+    if (QFileInfo(pathInInstallDir).exists())
+        return pathInInstallDir;
 #endif
     return path;
 }
diff --git a/demos/mobile/guitartuner/guitartuner.pro b/examples/mobile/guitartuner/guitartuner.pro
index b86f4778..b86f4778 100644
--- a/demos/mobile/guitartuner/guitartuner.pro
+++ b/examples/mobile/guitartuner/guitartuner.pro
diff --git a/demos/mobile/guitartuner/guitartuner.qrc b/examples/mobile/guitartuner/guitartuner.qrc
index d8ba0199..d8ba0199 100644
--- a/demos/mobile/guitartuner/guitartuner.qrc
+++ b/examples/mobile/guitartuner/guitartuner.qrc
diff --git a/demos/mobile/guitartuner/images/guitartab.svg b/examples/mobile/guitartuner/images/guitartab.svg
index 9d88d5d2..9d88d5d2 100644
--- a/demos/mobile/guitartuner/images/guitartab.svg
+++ b/examples/mobile/guitartuner/images/guitartab.svg
diff --git a/demos/mobile/guitartuner/images/guitartuner_icon.svg b/examples/mobile/guitartuner/images/guitartuner_icon.svg
index de7ebe0f..de7ebe0f 100644
--- a/demos/mobile/guitartuner/images/guitartuner_icon.svg
+++ b/examples/mobile/guitartuner/images/guitartuner_icon.svg
diff --git a/demos/mobile/guitartuner/images/inputMode.svg b/examples/mobile/guitartuner/images/inputMode.svg
index f95991af..f95991af 100644
--- a/demos/mobile/guitartuner/images/inputMode.svg
+++ b/examples/mobile/guitartuner/images/inputMode.svg
diff --git a/demos/mobile/guitartuner/images/note.svg b/examples/mobile/guitartuner/images/note.svg
index c1f1771a..c1f1771a 100644
--- a/demos/mobile/guitartuner/images/note.svg
+++ b/examples/mobile/guitartuner/images/note.svg
diff --git a/demos/mobile/guitartuner/images/noteNo.svg b/examples/mobile/guitartuner/images/noteNo.svg
index 888d2308..888d2308 100644
--- a/demos/mobile/guitartuner/images/noteNo.svg
+++ b/examples/mobile/guitartuner/images/noteNo.svg
diff --git a/demos/mobile/guitartuner/src/application.qml b/examples/mobile/guitartuner/src/application.qml
index 85ba397c..85ba397c 100644
--- a/demos/mobile/guitartuner/src/application.qml
+++ b/examples/mobile/guitartuner/src/application.qml
diff --git a/demos/mobile/guitartuner/src/constants.h b/examples/mobile/guitartuner/src/constants.h
index 066b1791..066b1791 100644
--- a/demos/mobile/guitartuner/src/constants.h
+++ b/examples/mobile/guitartuner/src/constants.h
diff --git a/demos/mobile/guitartuner/src/fastfouriertransformer.cpp b/examples/mobile/guitartuner/src/fastfouriertransformer.cpp
index 05eaf57f..05eaf57f 100644
--- a/demos/mobile/guitartuner/src/fastfouriertransformer.cpp
+++ b/examples/mobile/guitartuner/src/fastfouriertransformer.cpp
diff --git a/demos/mobile/guitartuner/src/fastfouriertransformer.h b/examples/mobile/guitartuner/src/fastfouriertransformer.h
index 7ca72075..7ca72075 100644
--- a/demos/mobile/guitartuner/src/fastfouriertransformer.h
+++ b/examples/mobile/guitartuner/src/fastfouriertransformer.h
diff --git a/demos/mobile/guitartuner/src/fftpack.c b/examples/mobile/guitartuner/src/fftpack.c
index 70fbbdd0..70fbbdd0 100644
--- a/demos/mobile/guitartuner/src/fftpack.c
+++ b/examples/mobile/guitartuner/src/fftpack.c
diff --git a/demos/mobile/guitartuner/src/guitartuner.cpp b/examples/mobile/guitartuner/src/guitartuner.cpp
index a2832217..a2832217 100644
--- a/demos/mobile/guitartuner/src/guitartuner.cpp
+++ b/examples/mobile/guitartuner/src/guitartuner.cpp
diff --git a/demos/mobile/guitartuner/src/guitartuner.h b/examples/mobile/guitartuner/src/guitartuner.h
index a0250f79..a0250f79 100644
--- a/demos/mobile/guitartuner/src/guitartuner.h
+++ b/examples/mobile/guitartuner/src/guitartuner.h
diff --git a/demos/mobile/guitartuner/src/guitartuner.rc b/examples/mobile/guitartuner/src/guitartuner.rc
index 5cd35118..5cd35118 100644
--- a/demos/mobile/guitartuner/src/guitartuner.rc
+++ b/examples/mobile/guitartuner/src/guitartuner.rc
diff --git a/demos/mobile/guitartuner/src/guitartuner.ui b/examples/mobile/guitartuner/src/guitartuner.ui
index 36ee1bd8..36ee1bd8 100644
--- a/demos/mobile/guitartuner/src/guitartuner.ui
+++ b/examples/mobile/guitartuner/src/guitartuner.ui
diff --git a/demos/mobile/guitartuner/src/guitartunerui.cpp b/examples/mobile/guitartuner/src/guitartunerui.cpp
index c87ae7f6..c87ae7f6 100644
--- a/demos/mobile/guitartuner/src/guitartunerui.cpp
+++ b/examples/mobile/guitartuner/src/guitartunerui.cpp
diff --git a/demos/mobile/guitartuner/src/guitartunerui.h b/examples/mobile/guitartuner/src/guitartunerui.h
index 4040d6cc..4040d6cc 100644
--- a/demos/mobile/guitartuner/src/guitartunerui.h
+++ b/examples/mobile/guitartuner/src/guitartunerui.h
diff --git a/demos/mobile/guitartuner/src/guitartunerui.ui b/examples/mobile/guitartuner/src/guitartunerui.ui
index af7b585b..af7b585b 100644
--- a/demos/mobile/guitartuner/src/guitartunerui.ui
+++ b/examples/mobile/guitartuner/src/guitartunerui.ui
diff --git a/demos/mobile/guitartuner/src/main.cpp b/examples/mobile/guitartuner/src/main.cpp
index 83ba5e67..83ba5e67 100644
--- a/demos/mobile/guitartuner/src/main.cpp
+++ b/examples/mobile/guitartuner/src/main.cpp
diff --git a/demos/mobile/guitartuner/src/mycomponents/Adjuster.qml b/examples/mobile/guitartuner/src/mycomponents/Adjuster.qml
index 9fa2b5e6..9fa2b5e6 100644
--- a/demos/mobile/guitartuner/src/mycomponents/Adjuster.qml
+++ b/examples/mobile/guitartuner/src/mycomponents/Adjuster.qml
diff --git a/demos/mobile/guitartuner/src/mycomponents/Meter.qml b/examples/mobile/guitartuner/src/mycomponents/Meter.qml
index cfb764ed..cfb764ed 100644
--- a/demos/mobile/guitartuner/src/mycomponents/Meter.qml
+++ b/examples/mobile/guitartuner/src/mycomponents/Meter.qml
diff --git a/demos/mobile/guitartuner/src/mycomponents/NoteButtonView.qml b/examples/mobile/guitartuner/src/mycomponents/NoteButtonView.qml
index 45e5b259..45e5b259 100644
--- a/demos/mobile/guitartuner/src/mycomponents/NoteButtonView.qml
+++ b/examples/mobile/guitartuner/src/mycomponents/NoteButtonView.qml
diff --git a/demos/mobile/guitartuner/src/mycomponents/NotesModel.qml b/examples/mobile/guitartuner/src/mycomponents/NotesModel.qml
index e69fa847..e69fa847 100644
--- a/demos/mobile/guitartuner/src/mycomponents/NotesModel.qml
+++ b/examples/mobile/guitartuner/src/mycomponents/NotesModel.qml
diff --git a/demos/mobile/guitartuner/src/mycomponents/ToggleButton.qml b/examples/mobile/guitartuner/src/mycomponents/ToggleButton.qml
index 956a0daf..956a0daf 100644
--- a/demos/mobile/guitartuner/src/mycomponents/ToggleButton.qml
+++ b/examples/mobile/guitartuner/src/mycomponents/ToggleButton.qml
diff --git a/demos/mobile/guitartuner/src/mycomponents/adjustbars.js b/examples/mobile/guitartuner/src/mycomponents/adjustbars.js
index 053c10e0..053c10e0 100644
--- a/demos/mobile/guitartuner/src/mycomponents/adjustbars.js
+++ b/examples/mobile/guitartuner/src/mycomponents/adjustbars.js
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/big_a.png b/examples/mobile/guitartuner/src/mycomponents/images/big_a.png
index 3838e766..3838e766 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/big_a.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/big_a.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/big_b.png b/examples/mobile/guitartuner/src/mycomponents/images/big_b.png
index 114b32d3..114b32d3 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/big_b.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/big_b.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/big_d.png b/examples/mobile/guitartuner/src/mycomponents/images/big_d.png
index 3ede9f0f..3ede9f0f 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/big_d.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/big_d.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/big_e.png b/examples/mobile/guitartuner/src/mycomponents/images/big_e.png
index cc1f4885..cc1f4885 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/big_e.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/big_e.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/big_g.png b/examples/mobile/guitartuner/src/mycomponents/images/big_g.png
index 804177b3..804177b3 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/big_g.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/big_g.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/glowing_a.png b/examples/mobile/guitartuner/src/mycomponents/images/glowing_a.png
index b6fd0e20..b6fd0e20 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/glowing_a.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/glowing_a.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/glowing_b.png b/examples/mobile/guitartuner/src/mycomponents/images/glowing_b.png
index b5fa016a..b5fa016a 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/glowing_b.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/glowing_b.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/glowing_d.png b/examples/mobile/guitartuner/src/mycomponents/images/glowing_d.png
index 32f1a291..32f1a291 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/glowing_d.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/glowing_d.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/glowing_e.png b/examples/mobile/guitartuner/src/mycomponents/images/glowing_e.png
index 4be9f2a7..4be9f2a7 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/glowing_e.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/glowing_e.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/glowing_g.png b/examples/mobile/guitartuner/src/mycomponents/images/glowing_g.png
index 4216d828..4216d828 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/glowing_g.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/glowing_g.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/guitartuner_malli.png b/examples/mobile/guitartuner/src/mycomponents/images/guitartuner_malli.png
index dbe3fc79..dbe3fc79 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/guitartuner_malli.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/guitartuner_malli.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/guitartuner_skin.png b/examples/mobile/guitartuner/src/mycomponents/images/guitartuner_skin.png
index 5d53df9b..5d53df9b 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/guitartuner_skin.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/guitartuner_skin.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/lcdFrame.png b/examples/mobile/guitartuner/src/mycomponents/images/lcdFrame.png
index ff8dffc6..ff8dffc6 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/lcdFrame.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/lcdFrame.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/meterBG.png b/examples/mobile/guitartuner/src/mycomponents/images/meterBG.png
index 4046355c..4046355c 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/meterBG.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/meterBG.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/mute.png b/examples/mobile/guitartuner/src/mycomponents/images/mute.png
index 382e6047..382e6047 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/mute.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/mute.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/pointer.png b/examples/mobile/guitartuner/src/mycomponents/images/pointer.png
index d0cb21b8..d0cb21b8 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/pointer.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/pointer.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/pointerShadow.png b/examples/mobile/guitartuner/src/mycomponents/images/pointerShadow.png
index a7086391..a7086391 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/pointerShadow.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/pointerShadow.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/power.png b/examples/mobile/guitartuner/src/mycomponents/images/power.png
index 8ec0c5ce..8ec0c5ce 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/power.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/power.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/quit.png b/examples/mobile/guitartuner/src/mycomponents/images/quit.png
index 2a9443ec..2a9443ec 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/quit.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/quit.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/sensitivity.png b/examples/mobile/guitartuner/src/mycomponents/images/sensitivity.png
index c3d2ea31..c3d2ea31 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/sensitivity.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/sensitivity.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_a.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_a.png
index a1823e59..a1823e59 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_a.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_a.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_a_on.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_a_on.png
index 7c78cbd8..7c78cbd8 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_a_on.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_a_on.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_auto.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_auto.png
index b9e494bd..b9e494bd 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_auto.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_auto.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_auto_on.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_auto_on.png
index d5608d85..d5608d85 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_auto_on.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_auto_on.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_b.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_b.png
index 94977f87..94977f87 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_b.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_b.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_b_on.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_b_on.png
index 78841dc0..78841dc0 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_b_on.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_b_on.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_d.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_d.png
index 293ee55a..293ee55a 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_d.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_d.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_d_on.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_d_on.png
index 705de41d..705de41d 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_d_on.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_d_on.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_e.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_e.png
index 569d2c65..569d2c65 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_e.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_e.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_e_on.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_e_on.png
index 1342a914..1342a914 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_e_on.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_e_on.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_g.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_g.png
index a8f0de57..a8f0de57 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_g.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_g.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/tuner_g_on.png b/examples/mobile/guitartuner/src/mycomponents/images/tuner_g_on.png
index 6fdca419..6fdca419 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/tuner_g_on.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/tuner_g_on.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/voicemode_off.png b/examples/mobile/guitartuner/src/mycomponents/images/voicemode_off.png
index 0701dd34..0701dd34 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/voicemode_off.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/voicemode_off.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/voicemode_on.png b/examples/mobile/guitartuner/src/mycomponents/images/voicemode_on.png
index 986d589a..986d589a 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/voicemode_on.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/voicemode_on.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/volume.png b/examples/mobile/guitartuner/src/mycomponents/images/volume.png
index 46fdb7fa..46fdb7fa 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/volume.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/volume.png
diff --git a/demos/mobile/guitartuner/src/mycomponents/images/volume_off.png b/examples/mobile/guitartuner/src/mycomponents/images/volume_off.png
index a97e4224..a97e4224 100644
--- a/demos/mobile/guitartuner/src/mycomponents/images/volume_off.png
+++ b/examples/mobile/guitartuner/src/mycomponents/images/volume_off.png
diff --git a/demos/mobile/guitartuner/src/voiceanalyzer.cpp b/examples/mobile/guitartuner/src/voiceanalyzer.cpp
index 5913bf79..5913bf79 100644
--- a/demos/mobile/guitartuner/src/voiceanalyzer.cpp
+++ b/examples/mobile/guitartuner/src/voiceanalyzer.cpp
diff --git a/demos/mobile/guitartuner/src/voiceanalyzer.h b/examples/mobile/guitartuner/src/voiceanalyzer.h
index 51a69021..51a69021 100644
--- a/demos/mobile/guitartuner/src/voiceanalyzer.h
+++ b/examples/mobile/guitartuner/src/voiceanalyzer.h
diff --git a/demos/mobile/guitartuner/src/voicegenerator.cpp b/examples/mobile/guitartuner/src/voicegenerator.cpp
index 74e31925..74e31925 100644
--- a/demos/mobile/guitartuner/src/voicegenerator.cpp
+++ b/examples/mobile/guitartuner/src/voicegenerator.cpp
diff --git a/demos/mobile/guitartuner/src/voicegenerator.h b/examples/mobile/guitartuner/src/voicegenerator.h
index 5c048d95..5c048d95 100644
--- a/demos/mobile/guitartuner/src/voicegenerator.h
+++ b/examples/mobile/guitartuner/src/voicegenerator.h
diff --git a/demos/mobile/qtbubblelevel/accelerometerfilter.cpp b/examples/mobile/qtbubblelevel/accelerometerfilter.cpp
index b940bb98..b940bb98 100644
--- a/demos/mobile/qtbubblelevel/accelerometerfilter.cpp
+++ b/examples/mobile/qtbubblelevel/accelerometerfilter.cpp
diff --git a/demos/mobile/qtbubblelevel/accelerometerfilter.h b/examples/mobile/qtbubblelevel/accelerometerfilter.h
index 5b3c8e88..5b3c8e88 100644
--- a/demos/mobile/qtbubblelevel/accelerometerfilter.h
+++ b/examples/mobile/qtbubblelevel/accelerometerfilter.h
diff --git a/demos/mobile/qtbubblelevel/debian/changelog b/examples/mobile/qtbubblelevel/debian/changelog
index 0413145a..0413145a 100644
--- a/demos/mobile/qtbubblelevel/debian/changelog
+++ b/examples/mobile/qtbubblelevel/debian/changelog
diff --git a/demos/mobile/qtbubblelevel/debian/compat b/examples/mobile/qtbubblelevel/debian/compat
index 7f8f011e..7f8f011e 100644
--- a/demos/mobile/qtbubblelevel/debian/compat
+++ b/examples/mobile/qtbubblelevel/debian/compat
diff --git a/demos/mobile/qtbubblelevel/debian/control b/examples/mobile/qtbubblelevel/debian/control
index 59803270..59803270 100644
--- a/demos/mobile/qtbubblelevel/debian/control
+++ b/examples/mobile/qtbubblelevel/debian/control
diff --git a/demos/mobile/qtbubblelevel/debian/copyright b/examples/mobile/qtbubblelevel/debian/copyright
index e8dea63d..e8dea63d 100644
--- a/demos/mobile/qtbubblelevel/debian/copyright
+++ b/examples/mobile/qtbubblelevel/debian/copyright
diff --git a/demos/mobile/qtbubblelevel/debian/dirs b/examples/mobile/qtbubblelevel/debian/dirs
index 80507f10..80507f10 100644
--- a/demos/mobile/qtbubblelevel/debian/dirs
+++ b/examples/mobile/qtbubblelevel/debian/dirs
diff --git a/demos/mobile/qtbubblelevel/debian/files b/examples/mobile/qtbubblelevel/debian/files
index 3d432422..3d432422 100644
--- a/demos/mobile/qtbubblelevel/debian/files
+++ b/examples/mobile/qtbubblelevel/debian/files
diff --git a/demos/mobile/qtbubblelevel/debian/postinst b/examples/mobile/qtbubblelevel/debian/postinst
index 79fb6ddd..79fb6ddd 100644
--- a/demos/mobile/qtbubblelevel/debian/postinst
+++ b/examples/mobile/qtbubblelevel/debian/postinst
diff --git a/demos/mobile/qtbubblelevel/debian/rules b/examples/mobile/qtbubblelevel/debian/rules
index f18b9cd8..f18b9cd8 100644
--- a/demos/mobile/qtbubblelevel/debian/rules
+++ b/examples/mobile/qtbubblelevel/debian/rules
diff --git a/demos/mobile/qtbubblelevel/icons/26x26/qtbubblelevel.png b/examples/mobile/qtbubblelevel/icons/26x26/qtbubblelevel.png
index ae34ccf5..ae34ccf5 100644
--- a/demos/mobile/qtbubblelevel/icons/26x26/qtbubblelevel.png
+++ b/examples/mobile/qtbubblelevel/icons/26x26/qtbubblelevel.png
diff --git a/demos/mobile/qtbubblelevel/icons/40x40/qtbubblelevel.png b/examples/mobile/qtbubblelevel/icons/40x40/qtbubblelevel.png
index 6230f55e..6230f55e 100644
--- a/demos/mobile/qtbubblelevel/icons/40x40/qtbubblelevel.png
+++ b/examples/mobile/qtbubblelevel/icons/40x40/qtbubblelevel.png
diff --git a/demos/mobile/qtbubblelevel/icons/64x64/qtbubblelevel.png b/examples/mobile/qtbubblelevel/icons/64x64/qtbubblelevel.png
index 375326c0..375326c0 100644
--- a/demos/mobile/qtbubblelevel/icons/64x64/qtbubblelevel.png
+++ b/examples/mobile/qtbubblelevel/icons/64x64/qtbubblelevel.png
diff --git a/demos/mobile/qtbubblelevel/icons/bubblelevel.svg b/examples/mobile/qtbubblelevel/icons/bubblelevel.svg
index a3c30dfa..a3c30dfa 100644
--- a/demos/mobile/qtbubblelevel/icons/bubblelevel.svg
+++ b/examples/mobile/qtbubblelevel/icons/bubblelevel.svg
diff --git a/demos/mobile/qtbubblelevel/icons/qtbl_icon.png b/examples/mobile/qtbubblelevel/icons/qtbl_icon.png
index 780fbb41..780fbb41 100644
--- a/demos/mobile/qtbubblelevel/icons/qtbl_icon.png
+++ b/examples/mobile/qtbubblelevel/icons/qtbl_icon.png
diff --git a/demos/mobile/qtbubblelevel/icons/xpm/qtbubblelevel.xpm b/examples/mobile/qtbubblelevel/icons/xpm/qtbubblelevel.xpm
index 19f3c2f3..19f3c2f3 100644
--- a/demos/mobile/qtbubblelevel/icons/xpm/qtbubblelevel.xpm
+++ b/examples/mobile/qtbubblelevel/icons/xpm/qtbubblelevel.xpm
diff --git a/demos/mobile/qtbubblelevel/main.cpp b/examples/mobile/qtbubblelevel/main.cpp
index 1aef1060..1aef1060 100644
--- a/demos/mobile/qtbubblelevel/main.cpp
+++ b/examples/mobile/qtbubblelevel/main.cpp
diff --git a/demos/mobile/qtbubblelevel/qml/BubbleLevel.qml b/examples/mobile/qtbubblelevel/qml/BubbleLevel.qml
index 28917368..28917368 100644
--- a/demos/mobile/qtbubblelevel/qml/BubbleLevel.qml
+++ b/examples/mobile/qtbubblelevel/qml/BubbleLevel.qml
diff --git a/demos/mobile/qtbubblelevel/qml/Button.qml b/examples/mobile/qtbubblelevel/qml/Button.qml
index 42375f6f..42375f6f 100644
--- a/demos/mobile/qtbubblelevel/qml/Button.qml
+++ b/examples/mobile/qtbubblelevel/qml/Button.qml
diff --git a/demos/mobile/qtbubblelevel/qml/Tube.qml b/examples/mobile/qtbubblelevel/qml/Tube.qml
index 8c20f121..8c20f121 100644
--- a/demos/mobile/qtbubblelevel/qml/Tube.qml
+++ b/examples/mobile/qtbubblelevel/qml/Tube.qml
diff --git a/demos/mobile/qtbubblelevel/qml/images/board.png b/examples/mobile/qtbubblelevel/qml/images/board.png
index aaed8d01..aaed8d01 100644
--- a/demos/mobile/qtbubblelevel/qml/images/board.png
+++ b/examples/mobile/qtbubblelevel/qml/images/board.png
diff --git a/demos/mobile/qtbubblelevel/qml/images/bubble.png b/examples/mobile/qtbubblelevel/qml/images/bubble.png
index e73be9e5..e73be9e5 100644
--- a/demos/mobile/qtbubblelevel/qml/images/bubble.png
+++ b/examples/mobile/qtbubblelevel/qml/images/bubble.png
diff --git a/demos/mobile/qtbubblelevel/qml/images/calibbutton.png b/examples/mobile/qtbubblelevel/qml/images/calibbutton.png
index 5f84dad7..5f84dad7 100644
--- a/demos/mobile/qtbubblelevel/qml/images/calibbutton.png
+++ b/examples/mobile/qtbubblelevel/qml/images/calibbutton.png
diff --git a/demos/mobile/qtbubblelevel/qml/images/exit.png b/examples/mobile/qtbubblelevel/qml/images/exit.png
index 64a61634..64a61634 100644
--- a/demos/mobile/qtbubblelevel/qml/images/exit.png
+++ b/examples/mobile/qtbubblelevel/qml/images/exit.png
diff --git a/demos/mobile/qtbubblelevel/qml/images/reflection.png b/examples/mobile/qtbubblelevel/qml/images/reflection.png
index 093781ec..093781ec 100644
--- a/demos/mobile/qtbubblelevel/qml/images/reflection.png
+++ b/examples/mobile/qtbubblelevel/qml/images/reflection.png
diff --git a/demos/mobile/qtbubblelevel/qml/images/scale.png b/examples/mobile/qtbubblelevel/qml/images/scale.png
index c75b21e2..c75b21e2 100644
--- a/demos/mobile/qtbubblelevel/qml/images/scale.png
+++ b/examples/mobile/qtbubblelevel/qml/images/scale.png
diff --git a/demos/mobile/qtbubblelevel/qml/images/signblank.png b/examples/mobile/qtbubblelevel/qml/images/signblank.png
index 03b53cc0..03b53cc0 100644
--- a/demos/mobile/qtbubblelevel/qml/images/signblank.png
+++ b/examples/mobile/qtbubblelevel/qml/images/signblank.png
diff --git a/demos/mobile/qtbubblelevel/qml/images/signwithtext.png b/examples/mobile/qtbubblelevel/qml/images/signwithtext.png
index be9c050f..be9c050f 100644
--- a/demos/mobile/qtbubblelevel/qml/images/signwithtext.png
+++ b/examples/mobile/qtbubblelevel/qml/images/signwithtext.png
diff --git a/demos/mobile/qtbubblelevel/qml/images/taskswitcher.png b/examples/mobile/qtbubblelevel/qml/images/taskswitcher.png
index 89ff7a15..89ff7a15 100644
--- a/demos/mobile/qtbubblelevel/qml/images/taskswitcher.png
+++ b/examples/mobile/qtbubblelevel/qml/images/taskswitcher.png
diff --git a/demos/mobile/qtbubblelevel/qtbubblelevel.pro b/examples/mobile/qtbubblelevel/qtbubblelevel.pro
index 93c676c6..93c676c6 100644
--- a/demos/mobile/qtbubblelevel/qtbubblelevel.pro
+++ b/examples/mobile/qtbubblelevel/qtbubblelevel.pro
diff --git a/demos/mobile/qtbubblelevel/resources.qrc b/examples/mobile/qtbubblelevel/resources.qrc
index 8f57e825..8f57e825 100644
--- a/demos/mobile/qtbubblelevel/resources.qrc
+++ b/examples/mobile/qtbubblelevel/resources.qrc
diff --git a/demos/mobile/qtbubblelevel/settings.h b/examples/mobile/qtbubblelevel/settings.h
index 06924615..06924615 100644
--- a/demos/mobile/qtbubblelevel/settings.h
+++ b/examples/mobile/qtbubblelevel/settings.h
diff --git a/demos/mobile/qtbubblelevel/taskswitcher.cpp b/examples/mobile/qtbubblelevel/taskswitcher.cpp
index 91b8fc4c..91b8fc4c 100644
--- a/demos/mobile/qtbubblelevel/taskswitcher.cpp
+++ b/examples/mobile/qtbubblelevel/taskswitcher.cpp
diff --git a/demos/mobile/qtbubblelevel/taskswitcher.h b/examples/mobile/qtbubblelevel/taskswitcher.h
index 2d9aac55..2d9aac55 100644
--- a/demos/mobile/qtbubblelevel/taskswitcher.h
+++ b/examples/mobile/qtbubblelevel/taskswitcher.h
diff --git a/demos/mobile/quickhit/Button.qml b/examples/mobile/quickhit/Button.qml
index 9410d758..9410d758 100644
--- a/demos/mobile/quickhit/Button.qml
+++ b/examples/mobile/quickhit/Button.qml
diff --git a/demos/mobile/quickhit/Game.js b/examples/mobile/quickhit/Game.js
index ed83eb3d..ed83eb3d 100644
--- a/demos/mobile/quickhit/Game.js
+++ b/examples/mobile/quickhit/Game.js
diff --git a/demos/mobile/quickhit/Game.qml b/examples/mobile/quickhit/Game.qml
index 19ba2b45..19ba2b45 100644
--- a/demos/mobile/quickhit/Game.qml
+++ b/examples/mobile/quickhit/Game.qml
diff --git a/demos/mobile/quickhit/InvSounds.cpp b/examples/mobile/quickhit/InvSounds.cpp
index bcacfff1..bcacfff1 100644
--- a/demos/mobile/quickhit/InvSounds.cpp
+++ b/examples/mobile/quickhit/InvSounds.cpp
diff --git a/demos/mobile/quickhit/InvSounds.h b/examples/mobile/quickhit/InvSounds.h
index 4a111e7b..4a111e7b 100644
--- a/demos/mobile/quickhit/InvSounds.h
+++ b/examples/mobile/quickhit/InvSounds.h
diff --git a/demos/mobile/quickhit/Menu.qml b/examples/mobile/quickhit/Menu.qml
index 13e325b9..13e325b9 100644
--- a/demos/mobile/quickhit/Menu.qml
+++ b/examples/mobile/quickhit/Menu.qml
diff --git a/demos/mobile/quickhit/MenuItem.qml b/examples/mobile/quickhit/MenuItem.qml
index 60d33b12..60d33b12 100644
--- a/demos/mobile/quickhit/MenuItem.qml
+++ b/examples/mobile/quickhit/MenuItem.qml
diff --git a/demos/mobile/quickhit/Message.qml b/examples/mobile/quickhit/Message.qml
index 3e7c3f9e..3e7c3f9e 100644
--- a/demos/mobile/quickhit/Message.qml
+++ b/examples/mobile/quickhit/Message.qml
diff --git a/demos/mobile/quickhit/Missile.qml b/examples/mobile/quickhit/Missile.qml
index 6ef201d0..6ef201d0 100644
--- a/demos/mobile/quickhit/Missile.qml
+++ b/examples/mobile/quickhit/Missile.qml
diff --git a/demos/mobile/quickhit/MyShip.qml b/examples/mobile/quickhit/MyShip.qml
index be89986b..be89986b 100644
--- a/demos/mobile/quickhit/MyShip.qml
+++ b/examples/mobile/quickhit/MyShip.qml
diff --git a/demos/mobile/quickhit/debian/changelog b/examples/mobile/quickhit/debian/changelog
index 226e172d..226e172d 100644
--- a/demos/mobile/quickhit/debian/changelog
+++ b/examples/mobile/quickhit/debian/changelog
diff --git a/demos/mobile/quickhit/debian/compat b/examples/mobile/quickhit/debian/compat
index 7f8f011e..7f8f011e 100644
--- a/demos/mobile/quickhit/debian/compat
+++ b/examples/mobile/quickhit/debian/compat
diff --git a/demos/mobile/quickhit/debian/control b/examples/mobile/quickhit/debian/control
index 7253285e..7253285e 100644
--- a/demos/mobile/quickhit/debian/control
+++ b/examples/mobile/quickhit/debian/control
diff --git a/demos/mobile/quickhit/debian/copyright b/examples/mobile/quickhit/debian/copyright
index b0aadafe..b0aadafe 100644
--- a/demos/mobile/quickhit/debian/copyright
+++ b/examples/mobile/quickhit/debian/copyright
diff --git a/demos/mobile/quickhit/debian/dirs b/examples/mobile/quickhit/debian/dirs
index 80507f10..80507f10 100644
--- a/demos/mobile/quickhit/debian/dirs
+++ b/examples/mobile/quickhit/debian/dirs
diff --git a/demos/mobile/quickhit/debian/postinst b/examples/mobile/quickhit/debian/postinst
index 79fb6ddd..79fb6ddd 100644
--- a/demos/mobile/quickhit/debian/postinst
+++ b/examples/mobile/quickhit/debian/postinst
diff --git a/demos/mobile/quickhit/debian/rules b/examples/mobile/quickhit/debian/rules
index b485428f..b485428f 100644
--- a/demos/mobile/quickhit/debian/rules
+++ b/examples/mobile/quickhit/debian/rules
diff --git a/demos/mobile/quickhit/freesound.org.licence.txt b/examples/mobile/quickhit/freesound.org.licence.txt
index 8714ea04..8714ea04 100644
--- a/demos/mobile/quickhit/freesound.org.licence.txt
+++ b/examples/mobile/quickhit/freesound.org.licence.txt
diff --git a/demos/mobile/quickhit/ga_src/GEAudioBuffer.cpp b/examples/mobile/quickhit/ga_src/GEAudioBuffer.cpp
index 79addba5..79addba5 100644
--- a/demos/mobile/quickhit/ga_src/GEAudioBuffer.cpp
+++ b/examples/mobile/quickhit/ga_src/GEAudioBuffer.cpp
diff --git a/demos/mobile/quickhit/ga_src/GEAudioBuffer.h b/examples/mobile/quickhit/ga_src/GEAudioBuffer.h
index 414461b6..414461b6 100644
--- a/demos/mobile/quickhit/ga_src/GEAudioBuffer.h
+++ b/examples/mobile/quickhit/ga_src/GEAudioBuffer.h
diff --git a/demos/mobile/quickhit/ga_src/GEAudioOut.cpp b/examples/mobile/quickhit/ga_src/GEAudioOut.cpp
index 679a159f..679a159f 100644
--- a/demos/mobile/quickhit/ga_src/GEAudioOut.cpp
+++ b/examples/mobile/quickhit/ga_src/GEAudioOut.cpp
diff --git a/demos/mobile/quickhit/ga_src/GEAudioOut.h b/examples/mobile/quickhit/ga_src/GEAudioOut.h
index ec41d002..ec41d002 100644
--- a/demos/mobile/quickhit/ga_src/GEAudioOut.h
+++ b/examples/mobile/quickhit/ga_src/GEAudioOut.h
diff --git a/demos/mobile/quickhit/ga_src/GEInterfaces.cpp b/examples/mobile/quickhit/ga_src/GEInterfaces.cpp
index 4e5d492c..4e5d492c 100644
--- a/demos/mobile/quickhit/ga_src/GEInterfaces.cpp
+++ b/examples/mobile/quickhit/ga_src/GEInterfaces.cpp
diff --git a/demos/mobile/quickhit/ga_src/GEInterfaces.h b/examples/mobile/quickhit/ga_src/GEInterfaces.h
index 48abb9f1..48abb9f1 100644
--- a/demos/mobile/quickhit/ga_src/GEInterfaces.h
+++ b/examples/mobile/quickhit/ga_src/GEInterfaces.h
diff --git a/demos/mobile/quickhit/gameengine.cpp b/examples/mobile/quickhit/gameengine.cpp
index e552f543..e552f543 100644
--- a/demos/mobile/quickhit/gameengine.cpp
+++ b/examples/mobile/quickhit/gameengine.cpp
diff --git a/demos/mobile/quickhit/gameengine.h b/examples/mobile/quickhit/gameengine.h
index d7dd2f66..d7dd2f66 100644
--- a/demos/mobile/quickhit/gameengine.h
+++ b/examples/mobile/quickhit/gameengine.h
diff --git a/demos/mobile/quickhit/gfx/back.png b/examples/mobile/quickhit/gfx/back.png
index bb66f740..bb66f740 100644
--- a/demos/mobile/quickhit/gfx/back.png
+++ b/examples/mobile/quickhit/gfx/back.png
diff --git a/demos/mobile/quickhit/gfx/background2.png b/examples/mobile/quickhit/gfx/background2.png
index c81875ac..c81875ac 100644
--- a/demos/mobile/quickhit/gfx/background2.png
+++ b/examples/mobile/quickhit/gfx/background2.png
diff --git a/demos/mobile/quickhit/gfx/bigship.png b/examples/mobile/quickhit/gfx/bigship.png
index b88dc321..b88dc321 100644
--- a/demos/mobile/quickhit/gfx/bigship.png
+++ b/examples/mobile/quickhit/gfx/bigship.png
diff --git a/demos/mobile/quickhit/gfx/exit.png b/examples/mobile/quickhit/gfx/exit.png
index a45abd6f..a45abd6f 100644
--- a/demos/mobile/quickhit/gfx/exit.png
+++ b/examples/mobile/quickhit/gfx/exit.png
diff --git a/demos/mobile/quickhit/gfx/pause.png b/examples/mobile/quickhit/gfx/pause.png
index 05709087..05709087 100644
--- a/demos/mobile/quickhit/gfx/pause.png
+++ b/examples/mobile/quickhit/gfx/pause.png
diff --git a/demos/mobile/quickhit/gfx/quickhit_logo.png b/examples/mobile/quickhit/gfx/quickhit_logo.png
index 0b505c70..0b505c70 100644
--- a/demos/mobile/quickhit/gfx/quickhit_logo.png
+++ b/examples/mobile/quickhit/gfx/quickhit_logo.png
diff --git a/demos/mobile/quickhit/gfx/soundOff.png b/examples/mobile/quickhit/gfx/soundOff.png
index fed8520a..fed8520a 100644
--- a/demos/mobile/quickhit/gfx/soundOff.png
+++ b/examples/mobile/quickhit/gfx/soundOff.png
diff --git a/demos/mobile/quickhit/gfx/soundOn.png b/examples/mobile/quickhit/gfx/soundOn.png
index 03bd80e9..03bd80e9 100644
--- a/demos/mobile/quickhit/gfx/soundOn.png
+++ b/examples/mobile/quickhit/gfx/soundOn.png
diff --git a/demos/mobile/quickhit/icon.svg b/examples/mobile/quickhit/icon.svg
index 3795e8d9..3795e8d9 100644
--- a/demos/mobile/quickhit/icon.svg
+++ b/examples/mobile/quickhit/icon.svg
diff --git a/demos/mobile/quickhit/main.cpp b/examples/mobile/quickhit/main.cpp
index 7575b3cb..7575b3cb 100644
--- a/demos/mobile/quickhit/main.cpp
+++ b/examples/mobile/quickhit/main.cpp
diff --git a/demos/mobile/quickhit/mainwindow.cpp b/examples/mobile/quickhit/mainwindow.cpp
index 2ab0cb1a..2ab0cb1a 100644
--- a/demos/mobile/quickhit/mainwindow.cpp
+++ b/examples/mobile/quickhit/mainwindow.cpp
diff --git a/demos/mobile/quickhit/mainwindow.h b/examples/mobile/quickhit/mainwindow.h
index 6393cd75..6393cd75 100644
--- a/demos/mobile/quickhit/mainwindow.h
+++ b/examples/mobile/quickhit/mainwindow.h
diff --git a/demos/mobile/quickhit/myeventfilter.cpp b/examples/mobile/quickhit/myeventfilter.cpp
index 03325705..03325705 100644
--- a/demos/mobile/quickhit/myeventfilter.cpp
+++ b/examples/mobile/quickhit/myeventfilter.cpp
diff --git a/demos/mobile/quickhit/myeventfilter.h b/examples/mobile/quickhit/myeventfilter.h
index ecff3a1c..ecff3a1c 100644
--- a/demos/mobile/quickhit/myeventfilter.h
+++ b/examples/mobile/quickhit/myeventfilter.h
diff --git a/demos/mobile/quickhit/plugins/LevelOne/Level.qml b/examples/mobile/quickhit/plugins/LevelOne/Level.qml
index 03cc1c15..03cc1c15 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/Level.qml
+++ b/examples/mobile/quickhit/plugins/LevelOne/Level.qml
diff --git a/demos/mobile/quickhit/plugins/LevelOne/debian/changelog b/examples/mobile/quickhit/plugins/LevelOne/debian/changelog
index de7ac989..de7ac989 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/debian/changelog
+++ b/examples/mobile/quickhit/plugins/LevelOne/debian/changelog
diff --git a/demos/mobile/quickhit/plugins/LevelOne/debian/compat b/examples/mobile/quickhit/plugins/LevelOne/debian/compat
index 7f8f011e..7f8f011e 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/debian/compat
+++ b/examples/mobile/quickhit/plugins/LevelOne/debian/compat
diff --git a/demos/mobile/quickhit/plugins/LevelOne/debian/control b/examples/mobile/quickhit/plugins/LevelOne/debian/control
index c46afefb..c46afefb 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/debian/control
+++ b/examples/mobile/quickhit/plugins/LevelOne/debian/control
diff --git a/demos/mobile/quickhit/plugins/LevelOne/debian/copyright b/examples/mobile/quickhit/plugins/LevelOne/debian/copyright
index fb9e5a8e..fb9e5a8e 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/debian/copyright
+++ b/examples/mobile/quickhit/plugins/LevelOne/debian/copyright
diff --git a/demos/mobile/quickhit/plugins/LevelOne/debian/dirs b/examples/mobile/quickhit/plugins/LevelOne/debian/dirs
index 80507f10..80507f10 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/debian/dirs
+++ b/examples/mobile/quickhit/plugins/LevelOne/debian/dirs
diff --git a/demos/mobile/quickhit/plugins/LevelOne/debian/postinst b/examples/mobile/quickhit/plugins/LevelOne/debian/postinst
index 79fb6ddd..79fb6ddd 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/debian/postinst
+++ b/examples/mobile/quickhit/plugins/LevelOne/debian/postinst
diff --git a/demos/mobile/quickhit/plugins/LevelOne/debian/rules b/examples/mobile/quickhit/plugins/LevelOne/debian/rules
index 53a1d2ea..53a1d2ea 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/debian/rules
+++ b/examples/mobile/quickhit/plugins/LevelOne/debian/rules
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/background3.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/background3.png
index c81875ac..c81875ac 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/background3.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/background3.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/enemy1.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/enemy1.png
index 94f149bd..94f149bd 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/enemy1.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/enemy1.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/enemy2.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/enemy2.png
index 448f8ca6..448f8ca6 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/enemy2.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/enemy2.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/enemy_missile2.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/enemy_missile2.png
index c0b28d86..c0b28d86 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/enemy_missile2.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/enemy_missile2.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/fire.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/fire.png
index 84010340..84010340 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/fire.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/fire.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/fire2.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/fire2.png
index 139aa611..139aa611 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/fire2.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/fire2.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/missile2.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/missile2.png
index dacd6106..dacd6106 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/missile2.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/missile2.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/red_fire.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/red_fire.png
index 464d603d..464d603d 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/red_fire.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/red_fire.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/ship.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/ship.png
index cb7851c4..cb7851c4 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/ship.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/ship.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/star3.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/star3.png
index f37a3917..f37a3917 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/star3.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/star3.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/gfx/transparent.png b/examples/mobile/quickhit/plugins/LevelOne/gfx/transparent.png
index 3aa1e413..3aa1e413 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/gfx/transparent.png
+++ b/examples/mobile/quickhit/plugins/LevelOne/gfx/transparent.png
diff --git a/demos/mobile/quickhit/plugins/LevelOne/levelone.cpp b/examples/mobile/quickhit/plugins/LevelOne/levelone.cpp
index 65fd5595..65fd5595 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/levelone.cpp
+++ b/examples/mobile/quickhit/plugins/LevelOne/levelone.cpp
diff --git a/demos/mobile/quickhit/plugins/LevelOne/levelone.h b/examples/mobile/quickhit/plugins/LevelOne/levelone.h
index 54067182..54067182 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/levelone.h
+++ b/examples/mobile/quickhit/plugins/LevelOne/levelone.h
diff --git a/demos/mobile/quickhit/plugins/LevelOne/levelone.json b/examples/mobile/quickhit/plugins/LevelOne/levelone.json
index 0967ef42..0967ef42 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/levelone.json
+++ b/examples/mobile/quickhit/plugins/LevelOne/levelone.json
diff --git a/demos/mobile/quickhit/plugins/LevelOne/levelone.pro b/examples/mobile/quickhit/plugins/LevelOne/levelone.pro
index 23bd275a..23bd275a 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/levelone.pro
+++ b/examples/mobile/quickhit/plugins/LevelOne/levelone.pro
diff --git a/demos/mobile/quickhit/plugins/LevelOne/sound/crash.wav b/examples/mobile/quickhit/plugins/LevelOne/sound/crash.wav
index 8076f0f6..8076f0f6 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/sound/crash.wav
+++ b/examples/mobile/quickhit/plugins/LevelOne/sound/crash.wav
diff --git a/demos/mobile/quickhit/plugins/LevelOne/sound/levelonestart.wav b/examples/mobile/quickhit/plugins/LevelOne/sound/levelonestart.wav
index e9e3ac03..e9e3ac03 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/sound/levelonestart.wav
+++ b/examples/mobile/quickhit/plugins/LevelOne/sound/levelonestart.wav
diff --git a/demos/mobile/quickhit/plugins/LevelOne/sound/rocket.wav b/examples/mobile/quickhit/plugins/LevelOne/sound/rocket.wav
index 8c0dee9a..8c0dee9a 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/sound/rocket.wav
+++ b/examples/mobile/quickhit/plugins/LevelOne/sound/rocket.wav
diff --git a/demos/mobile/quickhit/plugins/LevelOne/sound/rocket_explosion.wav b/examples/mobile/quickhit/plugins/LevelOne/sound/rocket_explosion.wav
index d2b451cc..d2b451cc 100644
--- a/demos/mobile/quickhit/plugins/LevelOne/sound/rocket_explosion.wav
+++ b/examples/mobile/quickhit/plugins/LevelOne/sound/rocket_explosion.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/debian/changelog b/examples/mobile/quickhit/plugins/LevelTemplate/debian/changelog
index a5e0a1bd..a5e0a1bd 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/debian/changelog
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/debian/changelog
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/debian/compat b/examples/mobile/quickhit/plugins/LevelTemplate/debian/compat
index 7f8f011e..7f8f011e 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/debian/compat
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/debian/compat
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/debian/control b/examples/mobile/quickhit/plugins/LevelTemplate/debian/control
index 68742fdf..68742fdf 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/debian/control
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/debian/control
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/debian/copyright b/examples/mobile/quickhit/plugins/LevelTemplate/debian/copyright
index f9ee8e22..f9ee8e22 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/debian/copyright
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/debian/copyright
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/debian/dirs b/examples/mobile/quickhit/plugins/LevelTemplate/debian/dirs
index 80507f10..80507f10 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/debian/dirs
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/debian/dirs
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/debian/levelone.tarlist b/examples/mobile/quickhit/plugins/LevelTemplate/debian/levelone.tarlist
index f3146fa1..f3146fa1 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/debian/levelone.tarlist
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/debian/levelone.tarlist
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/debian/postinst b/examples/mobile/quickhit/plugins/LevelTemplate/debian/postinst
index 79fb6ddd..79fb6ddd 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/debian/postinst
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/debian/postinst
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/debian/rules b/examples/mobile/quickhit/plugins/LevelTemplate/debian/rules
index 7f30ca37..7f30ca37 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/debian/rules
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/debian/rules
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/blue_fire.png b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/blue_fire.png
index 8667a397..8667a397 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/blue_fire.png
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/blue_fire.png
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/enemy1.png b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/enemy1.png
index 94f149bd..94f149bd 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/enemy1.png
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/enemy1.png
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/enemy2.png b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/enemy2.png
index 448f8ca6..448f8ca6 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/enemy2.png
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/enemy2.png
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/enemy_missile2.png b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/enemy_missile2.png
index c0b28d86..c0b28d86 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/enemy_missile2.png
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/enemy_missile2.png
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/missile2.png b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/missile2.png
index dacd6106..dacd6106 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/missile2.png
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/missile2.png
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/ship.png b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/ship.png
index cb7851c4..cb7851c4 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/ship.png
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/ship.png
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/transparent.png b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/transparent.png
index 3aa1e413..3aa1e413 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/gfx/transparent.png
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/gfx/transparent.png
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/leveltemplate.cpp b/examples/mobile/quickhit/plugins/LevelTemplate/leveltemplate.cpp
index 47598c89..47598c89 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/leveltemplate.cpp
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/leveltemplate.cpp
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/leveltemplate.h b/examples/mobile/quickhit/plugins/LevelTemplate/leveltemplate.h
index 55019036..55019036 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/leveltemplate.h
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/leveltemplate.h
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/leveltemplate.pro b/examples/mobile/quickhit/plugins/LevelTemplate/leveltemplate.pro
index 0eecca7e..0eecca7e 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/leveltemplate.pro
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/leveltemplate.pro
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/qml/Enemy.qml b/examples/mobile/quickhit/plugins/LevelTemplate/qml/Enemy.qml
index 96d13222..96d13222 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/qml/Enemy.qml
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/qml/Enemy.qml
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/qml/Level.js b/examples/mobile/quickhit/plugins/LevelTemplate/qml/Level.js
index 9529d4af..9529d4af 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/qml/Level.js
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/qml/Level.js
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/qml/Level.qml b/examples/mobile/quickhit/plugins/LevelTemplate/qml/Level.qml
index 6a5d25a1..6a5d25a1 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/qml/Level.qml
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/qml/Level.qml
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/sound/crash.wav b/examples/mobile/quickhit/plugins/LevelTemplate/sound/crash.wav
index 8076f0f6..8076f0f6 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/sound/crash.wav
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/sound/crash.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/sound/enableship.wav b/examples/mobile/quickhit/plugins/LevelTemplate/sound/enableship.wav
index 6fe5fe84..6fe5fe84 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/sound/enableship.wav
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/sound/enableship.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/sound/enemy_explosion.wav b/examples/mobile/quickhit/plugins/LevelTemplate/sound/enemy_explosion.wav
index fd338e6b..fd338e6b 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/sound/enemy_explosion.wav
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/sound/enemy_explosion.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/sound/laser.wav b/examples/mobile/quickhit/plugins/LevelTemplate/sound/laser.wav
index c3b58b20..c3b58b20 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/sound/laser.wav
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/sound/laser.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/sound/level2.wav b/examples/mobile/quickhit/plugins/LevelTemplate/sound/level2.wav
index 24d39174..24d39174 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/sound/level2.wav
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/sound/level2.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/sound/myship_explosion.wav b/examples/mobile/quickhit/plugins/LevelTemplate/sound/myship_explosion.wav
index e22d030e..e22d030e 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/sound/myship_explosion.wav
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/sound/myship_explosion.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/sound/rocket.wav b/examples/mobile/quickhit/plugins/LevelTemplate/sound/rocket.wav
index 8c0dee9a..8c0dee9a 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/sound/rocket.wav
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/sound/rocket.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTemplate/sound/rocket_explosion.wav b/examples/mobile/quickhit/plugins/LevelTemplate/sound/rocket_explosion.wav
index d2b451cc..d2b451cc 100644
--- a/demos/mobile/quickhit/plugins/LevelTemplate/sound/rocket_explosion.wav
+++ b/examples/mobile/quickhit/plugins/LevelTemplate/sound/rocket_explosion.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/debian/changelog b/examples/mobile/quickhit/plugins/LevelTwo/debian/changelog
index 106ef66d..106ef66d 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/debian/changelog
+++ b/examples/mobile/quickhit/plugins/LevelTwo/debian/changelog
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/debian/compat b/examples/mobile/quickhit/plugins/LevelTwo/debian/compat
index 7f8f011e..7f8f011e 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/debian/compat
+++ b/examples/mobile/quickhit/plugins/LevelTwo/debian/compat
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/debian/control b/examples/mobile/quickhit/plugins/LevelTwo/debian/control
index 8f9d05e4..8f9d05e4 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/debian/control
+++ b/examples/mobile/quickhit/plugins/LevelTwo/debian/control
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/debian/copyright b/examples/mobile/quickhit/plugins/LevelTwo/debian/copyright
index fb9e5a8e..fb9e5a8e 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/debian/copyright
+++ b/examples/mobile/quickhit/plugins/LevelTwo/debian/copyright
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/debian/dirs b/examples/mobile/quickhit/plugins/LevelTwo/debian/dirs
index 80507f10..80507f10 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/debian/dirs
+++ b/examples/mobile/quickhit/plugins/LevelTwo/debian/dirs
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/debian/levelone.tarlist b/examples/mobile/quickhit/plugins/LevelTwo/debian/levelone.tarlist
index f3146fa1..f3146fa1 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/debian/levelone.tarlist
+++ b/examples/mobile/quickhit/plugins/LevelTwo/debian/levelone.tarlist
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/debian/postinst b/examples/mobile/quickhit/plugins/LevelTwo/debian/postinst
index 79fb6ddd..79fb6ddd 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/debian/postinst
+++ b/examples/mobile/quickhit/plugins/LevelTwo/debian/postinst
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/debian/rules b/examples/mobile/quickhit/plugins/LevelTwo/debian/rules
index 5dac6e09..5dac6e09 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/debian/rules
+++ b/examples/mobile/quickhit/plugins/LevelTwo/debian/rules
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/background2.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/background2.png
index 8fbf2f46..8fbf2f46 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/background2.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/background2.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/background_loop.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/background_loop.png
index 3a135d2c..3a135d2c 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/background_loop.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/background_loop.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/blue_fire.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/blue_fire.png
index 8667a397..8667a397 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/blue_fire.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/blue_fire.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/enemy1.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/enemy1.png
index 94f149bd..94f149bd 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/enemy1.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/enemy1.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/enemy_missile2.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/enemy_missile2.png
index 5011d755..5011d755 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/enemy_missile2.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/enemy_missile2.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/fire.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/fire.png
index 84010340..84010340 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/fire.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/fire.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/fire2.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/fire2.png
index 139aa611..139aa611 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/fire2.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/fire2.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/missile.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/missile.png
index 86bb41bc..86bb41bc 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/missile.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/missile.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/missile2.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/missile2.png
index dacd6106..dacd6106 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/missile2.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/missile2.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/ship.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/ship.png
index cb7851c4..cb7851c4 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/ship.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/ship.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/star3.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/star3.png
index 70af0f3c..70af0f3c 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/star3.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/star3.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/gfx/transparent.png b/examples/mobile/quickhit/plugins/LevelTwo/gfx/transparent.png
index 3aa1e413..3aa1e413 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/gfx/transparent.png
+++ b/examples/mobile/quickhit/plugins/LevelTwo/gfx/transparent.png
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/leveltwo.cpp b/examples/mobile/quickhit/plugins/LevelTwo/leveltwo.cpp
index dae521e9..dae521e9 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/leveltwo.cpp
+++ b/examples/mobile/quickhit/plugins/LevelTwo/leveltwo.cpp
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/leveltwo.h b/examples/mobile/quickhit/plugins/LevelTwo/leveltwo.h
index 5e3ad08d..5e3ad08d 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/leveltwo.h
+++ b/examples/mobile/quickhit/plugins/LevelTwo/leveltwo.h
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/leveltwo.json b/examples/mobile/quickhit/plugins/LevelTwo/leveltwo.json
index 0967ef42..0967ef42 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/leveltwo.json
+++ b/examples/mobile/quickhit/plugins/LevelTwo/leveltwo.json
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/leveltwo.pro b/examples/mobile/quickhit/plugins/LevelTwo/leveltwo.pro
index 6395989b..6395989b 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/leveltwo.pro
+++ b/examples/mobile/quickhit/plugins/LevelTwo/leveltwo.pro
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/qml/Enemy.qml b/examples/mobile/quickhit/plugins/LevelTwo/qml/Enemy.qml
index bc27351c..bc27351c 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/qml/Enemy.qml
+++ b/examples/mobile/quickhit/plugins/LevelTwo/qml/Enemy.qml
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/qml/Level.js b/examples/mobile/quickhit/plugins/LevelTwo/qml/Level.js
index 9529d4af..9529d4af 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/qml/Level.js
+++ b/examples/mobile/quickhit/plugins/LevelTwo/qml/Level.js
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/qml/Level.qml b/examples/mobile/quickhit/plugins/LevelTwo/qml/Level.qml
index 45e40a9c..45e40a9c 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/qml/Level.qml
+++ b/examples/mobile/quickhit/plugins/LevelTwo/qml/Level.qml
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/sound/crash.wav b/examples/mobile/quickhit/plugins/LevelTwo/sound/crash.wav
index 8076f0f6..8076f0f6 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/sound/crash.wav
+++ b/examples/mobile/quickhit/plugins/LevelTwo/sound/crash.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/sound/enableship.wav b/examples/mobile/quickhit/plugins/LevelTwo/sound/enableship.wav
index 6fe5fe84..6fe5fe84 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/sound/enableship.wav
+++ b/examples/mobile/quickhit/plugins/LevelTwo/sound/enableship.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/sound/enemy_explosion.wav b/examples/mobile/quickhit/plugins/LevelTwo/sound/enemy_explosion.wav
index fd338e6b..fd338e6b 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/sound/enemy_explosion.wav
+++ b/examples/mobile/quickhit/plugins/LevelTwo/sound/enemy_explosion.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/sound/laser.wav b/examples/mobile/quickhit/plugins/LevelTwo/sound/laser.wav
index c3b58b20..c3b58b20 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/sound/laser.wav
+++ b/examples/mobile/quickhit/plugins/LevelTwo/sound/laser.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/sound/level2.wav b/examples/mobile/quickhit/plugins/LevelTwo/sound/level2.wav
index 24d39174..24d39174 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/sound/level2.wav
+++ b/examples/mobile/quickhit/plugins/LevelTwo/sound/level2.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/sound/myship_explosion.wav b/examples/mobile/quickhit/plugins/LevelTwo/sound/myship_explosion.wav
index e22d030e..e22d030e 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/sound/myship_explosion.wav
+++ b/examples/mobile/quickhit/plugins/LevelTwo/sound/myship_explosion.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/sound/rocket.wav b/examples/mobile/quickhit/plugins/LevelTwo/sound/rocket.wav
index 8c0dee9a..8c0dee9a 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/sound/rocket.wav
+++ b/examples/mobile/quickhit/plugins/LevelTwo/sound/rocket.wav
diff --git a/demos/mobile/quickhit/plugins/LevelTwo/sound/rocket_explosion.wav b/examples/mobile/quickhit/plugins/LevelTwo/sound/rocket_explosion.wav
index d2b451cc..d2b451cc 100644
--- a/demos/mobile/quickhit/plugins/LevelTwo/sound/rocket_explosion.wav
+++ b/examples/mobile/quickhit/plugins/LevelTwo/sound/rocket_explosion.wav
diff --git a/demos/mobile/quickhit/plugins/levelplugininterface.h b/examples/mobile/quickhit/plugins/levelplugininterface.h
index b4ed6ad4..b4ed6ad4 100644
--- a/demos/mobile/quickhit/plugins/levelplugininterface.h
+++ b/examples/mobile/quickhit/plugins/levelplugininterface.h
diff --git a/demos/mobile/quickhit/quickhit.png b/examples/mobile/quickhit/quickhit.png
index 01d2d609..01d2d609 100644
--- a/demos/mobile/quickhit/quickhit.png
+++ b/examples/mobile/quickhit/quickhit.png
diff --git a/demos/mobile/quickhit/quickhit.pro b/examples/mobile/quickhit/quickhit.pro
index cc980d92..cc980d92 100644
--- a/demos/mobile/quickhit/quickhit.pro
+++ b/examples/mobile/quickhit/quickhit.pro
diff --git a/demos/mobile/quickhit/resources.qrc b/examples/mobile/quickhit/resources.qrc
index 8063bf7a..8063bf7a 100644
--- a/demos/mobile/quickhit/resources.qrc
+++ b/examples/mobile/quickhit/resources.qrc
diff --git a/demos/mobile/quickhit/sound/gameover.wav b/examples/mobile/quickhit/sound/gameover.wav
index e5b9e94d..e5b9e94d 100644
--- a/demos/mobile/quickhit/sound/gameover.wav
+++ b/examples/mobile/quickhit/sound/gameover.wav
diff --git a/demos/mobile/quickhit/sound/gamestart.wav b/examples/mobile/quickhit/sound/gamestart.wav
index 8632fca3..8632fca3 100644
--- a/demos/mobile/quickhit/sound/gamestart.wav
+++ b/examples/mobile/quickhit/sound/gamestart.wav
diff --git a/demos/mobile/quickhit/sound/menu1.wav b/examples/mobile/quickhit/sound/menu1.wav
index 586ab2cb..586ab2cb 100644
--- a/demos/mobile/quickhit/sound/menu1.wav
+++ b/examples/mobile/quickhit/sound/menu1.wav
diff --git a/demos/mobile/quickhit/sound/menu2.wav b/examples/mobile/quickhit/sound/menu2.wav
index 70a61c11..70a61c11 100644
--- a/demos/mobile/quickhit/sound/menu2.wav
+++ b/examples/mobile/quickhit/sound/menu2.wav
diff --git a/demos/mobile/quickhit/sound/youwin.wav b/examples/mobile/quickhit/sound/youwin.wav
index f48297dd..f48297dd 100644
--- a/demos/mobile/quickhit/sound/youwin.wav
+++ b/examples/mobile/quickhit/sound/youwin.wav