aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/mousearea
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-02-29 17:21:11 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-20 05:37:59 +0100
commit6051714b12b2c633a8f2800c96c98cef59d4fea1 (patch)
tree7b5989a6b1b289e9e67722549f1815335bf4c913 /examples/quick/mousearea
parenteb0b685bd6ef3a507b1a082aab6fd09a977255bd (diff)
Update MouseArea and KeyInteraction to new guidelines
Change-Id: Icf207005a48fa2a994632a88c4238d821622133c Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'examples/quick/mousearea')
-rw-r--r--examples/quick/mousearea/main.cpp41
-rw-r--r--examples/quick/mousearea/mousearea.pro10
-rw-r--r--examples/quick/mousearea/mousearea.qml (renamed from examples/quick/mousearea/mousearea-example.qml)11
-rw-r--r--examples/quick/mousearea/mousearea.qmlproject16
4 files changed, 77 insertions, 1 deletions
diff --git a/examples/quick/mousearea/main.cpp b/examples/quick/mousearea/main.cpp
new file mode 100644
index 0000000000..a85bac3b05
--- /dev/null
+++ b/examples/quick/mousearea/main.cpp
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of 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 "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(mousearea)
diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro
new file mode 100644
index 0000000000..e9a715aae5
--- /dev/null
+++ b/examples/quick/mousearea/mousearea.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += quick declarative
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/mousearea
+qml.files = mousearea.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/mousearea
+INSTALLS += target qml
+
diff --git a/examples/quick/mousearea/mousearea-example.qml b/examples/quick/mousearea/mousearea.qml
index 30e3e62864..df26e05a3c 100644
--- a/examples/quick/mousearea/mousearea-example.qml
+++ b/examples/quick/mousearea/mousearea.qml
@@ -40,9 +40,18 @@
import QtQuick 2.0
+/*!
+ \title QtQuick Examples - MouseArea
+ \example quick/mousearea
+ \brief This is a collection of QML Animation examples.
+ \image qml-mousearea-example.png
+
+ This example shows you how to respond to clicks and drags with a MouseArea.
+*/
+
Rectangle {
id: box
- width: 400; height: 300
+ width: 320; height: 480
Rectangle {
id: redSquare
diff --git a/examples/quick/mousearea/mousearea.qmlproject b/examples/quick/mousearea/mousearea.qmlproject
new file mode 100644
index 0000000000..6595e118d8
--- /dev/null
+++ b/examples/quick/mousearea/mousearea.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.1
+
+Project {
+ mainFile: "mousearea.qml"
+
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+ JavaScriptFiles {
+ directory: "."
+ }
+ ImageFiles {
+ directory: "."
+ }
+}