Components exchangeable

Change-Id: If028c67235567de4d7d99775dcd48e8c0a1ebf75
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>

6 files changed, 63 insertions, 17 deletions

diff --git a/examples/sensors/maze/Maze.qml b/examples/sensors/maze/Maze.qml
index 90c22a6f..d8c37dea 100644
--- a/examples/sensors/maze/Maze.qml
+++ b/examples/sensors/maze/Maze.qml
@@ -38,16 +38,6 @@
 **
 ****************************************************************************/
 
-//Import the declarative plugins
-import QtQuick 2.0
-
-//! [0]
-import QtSensors 5.0
-//! [0]
-
-//Import the javascript functions for this game
-import "lib.js" as Lib
-
 /* Layout
                                 mainWnd
                                /
@@ -78,14 +68,19 @@ import "lib.js" as Lib
 ------------------------------
 
 */
+//Import the declarative plugins
+import QtQuick 2.0
+import "components"
+
+//! [0]
+import QtSensors 5.0
+//! [0]
+
+//Import the javascript functions for this game
+import "lib.js" as Lib
 
-Rectangle {
+ApplicationWindow {
     id: mainWnd
-    x: 0
-    y: 0
-    width: 320
-    height: 480
-    color: "#ececec"
 
     property Mouse mouseCtrl;
     property LabyrinthSquare cheeseSquare;
diff --git a/examples/sensors/maze/components/ApplicationWindow.qml b/examples/sensors/maze/components/ApplicationWindow.qml
new file mode 100644
index 00000000..4b67c2c2
--- /dev/null
+++ b/examples/sensors/maze/components/ApplicationWindow.qml
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtSensors module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//Import the declarative plugins
+import QtQuick 2.0
+
+Rectangle {
+    id: appWnd
+    x: 0
+    y: 0
+    width: 320
+    height: 480
+    color: "#ececec"
+}
diff --git a/examples/sensors/maze/Button.qml b/examples/sensors/maze/components/Button.qml
index 2ae8f772..ce8feb3f 100644
--- a/examples/sensors/maze/Button.qml
+++ b/examples/sensors/maze/components/Button.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/examples/sensors/maze/images/button_background_disabled.png b/examples/sensors/maze/components/images/button_background_disabled.png
index 62a00b9a..62a00b9a 100644
--- a/examples/sensors/maze/images/button_background_disabled.png
+++ b/examples/sensors/maze/components/images/button_background_disabled.png
diff --git a/examples/sensors/maze/images/button_background_normal.png b/examples/sensors/maze/components/images/button_background_normal.png
index 1fecad5b..1fecad5b 100644
--- a/examples/sensors/maze/images/button_background_normal.png
+++ b/examples/sensors/maze/components/images/button_background_normal.png
diff --git a/examples/sensors/maze/images/button_background_pressed.png b/examples/sensors/maze/components/images/button_background_pressed.png
index 149529e1..149529e1 100644
--- a/examples/sensors/maze/images/button_background_pressed.png
+++ b/examples/sensors/maze/components/images/button_background_pressed.png