diff options
| author | Lasse Räihä <lasse.raiha@digia.com> | 2014-09-09 09:25:38 +0300 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@digia.com> | 2014-09-10 09:09:58 +0300 |
| commit | d1a169986a42914148df1edaaf2cad4b9611eab2 (patch) | |
| tree | 03ab3ea51d56923b0fe93506911e6ebf3bf0273c | |
| parent | a12ce9d57ea84541096edd8c89981e49fd75b776 (diff) | |
Changed QtQuick 2.0 -> 2.2
Change-Id: Ib8d3b061d48f0f4e26868cd53566da3c743706b3
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Kimmo Ollila <kimmo.ollila@digia.com>
104 files changed, 699 insertions, 699 deletions
diff --git a/QtDemo/qml/QtDemo/Button.qml b/QtDemo/qml/QtDemo/Button.qml index 43e93b8..cf334fd 100644 --- a/QtDemo/qml/QtDemo/Button.qml +++ b/QtDemo/qml/QtDemo/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: root diff --git a/QtDemo/qml/QtDemo/Cloud.qml b/QtDemo/qml/QtDemo/Cloud.qml index b399308..62575cf 100644 --- a/QtDemo/qml/QtDemo/Cloud.qml +++ b/QtDemo/qml/QtDemo/Cloud.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: cloudRoot diff --git a/QtDemo/qml/QtDemo/DialogButton.qml b/QtDemo/qml/QtDemo/DialogButton.qml index 7f24e5d..c084af3 100644 --- a/QtDemo/qml/QtDemo/DialogButton.qml +++ b/QtDemo/qml/QtDemo/DialogButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: button diff --git a/QtDemo/qml/QtDemo/Element.qml b/QtDemo/qml/QtDemo/Element.qml index 097a3fc..7262f5d 100644 --- a/QtDemo/qml/QtDemo/Element.qml +++ b/QtDemo/qml/QtDemo/Element.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: root diff --git a/QtDemo/qml/QtDemo/IslandElementContainer.qml b/QtDemo/qml/QtDemo/IslandElementContainer.qml index c191d68..0230214 100644 --- a/QtDemo/qml/QtDemo/IslandElementContainer.qml +++ b/QtDemo/qml/QtDemo/IslandElementContainer.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: elementContainer diff --git a/QtDemo/qml/QtDemo/NavigationPanel.qml b/QtDemo/qml/QtDemo/NavigationPanel.qml index e73cc7f..0966ac3 100644 --- a/QtDemo/qml/QtDemo/NavigationPanel.qml +++ b/QtDemo/qml/QtDemo/NavigationPanel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Grid { id: root diff --git a/QtDemo/qml/QtDemo/QuitDialog.qml b/QtDemo/qml/QtDemo/QuitDialog.qml index 897afb9..077bcdc 100644 --- a/QtDemo/qml/QtDemo/QuitDialog.qml +++ b/QtDemo/qml/QtDemo/QuitDialog.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: root diff --git a/QtDemo/qml/QtDemo/demos/calqlatr/Calqlatr.qml b/QtDemo/qml/QtDemo/demos/calqlatr/Calqlatr.qml index 39a0834..d27a350 100644 --- a/QtDemo/qml/QtDemo/demos/calqlatr/Calqlatr.qml +++ b/QtDemo/qml/QtDemo/demos/calqlatr/Calqlatr.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import "content" import "content/calculator.js" as CalcEngine diff --git a/QtDemo/qml/QtDemo/demos/calqlatr/content/Button.qml b/QtDemo/qml/QtDemo/demos/calqlatr/content/Button.qml index 6165ed3..c636c06 100644 --- a/QtDemo/qml/QtDemo/demos/calqlatr/content/Button.qml +++ b/QtDemo/qml/QtDemo/demos/calqlatr/content/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { property alias text: textItem.text diff --git a/QtDemo/qml/QtDemo/demos/calqlatr/content/Display.qml b/QtDemo/qml/QtDemo/demos/calqlatr/content/Display.qml index df3bfa2..c18b1b6 100644 --- a/QtDemo/qml/QtDemo/demos/calqlatr/content/Display.qml +++ b/QtDemo/qml/QtDemo/demos/calqlatr/content/Display.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: display diff --git a/QtDemo/qml/QtDemo/demos/calqlatr/content/NumberPad.qml b/QtDemo/qml/QtDemo/demos/calqlatr/content/NumberPad.qml index 454c50d..916cf99 100644 --- a/QtDemo/qml/QtDemo/demos/calqlatr/content/NumberPad.qml +++ b/QtDemo/qml/QtDemo/demos/calqlatr/content/NumberPad.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Grid { columns: 3 diff --git a/QtDemo/qml/QtDemo/demos/calqlatr/content/StyleLabel.qml b/QtDemo/qml/QtDemo/demos/calqlatr/content/StyleLabel.qml index 3bdea86..cb6da31 100644 --- a/QtDemo/qml/QtDemo/demos/calqlatr/content/StyleLabel.qml +++ b/QtDemo/qml/QtDemo/demos/calqlatr/content/StyleLabel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Text { width: 64 diff --git a/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml b/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml index 00b6c72..fbfb2a8 100644 --- a/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml +++ b/QtDemo/qml/QtDemo/demos/canvasclock/canvasClock.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: root diff --git a/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml b/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml index 162364b..698e085 100644 --- a/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml +++ b/QtDemo/qml/QtDemo/demos/gridrssnews/RssDelegate.qml @@ -1,111 +1,110 @@ -/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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 Digia Plc 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 QtQuick 2.0
-
-Rectangle {
- id: delegate
- height: grid.cellHeight
- width: grid.cellWidth
- color: mainWindow.appBackground
- property int tileMargin: mainWindow.tileMargin
-
- Rectangle {
- anchors.left: parent.left
- anchors.top: parent.top
- anchors.topMargin: parent.tileMargin/2
- width: parent.width - tileMargin
- height: parent.height - tileMargin
- color: mainWindow.tileBackground
-
- MouseArea {
- anchors.fill: parent
- onClicked: {
- grid.currentIndex = index
- console.log(link)
- Qt.openUrlExternally(link)
- }
- }
-
- states: [
- State {
- name: "selected"
- when: delegate.GridView.isCurrentItem
- }
- ]
-
-
- Image {
- id: iconImage
- source: url
- width: parent.width
- height: parent.height
- }
-
- Rectangle{
- width: parent.width
- height: dateText.height + tileMargin
- anchors.top: dateText.top
- anchors.bottom: parent.bottom
- color: "Black"
- opacity: 0.5
- visible: iconImage.source !== ""
-
- }
-
- Text {
- id: dateText
- anchors.left: parent.left
- anchors.leftMargin: tileMargin
- anchors.bottom: parent.bottom
- anchors.bottomMargin: tileMargin
- anchors.right: parent.right
- anchors.rightMargin: tileMargin
-
- color: mainWindow.textColor
- text: title
- width: parent.width;
- wrapMode: Text.WordWrap;
- smooth: true
- font { family: mainWindow.uiFont; pixelSize: mainWindow.tileFontSize }
- }
- }
-}
-
+/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc 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 QtQuick 2.2 + +Rectangle { + id: delegate + height: grid.cellHeight + width: grid.cellWidth + color: mainWindow.appBackground + property int tileMargin: mainWindow.tileMargin + + Rectangle { + anchors.left: parent.left + anchors.top: parent.top + anchors.topMargin: parent.tileMargin/2 + width: parent.width - tileMargin + height: parent.height - tileMargin + color: mainWindow.tileBackground + + MouseArea { + anchors.fill: parent + onClicked: { + grid.currentIndex = index + console.log(link) + Qt.openUrlExternally(link) + } + } + + states: [ + State { + name: "selected" + when: delegate.GridView.isCurrentItem + } + ] + + + Image { + id: iconImage + source: url + width: parent.width + height: parent.height + } + + Rectangle{ + width: parent.width + height: dateText.height + tileMargin + anchors.top: dateText.top + anchors.bottom: parent.bottom + color: "Black" + opacity: 0.5 + visible: iconImage.source !== "" + + } + + Text { + id: dateText + anchors.left: parent.left + anchors.leftMargin: tileMargin + anchors.bottom: parent.bottom + anchors.bottomMargin: tileMargin + anchors.right: parent.right + anchors.rightMargin: tileMargin + + color: mainWindow.textColor + text: title + width: parent.width; + wrapMode: Text.WordWrap; + smooth: true + font { family: mainWindow.uiFont; pixelSize: mainWindow.tileFontSize } + } + } +} diff --git a/QtDemo/qml/QtDemo/demos/gridrssnews/ScrollBar.qml b/QtDemo/qml/QtDemo/demos/gridrssnews/ScrollBar.qml index dae206b..bae4f5c 100644 --- a/QtDemo/qml/QtDemo/demos/gridrssnews/ScrollBar.qml +++ b/QtDemo/qml/QtDemo/demos/gridrssnews/ScrollBar.qml @@ -1,72 +1,72 @@ -/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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 Digia Plc 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 QtQuick 2.0
-
-Item {
- id: scrollBar
-
- // The properties that define the scrollbar's state.
- // position and pageSize are in the range 0.0 - 1.0. They are relative to the
- // height of the page, i.e. a pageSize of 0.5 means that you can see 50%
- // of the height of the view.
- // orientation can be either Qt.Vertical or Qt.Horizontal
- property real position
- property real pageSize
- property variant orientation : Qt.Vertical
-
- // A light, semi-transparent background
- Rectangle {
- id: background
- anchors.fill: parent
- radius: width/2 - 1
- color: mainWindow.appBackground
- }
-
- // Size the bar to the required size, depending upon the orientation.
- Rectangle {
- x: scrollBar.position * (scrollBar.width-2) + 1
- y: 1
- width: scrollBar.pageSize * (scrollBar.width-2)
- height: parent.height
- radius: height/2 - 1
- color: mainWindow.tileBackground
- }
-}
+/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc 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 QtQuick 2.2 + +Item { + id: scrollBar + + // The properties that define the scrollbar's state. + // position and pageSize are in the range 0.0 - 1.0. They are relative to the + // height of the page, i.e. a pageSize of 0.5 means that you can see 50% + // of the height of the view. + // orientation can be either Qt.Vertical or Qt.Horizontal + property real position + property real pageSize + property variant orientation : Qt.Vertical + + // A light, semi-transparent background + Rectangle { + id: background + anchors.fill: parent + radius: width/2 - 1 + color: mainWindow.appBackground + } + + // Size the bar to the required size, depending upon the orientation. + Rectangle { + x: scrollBar.position * (scrollBar.width-2) + 1 + y: 1 + width: scrollBar.pageSize * (scrollBar.width-2) + height: parent.height + radius: height/2 - 1 + color: mainWindow.tileBackground + } +} diff --git a/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml b/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml index d85d292..5435bbb 100644 --- a/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml +++ b/QtDemo/qml/QtDemo/demos/gridrssnews/main.qml @@ -1,150 +1,150 @@ -/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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 Digia Plc 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 QtQuick 2.0
-import QtQuick.XmlListModel 2.0
-
-Rectangle {
- id: mainWindow
- anchors.fill: parent
- color: appBackground
-
- property int tileHeight: parseInt(grid.height / 3)
- property int tileFontSize: tileHeight * 0.08
- property int horizontalMargin: height * 0.08
- property int topBarsize: height * 0.2
- property int bottomBarSize: height * 0.08
- property int tileMargin: height * 0.01
- property int appHeaderFontSize: topBarsize * 0.4
- property string appBackground: "#262626"
- property string tileBackground: "#86bc24"
- property string textColor: "white"
- property string uiFont: "Segoe UI"
-
- XmlListModel {
- id: feedModel
- //source: "http://blog.qt.digia.com/feed/"
- source: "http://news.yahoo.com/rss/tech"
- //query: "/rss/channel/item"
- // Filter out items that don't have images
- query: "/rss/channel/item[exists(child::media:content)]"
- namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\";"
- XmlRole { name: "url"; query: "media:content/@url/string()" }
- XmlRole { name: "title"; query: "title/string()" }
- XmlRole { name: "pubDate"; query: "pubDate/string()" }
- XmlRole { name: "link"; query: "link/string()" }
-
- onStatusChanged: {
- if (status == XmlListModel.Ready) {
- playbanner.start();
- }
- }
- }
-
- // Top bar
- Item {
- id: topBar
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.top: parent.top
- anchors.leftMargin: horizontalMargin
- opacity: 0
- height: topBarsize
- Text {
- id: title
- anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- text: qsTr("Yahoo Technology")
- font.family: uiFont;
- font.pixelSize: appHeaderFontSize;
- color: textColor
- smooth: true
- }
- }
-
- // Grid view
- GridView {
- id: grid
- anchors.fill: parent
- anchors.topMargin: topBarsize
- anchors.bottomMargin: bottomBarSize
- anchors.leftMargin: horizontalMargin
- anchors.rightMargin: horizontalMargin
- opacity: 0
- flow: GridView.TopToBottom
- cellHeight: tileHeight
- cellWidth: parseInt(tileHeight * 1.5)
- cacheBuffer: cellWidth
- clip: false
- focus: true
- model: feedModel
- delegate: RssDelegate {}
-
- // Only show the scrollbars when the view is moving.
- states: State {
- when: grid.movingHorizontally
- PropertyChanges { target: horizontalScrollBar; opacity: 1 }
- }
-
- transitions: Transition {
- NumberAnimation { properties: "opacity"; duration: 400 }
- }
- }
-
- ScrollBar {
- id: horizontalScrollBar
- width: parent.width; height: 6
- anchors.bottom: parent.bottom
- anchors.left: parent.left
- opacity: 0
- orientation: Qt.Horizontal
- position: grid.visibleArea.xPosition
- pageSize: grid.visibleArea.widthRatio
- }
-
- SequentialAnimation {
- id: playbanner
- running: false
- NumberAnimation { target: topBar; property: "opacity"; to: 1.0; duration: 300}
- NumberAnimation { target: grid; property: "opacity"; to: 1.0; duration: 300}
- }
-
-}
-
+/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc 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 QtQuick 2.2 +import QtQuick.XmlListModel 2.0 + +Rectangle { + id: mainWindow + anchors.fill: parent + color: appBackground + + property int tileHeight: parseInt(grid.height / 3) + property int tileFontSize: tileHeight * 0.08 + property int horizontalMargin: height * 0.08 + property int topBarsize: height * 0.2 + property int bottomBarSize: height * 0.08 + property int tileMargin: height * 0.01 + property int appHeaderFontSize: topBarsize * 0.4 + property string appBackground: "#262626" + property string tileBackground: "#86bc24" + property string textColor: "white" + property string uiFont: "Segoe UI" + + XmlListModel { + id: feedModel + //source: "http://blog.qt.digia.com/feed/" + source: "http://news.yahoo.com/rss/tech" + //query: "/rss/channel/item" + // Filter out items that don't have images + query: "/rss/channel/item[exists(child::media:content)]" + namespaceDeclarations: "declare namespace media=\"http://search.yahoo.com/mrss/\";" + XmlRole { name: "url"; query: "media:content/@url/string()" } + XmlRole { name: "title"; query: "title/string()" } + XmlRole { name: "pubDate"; query: "pubDate/string()" } + XmlRole { name: "link"; query: "link/string()" } + + onStatusChanged: { + if (status == XmlListModel.Ready) { + playbanner.start(); + } + } + } + + // Top bar + Item { + id: topBar + anchors.left: parent.left + anchors.right: parent.right + anchors.top: parent.top + anchors.leftMargin: horizontalMargin + opacity: 0 + height: topBarsize + Text { + id: title + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + text: qsTr("Yahoo Technology") + font.family: uiFont; + font.pixelSize: appHeaderFontSize; + color: textColor + smooth: true + } + } + + // Grid view + GridView { + id: grid + anchors.fill: parent + anchors.topMargin: topBarsize + anchors.bottomMargin: bottomBarSize + anchors.leftMargin: horizontalMargin + anchors.rightMargin: horizontalMargin + opacity: 0 + flow: GridView.TopToBottom + cellHeight: tileHeight + cellWidth: parseInt(tileHeight * 1.5) + cacheBuffer: cellWidth + clip: false + focus: true + model: feedModel + delegate: RssDelegate {} + + // Only show the scrollbars when the view is moving. + states: State { + when: grid.movingHorizontally + PropertyChanges { target: horizontalScrollBar; opacity: 1 } + } + + transitions: Transition { + NumberAnimation { properties: "opacity"; duration: 400 } + } + } + + ScrollBar { + id: horizontalScrollBar + width: parent.width; height: 6 + anchors.bottom: parent.bottom + anchors.left: parent.left + opacity: 0 + orientation: Qt.Horizontal + position: grid.visibleArea.xPosition + pageSize: grid.visibleArea.widthRatio + } + + SequentialAnimation { + id: playbanner + running: false + NumberAnimation { target: topBar; property: "opacity"; to: 1.0; duration: 300} + NumberAnimation { target: grid; property: "opacity"; to: 1.0; duration: 300} + } + +} + diff --git a/QtDemo/qml/QtDemo/demos/heartmonitor/main.qml b/QtDemo/qml/QtDemo/demos/heartmonitor/main.qml index 08b8f28..0b58d66 100644 --- a/QtDemo/qml/QtDemo/demos/heartmonitor/main.qml +++ b/QtDemo/qml/QtDemo/demos/heartmonitor/main.qml @@ -1,266 +1,266 @@ -/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** 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 Digia Plc 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 QtQuick 2.0
-import "HeartData.js" as Data
-
-Rectangle {
- id: app
- anchors.fill: parent
- color: "black"
-
- property int frequency: 60
- property int beatDataIndex: -1
- property int heartDataIndex: 0
- property int beatDifference: 1200
- property var previousTime: 0
- property string curveColor: "#22ff22"
- property string alarmColor: "#ff2222"
- property string textColor: "#22ff22"
- property string gridColor: "#333333"
-
- function pulse() {
- if (!heartAnimation.running) {
- heartAnimation.restart()
- heartTimer.restart()
- calculateFrequency();
- app.beatDataIndex = 0
- }
- }
-
- function calculateFrequency() {
- var ms = new Date().getTime();
- if (app.previousTime > 0)
- app.beatDifference = 0.8*beatDifference + 0.2*(ms - app.previousTime)
- app.frequency = Math.round(60000.0 / app.beatDifference)
- app.previousTime = ms;
- }
-
- function updateData() {
- app.heartDataIndex++;
- if (app.heartDataIndex >= Data.heartData.length)
- app.heartDataIndex = 0;
- else
- app.heartDataIndex++;
-
- if (beatDataIndex >= 0)
- fillBeatData()
- else
- fillRandomData()
-
- heartCanvas.requestPaint()
- }
-
- function fillBeatData() {
- var value = 0;
- switch (app.beatDataIndex) {
- case 0: value = Math.random()*0.1+0.1; break;
- case 1: value = Math.random()*0.1+0.0; break;
- case 2: value = Math.random()*0.3+0.7; break;
- case 3: value = Math.random()*0.1-0.05; break;
- case 4: value = Math.random()*0.3-0.8; break;
- case 5: value = Math.random()*0.1-0.05; break;
- case 6: value = Math.random()*0.1-0.05; break;
- case 7: value = Math.random()*0.1+0.15; break;
- default: value = 0; break;
- }
-
- Data.heartData[app.heartDataIndex] = value;
- app.beatDataIndex++;
- if (app.beatDataIndex > 7)
- app.beatDataIndex = -1
- }
-
- function fillRandomData() {
- Data.heartData[app.heartDataIndex] = Math.random()*0.05-0.025
- }
-
- onWidthChanged: {
- Data.fillHeartData(Math.floor(app.width*0.5))
- gridCanvas.requestPaint();
- }
- onHeightChanged: gridCanvas.requestPaint()
-
- Item {
- id: grid
- anchors.fill: parent
-
- Canvas {
- id: gridCanvas
- anchors.fill: parent
- antialiasing: true
- renderTarget: Canvas.Image
- onPaint: {
- var ctx = gridCanvas.getContext('2d')
-
- ctx.clearRect(0,0,grid.width,grid.height)
- var step = 1000 / updateTimer.interval * (app.width / Data.heartData.length)
- var xCount = app.width / step
- var yCount = app.height / step
- ctx.strokeStyle = app.gridColor;
-
- var x=0;
- ctx.beginPath()
- for (var i=0; i<xCount; i++) {
- x = i*step
- ctx.moveTo(x,0)
- ctx.lineTo(x,app.height)
- }
- ctx.stroke()
- ctx.closePath()
-
- var y=0;
- ctx.beginPath()
- for (var j=0; j<yCount; j++) {
- y = j*step
- ctx.moveTo(0, y)
- ctx.lineTo(app.width,y)
- }
- ctx.stroke()
- ctx.closePath()
- }
- }
- }
-
- Rectangle {
- id: canvasBackground
- anchors { bottom: parent.bottom; left: parent.left; right: parent.right }
- height: 0.75 * parent.height
-
- gradient: Gradient {
- GradientStop {position: .0; color :"black"}
- GradientStop {position: .5; color :"#00ff00"}
- GradientStop {position: 1.0; color :"black"}
- }
- opacity: .3
- }
-
- Item {
- id: canvasContainer
- anchors.fill: canvasBackground
-
- Canvas {
- id: heartCanvas
- anchors.fill: parent
- antialiasing: true
- renderTarget: Canvas.Image
- onPaint: {
- var ctx = heartCanvas.getContext('2d')
-
- ctx.clearRect(0,0,canvasContainer.width,canvasContainer.height)
-
- var baseY = heartCanvas.height/2;
- var length = Data.heartData.length;
- var step = (heartCanvas.width-5) / length;
- var yFactor = heartCanvas.height * 0.35;
- var heartIndex = (heartDataIndex+1) % length;
- ctx.strokeStyle = app.curveColor;
-
- ctx.beginPath()
- ctx.moveTo(0,baseY)
- var i=0, x=0, y=0;
- for (i=0; i<length; i++) {
- x=i*step;
- y=baseY - Data.heartData[heartIndex]*yFactor;
- ctx.lineTo(x,y)
- heartIndex = (heartIndex+1)%length;
- }
- ctx.stroke()
- ctx.closePath()
-
- ctx.beginPath()
- ctx.fillStyle = app.curveColor
- ctx.ellipse(x-5,y-5,10,10)
- ctx.fill()
- ctx.closePath()
- }
- }
- }
- Image {
- id: heart
- anchors { left: parent.left; top: parent.top }
- anchors.margins: app.width * 0.05
- height: parent.height * 0.2
- width: height*1.2
- source: "heart.png"
- MouseArea {
- anchors.fill: parent
- onPressed: pulse()
- }
- }
-
- Text {
- id: pulseText
- anchors { right: parent.right; verticalCenter: heart.verticalCenter }
- anchors.margins: app.width * 0.05
- antialiasing: true
- text: app.frequency
- color: app.frequency > 100 ? app.alarmColor : app.textColor
- font { pixelSize: app.width * .1; bold: true }
- }
-
- // Pulse timer
- Timer {
- id: heartTimer
- interval: 1200
- running: true
- repeat: false
- onTriggered: pulse()
- }
-
- // Update timer
- Timer {
- id: updateTimer
- interval: 30
- running: true
- repeat: true
- onTriggered: updateData()
- }
-
- SequentialAnimation{
- id: heartAnimation
- NumberAnimation { target: heart; property: "scale"; duration: 100; from: 1.0; to:1.2; easing.type: Easing.Linear }
- NumberAnimation { target: heart; property: "scale"; duration: 100; from: 1.2; to:1.0; easing.type: Easing.Linear }
- }
-
- Component.onCompleted: {
- Data.fillHeartData(Math.max(100,Math.floor(app.width*0.5)))
- }
-}
+/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia Plc 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 QtQuick 2.2 +import "HeartData.js" as Data + +Rectangle { + id: app + anchors.fill: parent + color: "black" + + property int frequency: 60 + property int beatDataIndex: -1 + property int heartDataIndex: 0 + property int beatDifference: 1200 + property var previousTime: 0 + property string curveColor: "#22ff22" + property string alarmColor: "#ff2222" + property string textColor: "#22ff22" + property string gridColor: "#333333" + + function pulse() { + if (!heartAnimation.running) { + heartAnimation.restart() + heartTimer.restart() + calculateFrequency(); + app.beatDataIndex = 0 + } + } + + function calculateFrequency() { + var ms = new Date().getTime(); + if (app.previousTime > 0) + app.beatDifference = 0.8*beatDifference + 0.2*(ms - app.previousTime) + app.frequency = Math.round(60000.0 / app.beatDifference) + app.previousTime = ms; + } + + function updateData() { + app.heartDataIndex++; + if (app.heartDataIndex >= Data.heartData.length) + app.heartDataIndex = 0; + else + app.heartDataIndex++; + + if (beatDataIndex >= 0) + fillBeatData() + else + fillRandomData() + + heartCanvas.requestPaint() + } + + function fillBeatData() { + var value = 0; + switch (app.beatDataIndex) { + case 0: value = Math.random()*0.1+0.1; break; + case 1: value = Math.random()*0.1+0.0; break; + case 2: value = Math.random()*0.3+0.7; break; + case 3: value = Math.random()*0.1-0.05; break; + case 4: value = Math.random()*0.3-0.8; break; + case 5: value = Math.random()*0.1-0.05; break; + case 6: value = Math.random()*0.1-0.05; break; + case 7: value = Math.random()*0.1+0.15; break; + default: value = 0; break; + } + + Data.heartData[app.heartDataIndex] = value; + app.beatDataIndex++; + if (app.beatDataIndex > 7) + app.beatDataIndex = -1 + } + + function fillRandomData() { + Data.heartData[app.heartDataIndex] = Math.random()*0.05-0.025 + } + + onWidthChanged: { + Data.fillHeartData(Math.floor(app.width*0.5)) + gridCanvas.requestPaint(); + } + onHeightChanged: gridCanvas.requestPaint() + + Item { + id: grid + anchors.fill: parent + + Canvas { + id: gridCanvas + anchors.fill: parent + antialiasing: true + renderTarget: Canvas.Image + onPaint: { + var ctx = gridCanvas.getContext('2d') + + ctx.clearRect(0,0,grid.width,grid.height) + var step = 1000 / updateTimer.interval * (app.width / Data.heartData.length) + var xCount = app.width / step + var yCount = app.height / step + ctx.strokeStyle = app.gridColor; + + var x=0; + ctx.beginPath() + for (var i=0; i<xCount; i++) { + x = i*step + ctx.moveTo(x,0) + ctx.lineTo(x,app.height) + } + ctx.stroke() + ctx.closePath() + + var y=0; + ctx.beginPath() + for (var j=0; j<yCount; j++) { + y = j*step + ctx.moveTo(0, y) + ctx.lineTo(app.width,y) + } + ctx.stroke() + ctx.closePath() + } + } + } + + Rectangle { + id: canvasBackground + anchors { bottom: parent.bottom; left: parent.left; right: parent.right } + height: 0.75 * parent.height + + gradient: Gradient { + GradientStop {position: .0; color :"black"} + GradientStop {position: .5; color :"#00ff00"} + GradientStop {position: 1.0; color :"black"} + } + opacity: .3 + } + + Item { + id: canvasContainer + anchors.fill: canvasBackground + + Canvas { + id: heartCanvas + anchors.fill: parent + antialiasing: true + renderTarget: Canvas.Image + onPaint: { + var ctx = heartCanvas.getContext('2d') + + ctx.clearRect(0,0,canvasContainer.width,canvasContainer.height) + + var baseY = heartCanvas.height/2; + var length = Data.heartData.length; + var step = (heartCanvas.width-5) / length; + var yFactor = heartCanvas.height * 0.35; + var heartIndex = (heartDataIndex+1) % length; + ctx.strokeStyle = app.curveColor; + + ctx.beginPath() + ctx.moveTo(0,baseY) + var i=0, x=0, y=0; + for (i=0; i<length; i++) { + x=i*step; + y=baseY - Data.heartData[heartIndex]*yFactor; + ctx.lineTo(x,y) + heartIndex = (heartIndex+1)%length; + } + ctx.stroke() + ctx.closePath() + + ctx.beginPath() + ctx.fillStyle = app.curveColor + ctx.ellipse(x-5,y-5,10,10) + ctx.fill() + ctx.closePath() + } + } + } + Image { + id: heart + anchors { left: parent.left; top: parent.top } + anchors.margins: app.width * 0.05 + height: parent.height * 0.2 + width: height*1.2 + source: "heart.png" + MouseArea { + anchors.fill: parent + onPressed: pulse() + } + } + + Text { + id: pulseText + anchors { right: parent.right; verticalCenter: heart.verticalCenter } + anchors.margins: app.width * 0.05 + antialiasing: true + text: app.frequency + color: app.frequency > 100 ? app.alarmColor : app.textColor + font { pixelSize: app.width * .1; bold: true } + } + + // Pulse timer + Timer { + id: heartTimer + interval: 1200 + running: true + repeat: false + onTriggered: pulse() + } + + // Update timer + Timer { + id: updateTimer + interval: 30 + running: true + repeat: true + onTriggered: updateData() + } + + SequentialAnimation{ + id: heartAnimation + NumberAnimation { target: heart; property: "scale"; duration: 100; from: 1.0; to:1.2; easing.type: Easing.Linear } + NumberAnimation { target: heart; property: "scale"; duration: 100; from: 1.2; to:1.0; easing.type: Easing.Linear } + } + + Component.onCompleted: { + Data.fillHeartData(Math.max(100,Math.floor(app.width*0.5))) + } +} diff --git a/QtDemo/qml/QtDemo/demos/maroon/Maroon.qml b/QtDemo/qml/QtDemo/demos/maroon/Maroon.qml index d7bfcb6..4ff2751 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/Maroon.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/Maroon.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 import "content" import "content/logic.js" as Logic diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/BuildButton.qml b/QtDemo/qml/QtDemo/demos/maroon/content/BuildButton.qml index 49641fc..6050aac 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/BuildButton.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/BuildButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import "logic.js" as Logic Item { diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/GameCanvas.qml b/QtDemo/qml/QtDemo/demos/maroon/content/GameCanvas.qml index 5e6e963..dd1e765 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/GameCanvas.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/GameCanvas.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import "logic.js" as Logic import "towers" as Towers diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/GameOverScreen.qml b/QtDemo/qml/QtDemo/demos/maroon/content/GameOverScreen.qml index dfb439f..6762796 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/GameOverScreen.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/GameOverScreen.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 import "logic.js" as Logic diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/InfoBar.qml b/QtDemo/qml/QtDemo/demos/maroon/content/InfoBar.qml index 36303fc..cde4b6d 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/InfoBar.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/InfoBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { height: childrenRect.height diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/NewGameScreen.qml b/QtDemo/qml/QtDemo/demos/maroon/content/NewGameScreen.qml index 495e3aa..c3ebb00 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/NewGameScreen.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/NewGameScreen.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 // This is the first screen. // It shows the logo and emit a startButtonClicked signal diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/SoundEffect.qml b/QtDemo/qml/QtDemo/demos/maroon/content/SoundEffect.qml index 0dccd12..40f2fd8 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/SoundEffect.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/SoundEffect.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 //Proxies a SoundEffect if QtMultimedia is installed Item { id: container diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/logic.js b/QtDemo/qml/QtDemo/demos/maroon/content/logic.js index dd76b7e..ed91d28 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/logic.js +++ b/QtDemo/qml/QtDemo/demos/maroon/content/logic.js @@ -39,7 +39,7 @@ ****************************************************************************/ .pragma library // Shared game state -.import QtQuick 2.0 as QQ +.import QtQuick 2.2 as QQ // Game Stuff var gameState // Local reference @@ -105,6 +105,7 @@ function newGameState(gameCanvas) gameState.freshState(); gameState.towers = new Array(gameCanvas.rows * gameCanvas.cols); gameState.mobs = new Array(gameCanvas.cols); + gameState.gameOver = false; return gameState; } diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/mobs/MobBase.qml b/QtDemo/qml/QtDemo/demos/maroon/content/mobs/MobBase.qml index d4ece66..7e766cc 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/mobs/MobBase.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/mobs/MobBase.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import "../logic.js" as Logic import ".." diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/towers/Bomb.qml b/QtDemo/qml/QtDemo/demos/maroon/content/towers/Bomb.qml index 41522ef..e96caf5 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/towers/Bomb.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/towers/Bomb.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import "../logic.js" as Logic import ".." diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/towers/Factory.qml b/QtDemo/qml/QtDemo/demos/maroon/content/towers/Factory.qml index b34a184..0fd170c 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/towers/Factory.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/towers/Factory.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import "../logic.js" as Logic import ".." diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/towers/Melee.qml b/QtDemo/qml/QtDemo/demos/maroon/content/towers/Melee.qml index 1b49a45..0f8a36a 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/towers/Melee.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/towers/Melee.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import ".." TowerBase { diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/towers/Ranged.qml b/QtDemo/qml/QtDemo/demos/maroon/content/towers/Ranged.qml index 33f3354..e1b2d41 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/towers/Ranged.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/towers/Ranged.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import "../logic.js" as Logic import ".." diff --git a/QtDemo/qml/QtDemo/demos/maroon/content/towers/TowerBase.qml b/QtDemo/qml/QtDemo/demos/maroon/content/towers/TowerBase.qml index 5c71cb0..c5f2699 100644 --- a/QtDemo/qml/QtDemo/demos/maroon/content/towers/TowerBase.qml +++ b/QtDemo/qml/QtDemo/demos/maroon/content/towers/TowerBase.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { property real hp: 1 diff --git a/QtDemo/qml/QtDemo/demos/particledemo/BootScreenDemo.qml b/QtDemo/qml/QtDemo/demos/particledemo/BootScreenDemo.qml index eb4e29e..d304d0f 100644 --- a/QtDemo/qml/QtDemo/demos/particledemo/BootScreenDemo.qml +++ b/QtDemo/qml/QtDemo/demos/particledemo/BootScreenDemo.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/particledemo/ParticleSysComponent.qml b/QtDemo/qml/QtDemo/demos/particledemo/ParticleSysComponent.qml index fc74037..fe15922 100644 --- a/QtDemo/qml/QtDemo/demos/particledemo/ParticleSysComponent.qml +++ b/QtDemo/qml/QtDemo/demos/particledemo/ParticleSysComponent.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 /** diff --git a/QtDemo/qml/QtDemo/demos/particledemo/particledemo.qml b/QtDemo/qml/QtDemo/demos/particledemo/particledemo.qml index c3f8253..d047fa7 100644 --- a/QtDemo/qml/QtDemo/demos/particledemo/particledemo.qml +++ b/QtDemo/qml/QtDemo/demos/particledemo/particledemo.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Rectangle { diff --git a/QtDemo/qml/QtDemo/demos/photosurface/photosurface.qml b/QtDemo/qml/QtDemo/demos/photosurface/photosurface.qml index 6ca2626..211cb80 100644 --- a/QtDemo/qml/QtDemo/demos/photosurface/photosurface.qml +++ b/QtDemo/qml/QtDemo/demos/photosurface/photosurface.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: root diff --git a/QtDemo/qml/QtDemo/demos/radio/VolumeButton.qml b/QtDemo/qml/QtDemo/demos/radio/VolumeButton.qml index 76635b6..a586998 100644 --- a/QtDemo/qml/QtDemo/demos/radio/VolumeButton.qml +++ b/QtDemo/qml/QtDemo/demos/radio/VolumeButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: root diff --git a/QtDemo/qml/QtDemo/demos/radio/VolumePoint.qml b/QtDemo/qml/QtDemo/demos/radio/VolumePoint.qml index c107823..ff8a3ff 100644 --- a/QtDemo/qml/QtDemo/demos/radio/VolumePoint.qml +++ b/QtDemo/qml/QtDemo/demos/radio/VolumePoint.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: root diff --git a/QtDemo/qml/QtDemo/demos/rssnews/content/BusyIndicator.qml b/QtDemo/qml/QtDemo/demos/rssnews/content/BusyIndicator.qml index c16f582..e65e913 100644 --- a/QtDemo/qml/QtDemo/demos/rssnews/content/BusyIndicator.qml +++ b/QtDemo/qml/QtDemo/demos/rssnews/content/BusyIndicator.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Image { id: container diff --git a/QtDemo/qml/QtDemo/demos/rssnews/content/CategoryDelegate.qml b/QtDemo/qml/QtDemo/demos/rssnews/content/CategoryDelegate.qml index 2916d1b..ef8d376 100644 --- a/QtDemo/qml/QtDemo/demos/rssnews/content/CategoryDelegate.qml +++ b/QtDemo/qml/QtDemo/demos/rssnews/content/CategoryDelegate.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: delegate diff --git a/QtDemo/qml/QtDemo/demos/rssnews/content/NewsDelegate.qml b/QtDemo/qml/QtDemo/demos/rssnews/content/NewsDelegate.qml index 4050af6..fc3d98e 100644 --- a/QtDemo/qml/QtDemo/demos/rssnews/content/NewsDelegate.qml +++ b/QtDemo/qml/QtDemo/demos/rssnews/content/NewsDelegate.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: delegate diff --git a/QtDemo/qml/QtDemo/demos/rssnews/content/RssFeeds.qml b/QtDemo/qml/QtDemo/demos/rssnews/content/RssFeeds.qml index da26d6a..21ded2c 100644 --- a/QtDemo/qml/QtDemo/demos/rssnews/content/RssFeeds.qml +++ b/QtDemo/qml/QtDemo/demos/rssnews/content/RssFeeds.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 ListModel { id: rssFeeds diff --git a/QtDemo/qml/QtDemo/demos/rssnews/content/ScrollBar.qml b/QtDemo/qml/QtDemo/demos/rssnews/content/ScrollBar.qml index d3cf4a6..5cad00f 100644 --- a/QtDemo/qml/QtDemo/demos/rssnews/content/ScrollBar.qml +++ b/QtDemo/qml/QtDemo/demos/rssnews/content/ScrollBar.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: container diff --git a/QtDemo/qml/QtDemo/demos/rssnews/rssnews.qml b/QtDemo/qml/QtDemo/demos/rssnews/rssnews.qml index 5eae0a0..b6d026a 100644 --- a/QtDemo/qml/QtDemo/demos/rssnews/rssnews.qml +++ b/QtDemo/qml/QtDemo/demos/rssnews/rssnews.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.XmlListModel 2.0 import "content" diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/Block.qml b/QtDemo/qml/QtDemo/demos/samegame/content/Block.qml index 0b10b7f..5bc917a 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/Block.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/Block.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/BlockEmitter.qml b/QtDemo/qml/QtDemo/demos/samegame/content/BlockEmitter.qml index ba6261c..18d0a47 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/BlockEmitter.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/BlockEmitter.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 import "../settings.js" as Settings diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/Button.qml b/QtDemo/qml/QtDemo/demos/samegame/content/Button.qml index 4b825ba..a161fc8 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/Button.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/GameArea.qml b/QtDemo/qml/QtDemo/demos/samegame/content/GameArea.qml index 6e72161..7154a8c 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/GameArea.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/GameArea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 import "samegame.js" as Logic diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/LogoAnimation.qml b/QtDemo/qml/QtDemo/demos/samegame/content/LogoAnimation.qml index fb050e7..399b00b 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/LogoAnimation.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/LogoAnimation.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/MenuEmitter.qml b/QtDemo/qml/QtDemo/demos/samegame/content/MenuEmitter.qml index 93089fc..9254978 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/MenuEmitter.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/MenuEmitter.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Emitter { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/PaintEmitter.qml b/QtDemo/qml/QtDemo/demos/samegame/content/PaintEmitter.qml index fe758af..ada4ad4 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/PaintEmitter.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/PaintEmitter.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 import "../settings.js" as Settings diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/PrimaryPack.qml b/QtDemo/qml/QtDemo/demos/samegame/content/PrimaryPack.qml index 3fe7fb1..fe53a07 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/PrimaryPack.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/PrimaryPack.qml @@ -39,7 +39,7 @@ ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/PuzzleBlock.qml b/QtDemo/qml/QtDemo/demos/samegame/content/PuzzleBlock.qml index 4f5b043..4fdab11 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/PuzzleBlock.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/PuzzleBlock.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/SamegameText.qml b/QtDemo/qml/QtDemo/demos/samegame/content/SamegameText.qml index 28c85f9..ac9553f 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/SamegameText.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/SamegameText.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import "../settings.js" as Settings Text { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/SimpleBlock.qml b/QtDemo/qml/QtDemo/demos/samegame/content/SimpleBlock.qml index 5ae4782..3668ad9 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/SimpleBlock.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/SimpleBlock.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/SmokeText.qml b/QtDemo/qml/QtDemo/demos/samegame/content/SmokeText.qml index 46bc509..a0d889d 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/SmokeText.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/SmokeText.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/TemplateBase.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/TemplateBase.qml index 48ea399..83f88ef 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/TemplateBase.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/TemplateBase.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle{ id: control diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level0.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level0.qml index 7ac7ed8..0df1662 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level0.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level0.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ moveTarget: 3 diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level1.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level1.qml index 0b7a889..72f7dde 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level1.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level1.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ timeTarget: 10 diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level2.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level2.qml index 986f217..ea81ad8 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level2.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level2.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ scoreTarget: 1200 diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level3.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level3.qml index eff5182..3934845 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level3.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level3.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ scoreTarget: 3000 diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level4.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level4.qml index 4438de1..1fddcc6 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level4.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level4.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ goalText: "5 of 10<br><br>Clear the level..." diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level5.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level5.qml index ee48217..5d8fc7d 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level5.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level5.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ moveTarget: 4 diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level6.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level6.qml index 2b34baa..76b3a12 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level6.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level6.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ moveTarget: 20 diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level7.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level7.qml index 280bbb1..4a4756e 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level7.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level7.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ goalText: "8 of 10<br><br>Clear the grid." diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level8.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level8.qml index 7661485..83a2268 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level8.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level8.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ scoreTarget: 1000 diff --git a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level9.qml b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level9.qml index c75d8e5..7cc1f68 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/content/levels/level9.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/content/levels/level9.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 TemplateBase{ scoreTarget: 2000 diff --git a/QtDemo/qml/QtDemo/demos/samegame/samegame.qml b/QtDemo/qml/QtDemo/demos/samegame/samegame.qml index 49eab55..131d2ee 100644 --- a/QtDemo/qml/QtDemo/demos/samegame/samegame.qml +++ b/QtDemo/qml/QtDemo/demos/samegame/samegame.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 import "content/samegame.js" as Logic import "settings.js" as Settings diff --git a/QtDemo/qml/QtDemo/demos/shaders/Content.qml b/QtDemo/qml/QtDemo/demos/shaders/Content.qml index aae2337..151f7da 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Content.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Content.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: root diff --git a/QtDemo/qml/QtDemo/demos/shaders/EffectSelectionPanel.qml b/QtDemo/qml/QtDemo/demos/shaders/EffectSelectionPanel.qml index 93cdb5f..801b27b 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/EffectSelectionPanel.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/EffectSelectionPanel.qml @@ -38,7 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: root diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/Effect.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/Effect.qml index cb79e75..5ec282c 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/Effect.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/Effect.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 ShaderEffect { property variant source diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectBillboard.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectBillboard.qml index 124a2a1..9a79b42 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectBillboard.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectBillboard.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectBlackAndWhite.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectBlackAndWhite.qml index 37a3b6e..db6d509 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectBlackAndWhite.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectBlackAndWhite.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectEmboss.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectEmboss.qml index 4bf5771..007af58 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectEmboss.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectEmboss.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { fragmentShaderFilename: "shaders/emboss.fsh" diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectGaussianBlur.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectGaussianBlur.qml index e63e17a..2e5257e 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectGaussianBlur.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectGaussianBlur.qml @@ -41,7 +41,7 @@ // Based on http://www.geeks3d.com/20100909/shader-library-gaussian-blur-post-processing-filter-in-glsl/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: root diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectGlow.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectGlow.qml index d6e987d..b91ebf9 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectGlow.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectGlow.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { fragmentShaderFilename: "shaders/glow.fsh" diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectIsolate.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectIsolate.qml index 2425a25..a4a1984 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectIsolate.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectIsolate.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPassThrough.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPassThrough.qml index 1f259be..8bb3b42 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPassThrough.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPassThrough.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { divider: false diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPixelate.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPixelate.qml index 71f7da9..d576f69 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPixelate.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPixelate.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPosterize.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPosterize.qml index 0cf16a0..2ecffe6 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPosterize.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectPosterize.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectRipple.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectRipple.qml index 0b7c48c..9abb49c 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectRipple.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectRipple.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSepia.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSepia.qml index 446e779..5c4deac 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSepia.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSepia.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { fragmentShaderFilename: "shaders/sepia.fsh" diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSharpen.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSharpen.qml index 99ece3c..1984642 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSharpen.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSharpen.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectShockwave.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectShockwave.qml index fe91781..6821e07 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectShockwave.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectShockwave.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { id: root diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSobelEdgeDetection1.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSobelEdgeDetection1.qml index 189d5d3..9137e98 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSobelEdgeDetection1.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectSobelEdgeDetection1.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectToon.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectToon.qml index 08f1849..f0ac839 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectToon.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectToon.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectVignette.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectVignette.qml index 1120161..e47b161 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectVignette.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectVignette.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { fragmentShaderFilename: "shaders/vignette.fsh" diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectWarhol.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectWarhol.qml index e96d052..00fdb79 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectWarhol.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectWarhol.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { fragmentShaderFilename: "shaders/warhol.fsh" diff --git a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectWobble.qml b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectWobble.qml index 4cccf48..2e2e0e8 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectWobble.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Effects/EffectWobble.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Effect { parameters: ListModel { diff --git a/QtDemo/qml/QtDemo/demos/shaders/Logo.qml b/QtDemo/qml/QtDemo/demos/shaders/Logo.qml index 2e2617a..6d1f60d 100644 --- a/QtDemo/qml/QtDemo/demos/shaders/Logo.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Logo.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.Particles 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/shaders/LogoContainer.qml b/QtDemo/qml/QtDemo/demos/shaders/LogoContainer.qml index 1237305..6dcdefc 100644 --- a/QtDemo/qml/QtDemo/demos/shaders/LogoContainer.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/LogoContainer.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: root diff --git a/QtDemo/qml/QtDemo/demos/shaders/ParameterPanel.qml b/QtDemo/qml/QtDemo/demos/shaders/ParameterPanel.qml index 33dd5ea..ac2af6f 100644 --- a/QtDemo/qml/QtDemo/demos/shaders/ParameterPanel.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/ParameterPanel.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: root diff --git a/QtDemo/qml/QtDemo/demos/shaders/Slider.qml b/QtDemo/qml/QtDemo/demos/shaders/Slider.qml index 5ceefcc..fa75d5f 100644 --- a/QtDemo/qml/QtDemo/demos/shaders/Slider.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/Slider.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: slider diff --git a/QtDemo/qml/QtDemo/demos/shaders/main.qml b/QtDemo/qml/QtDemo/demos/shaders/main.qml index c5f5d4c..6a24236 100755 --- a/QtDemo/qml/QtDemo/demos/shaders/main.qml +++ b/QtDemo/qml/QtDemo/demos/shaders/main.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Rectangle { id: applicationWindow diff --git a/QtDemo/qml/QtDemo/demos/video/Content.qml b/QtDemo/qml/QtDemo/demos/video/Content.qml index de25f13..fc04dee 100644 --- a/QtDemo/qml/QtDemo/demos/video/Content.qml +++ b/QtDemo/qml/QtDemo/demos/video/Content.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtMultimedia 5.0 Rectangle { diff --git a/QtDemo/qml/QtDemo/demos/video/ContentVideo.qml b/QtDemo/qml/QtDemo/demos/video/ContentVideo.qml index 83c9ab7..2a02650 100644 --- a/QtDemo/qml/QtDemo/demos/video/ContentVideo.qml +++ b/QtDemo/qml/QtDemo/demos/video/ContentVideo.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtMultimedia 5.0 VideoOutput { diff --git a/QtDemo/qml/QtDemo/demos/video/ControlBar.qml b/QtDemo/qml/QtDemo/demos/video/ControlBar.qml index c8e3b97..56172e4 100644 --- a/QtDemo/qml/QtDemo/demos/video/ControlBar.qml +++ b/QtDemo/qml/QtDemo/demos/video/ControlBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtMultimedia 5.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/video/ImageButton.qml b/QtDemo/qml/QtDemo/demos/video/ImageButton.qml index 937a075..90928bb 100644 --- a/QtDemo/qml/QtDemo/demos/video/ImageButton.qml +++ b/QtDemo/qml/QtDemo/demos/video/ImageButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: root diff --git a/QtDemo/qml/QtDemo/demos/video/PlaybackControl.qml b/QtDemo/qml/QtDemo/demos/video/PlaybackControl.qml index 9716825..c44003f 100644 --- a/QtDemo/qml/QtDemo/demos/video/PlaybackControl.qml +++ b/QtDemo/qml/QtDemo/demos/video/PlaybackControl.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Row { id: root diff --git a/QtDemo/qml/QtDemo/demos/video/ScrollBar.qml b/QtDemo/qml/QtDemo/demos/video/ScrollBar.qml index 37c2eab..b516cba 100644 --- a/QtDemo/qml/QtDemo/demos/video/ScrollBar.qml +++ b/QtDemo/qml/QtDemo/demos/video/ScrollBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: scrollBar diff --git a/QtDemo/qml/QtDemo/demos/video/SeekControl.qml b/QtDemo/qml/QtDemo/demos/video/SeekControl.qml index 8003951..598fda6 100644 --- a/QtDemo/qml/QtDemo/demos/video/SeekControl.qml +++ b/QtDemo/qml/QtDemo/demos/video/SeekControl.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: root diff --git a/QtDemo/qml/QtDemo/demos/video/Slider.qml b/QtDemo/qml/QtDemo/demos/video/Slider.qml index 8a99cfe..a07c2df 100644 --- a/QtDemo/qml/QtDemo/demos/video/Slider.qml +++ b/QtDemo/qml/QtDemo/demos/video/Slider.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: slider diff --git a/QtDemo/qml/QtDemo/demos/video/VideoSelector.qml b/QtDemo/qml/QtDemo/demos/video/VideoSelector.qml index aa54e33..4d481fc 100644 --- a/QtDemo/qml/QtDemo/demos/video/VideoSelector.qml +++ b/QtDemo/qml/QtDemo/demos/video/VideoSelector.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtQuick.XmlListModel 2.0 Item { diff --git a/QtDemo/qml/QtDemo/demos/video/VolumeControl.qml b/QtDemo/qml/QtDemo/demos/video/VolumeControl.qml index 6e75fd2..d7c404a 100644 --- a/QtDemo/qml/QtDemo/demos/video/VolumeControl.qml +++ b/QtDemo/qml/QtDemo/demos/video/VolumeControl.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 Item { id: root diff --git a/QtDemo/qml/QtDemo/demos/video/main.qml b/QtDemo/qml/QtDemo/demos/video/main.qml index 5987843..c15cabd 100644 --- a/QtDemo/qml/QtDemo/demos/video/main.qml +++ b/QtDemo/qml/QtDemo/demos/video/main.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.2 import QtMultimedia 5.0 Rectangle { |