From 66e6d660edabd9c89517b7d3e86ebad381c0c741 Mon Sep 17 00:00:00 2001
From: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Date: Tue, 19 Jun 2012 16:59:47 +1000
Subject: Get all the examples building and running on Desktop.

Build the required C++ stubs for each example and deploy
all the files so that the examples are runnable.

Change-Id: I03d23cb37e1c484110a58934a9b0aa550d6915a6
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
---
 examples/sensors/shakeit/main.cpp    | 42 ++++++++++++++++++++++++++++++++++++
 examples/sensors/shakeit/qml.pro     |  8 -------
 examples/sensors/shakeit/shakeit.pro | 15 +++++++++++--
 examples/sensors/shakeit/shakeit.qml |  2 ++
 4 files changed, 57 insertions(+), 10 deletions(-)
 create mode 100644 examples/sensors/shakeit/main.cpp
 delete mode 100644 examples/sensors/shakeit/qml.pro

(limited to 'examples/sensors/shakeit')

diff --git a/examples/sensors/shakeit/main.cpp b/examples/sensors/shakeit/main.cpp
new file mode 100644
index 00000000..9a4aef36
--- /dev/null
+++ b/examples/sensors/shakeit/main.cpp
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** 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$
+**
+****************************************************************************/
+
+#include "../stub.h"
+SENSORS_EXAMPLE_MAIN(shakeit)
diff --git a/examples/sensors/shakeit/qml.pro b/examples/sensors/shakeit/qml.pro
deleted file mode 100644
index 1c7cc61c..00000000
--- a/examples/sensors/shakeit/qml.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = aux
-
-app.files = \
-    $$files(*.qml) \
-    icon.png \
-    audio \
-    content
-
diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/sensors/shakeit/shakeit.pro
index 6dc685b9..9f963909 100644
--- a/examples/sensors/shakeit/shakeit.pro
+++ b/examples/sensors/shakeit/shakeit.pro
@@ -1,3 +1,14 @@
-TEMPLATE = subdirs
+TEMPLATE = app
+TARGET = shakeit
+QT += quick
+SOURCES = main.cpp
 
-SUBDIRS = qml.pro
+app.files = \
+    $$files(*.qml) \
+    icon.png \
+    audio \
+    content
+
+target.path = $$[QT_INSTALL_EXAMPLES]/sensors/shakeit
+app.path = $$[QT_INSTALL_EXAMPLES]/sensors/shakeit
+INSTALLS += target app
diff --git a/examples/sensors/shakeit/shakeit.qml b/examples/sensors/shakeit/shakeit.qml
index 3b3b1f5c..556d35f5 100644
--- a/examples/sensors/shakeit/shakeit.qml
+++ b/examples/sensors/shakeit/shakeit.qml
@@ -49,6 +49,8 @@ import QtMultimedia 5.0
 
 Rectangle {
     id: window
+    width: 320
+    height: 480
 
     state: "default"
 
-- 
cgit v1.2.3