diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-06-19 16:59:47 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 03:16:25 +0200 |
commit | 66e6d660edabd9c89517b7d3e86ebad381c0c741 (patch) | |
tree | 4b616c180987a4f67228b6b9425d7f8f8fa469e2 /examples/sensors/qmlqtsensors | |
parent | da431f39aa998b2b2829f146e705a9ef09310a3c (diff) |
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>
Diffstat (limited to 'examples/sensors/qmlqtsensors')
-rw-r--r-- | examples/sensors/qmlqtsensors/main.cpp | 42 | ||||
-rw-r--r-- | examples/sensors/qmlqtsensors/qml.pro | 7 | ||||
-rw-r--r-- | examples/sensors/qmlqtsensors/qmlqtsensors.pro | 13 | ||||
-rw-r--r-- | examples/sensors/qmlqtsensors/qmlqtsensors.qml | 2 |
4 files changed, 54 insertions, 10 deletions
diff --git a/examples/sensors/qmlqtsensors/main.cpp b/examples/sensors/qmlqtsensors/main.cpp new file mode 100644 index 00000000..8c1d792e --- /dev/null +++ b/examples/sensors/qmlqtsensors/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(qmlqtsensors) diff --git a/examples/sensors/qmlqtsensors/qml.pro b/examples/sensors/qmlqtsensors/qml.pro deleted file mode 100644 index 5ea723b1..00000000 --- a/examples/sensors/qmlqtsensors/qml.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = aux - -app.files = \ - $$files(*.qml) \ - icon.png \ - components - diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.pro b/examples/sensors/qmlqtsensors/qmlqtsensors.pro index a15e39ef..facd4e81 100644 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.pro +++ b/examples/sensors/qmlqtsensors/qmlqtsensors.pro @@ -1,4 +1,13 @@ -TEMPLATE = subdirs +TEMPLATE = app +TARGET = qmlqtsensors +QT += quick +SOURCES = main.cpp -SUBDIRS = qml.pro +app.files = \ + $$files(*.qml) \ + icon.png \ + components +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlqtsensors +app.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlqtsensors +INSTALLS += target app diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.qml b/examples/sensors/qmlqtsensors/qmlqtsensors.qml index 44be63aa..2bda6830 100644 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.qml +++ b/examples/sensors/qmlqtsensors/qmlqtsensors.qml @@ -108,7 +108,7 @@ ApplicationWindow { Text { id: labelTitle anchors.top: mainWnd.top - anchors.topMargin: 25 + anchors.topMargin: 5 anchors.left: mainWnd.left anchors.right: mainWnd.right |