aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-03-13 08:34:08 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2017-03-13 09:31:36 +0000
commitef42989c25bebc4b03ebaf3c7add6cd3ca85aa50 (patch)
tree2d6898de110d11930d3378d994f5e018f4fcebe2
parent7d0a2a1e55b615ae96766eefe8b066c2b7015140 (diff)
Wearable: remove PageContainer
The init() function and done() signal were both unused. Change-Id: I302e196ad6b0da423f0efb3394e307f6c3ed8c8b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
-rw-r--r--examples/quickcontrols2/wearable/qml/Alarms/AlarmsMain.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Common/PageContainer.qml59
-rw-r--r--examples/quickcontrols2/wearable/qml/Common/qmldir1
-rw-r--r--examples/quickcontrols2/wearable/qml/Fitness/FitnessMain.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/LauncherMain.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Navigation/NavigationMain.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Notifications/NotificationsMain.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Settings/SettingsMain.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/WatchFace/WatchFaceMain.qml2
-rw-r--r--examples/quickcontrols2/wearable/qml/Weather/WeatherMain.qml2
-rw-r--r--examples/quickcontrols2/wearable/wearable.qrc1
11 files changed, 8 insertions, 69 deletions
diff --git a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsMain.qml b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsMain.qml
index 64d47648..94b499ba 100644
--- a/examples/quickcontrols2/wearable/qml/Alarms/AlarmsMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Alarms/AlarmsMain.qml
@@ -53,7 +53,7 @@ import QtQuick.Controls 2.0 as QQC2
import "../Common"
import "alarms.js" as AlarmData
-PageContainer {
+Item {
Rectangle {
anchors.centerIn: parent
diff --git a/examples/quickcontrols2/wearable/qml/Common/PageContainer.qml b/examples/quickcontrols2/wearable/qml/Common/PageContainer.qml
deleted file mode 100644
index 19bff974..00000000
--- a/examples/quickcontrols2/wearable/qml/Common/PageContainer.qml
+++ /dev/null
@@ -1,59 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** BSD License Usage
-** Alternatively, 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 The Qt Company Ltd 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.7
-
-Item {
- signal done()
-
- function init() {
-
- }
-}
diff --git a/examples/quickcontrols2/wearable/qml/Common/qmldir b/examples/quickcontrols2/wearable/qml/Common/qmldir
index 6563bd8c..77a4175c 100644
--- a/examples/quickcontrols2/wearable/qml/Common/qmldir
+++ b/examples/quickcontrols2/wearable/qml/Common/qmldir
@@ -1,4 +1,3 @@
singleton UIStyle 1.0 UIStyle.qml
WSlider 1.0 WSlider.qml
WSwitch 1.0 WSwitch.qml
-PageContainer 1.0 PageContainer.qml
diff --git a/examples/quickcontrols2/wearable/qml/Fitness/FitnessMain.qml b/examples/quickcontrols2/wearable/qml/Fitness/FitnessMain.qml
index f3f9f5ff..822f9732 100644
--- a/examples/quickcontrols2/wearable/qml/Fitness/FitnessMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Fitness/FitnessMain.qml
@@ -53,7 +53,7 @@ import QtQuick.Controls 2.0 as QQ2
import "../Common"
import "fitness.js" as FitnessData
-PageContainer {
+Item {
Rectangle {
anchors.centerIn: parent
diff --git a/examples/quickcontrols2/wearable/qml/LauncherMain.qml b/examples/quickcontrols2/wearable/qml/LauncherMain.qml
index 53fb350a..d7afd1fe 100644
--- a/examples/quickcontrols2/wearable/qml/LauncherMain.qml
+++ b/examples/quickcontrols2/wearable/qml/LauncherMain.qml
@@ -54,7 +54,7 @@ import "Fitness"
import "Navigation"
import "Common"
-PageContainer {
+Item {
Item {
anchors.centerIn: parent
diff --git a/examples/quickcontrols2/wearable/qml/Navigation/NavigationMain.qml b/examples/quickcontrols2/wearable/qml/Navigation/NavigationMain.qml
index 989c04ae..37d9c0f2 100644
--- a/examples/quickcontrols2/wearable/qml/Navigation/NavigationMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Navigation/NavigationMain.qml
@@ -53,7 +53,7 @@ import QtQuick.Layouts 1.3
import "../Common"
import "navigation.js" as NavigationData
-PageContainer {
+Item {
Item {
anchors.centerIn: parent
diff --git a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsMain.qml b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsMain.qml
index 9b72f53b..a1528fb3 100644
--- a/examples/quickcontrols2/wearable/qml/Notifications/NotificationsMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Notifications/NotificationsMain.qml
@@ -53,7 +53,7 @@ import QtQuick.Controls 2.0 as QQC2
import "../Common"
import "notifications.js" as NotificationData
-PageContainer {
+Item {
Rectangle {
anchors.centerIn: parent
diff --git a/examples/quickcontrols2/wearable/qml/Settings/SettingsMain.qml b/examples/quickcontrols2/wearable/qml/Settings/SettingsMain.qml
index afacdeeb..b14e3392 100644
--- a/examples/quickcontrols2/wearable/qml/Settings/SettingsMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Settings/SettingsMain.qml
@@ -52,7 +52,7 @@ import QtQuick 2.7
import QtQuick.Controls 2.0 as QQC2
import "../Common"
-PageContainer {
+Item {
Rectangle {
anchors.centerIn: parent
diff --git a/examples/quickcontrols2/wearable/qml/WatchFace/WatchFaceMain.qml b/examples/quickcontrols2/wearable/qml/WatchFace/WatchFaceMain.qml
index 6916e156..d65ca798 100644
--- a/examples/quickcontrols2/wearable/qml/WatchFace/WatchFaceMain.qml
+++ b/examples/quickcontrols2/wearable/qml/WatchFace/WatchFaceMain.qml
@@ -52,7 +52,7 @@ import QtQuick 2.7
import QtQuick.Controls 2.0 as QQC2
import "../Common"
-PageContainer {
+Item {
QQC2.SwipeView {
id: svWatchContainer
diff --git a/examples/quickcontrols2/wearable/qml/Weather/WeatherMain.qml b/examples/quickcontrols2/wearable/qml/Weather/WeatherMain.qml
index 94f5dff6..7b0c2514 100644
--- a/examples/quickcontrols2/wearable/qml/Weather/WeatherMain.qml
+++ b/examples/quickcontrols2/wearable/qml/Weather/WeatherMain.qml
@@ -53,7 +53,7 @@ import QtQuick.Controls 2.0 as QQC2
import "../Common"
import "weather.js" as WeatherData
-PageContainer {
+Item {
Rectangle {
id: weatherCntr
anchors.centerIn: parent
diff --git a/examples/quickcontrols2/wearable/wearable.qrc b/examples/quickcontrols2/wearable/wearable.qrc
index b4aa762c..0621f4d4 100644
--- a/examples/quickcontrols2/wearable/wearable.qrc
+++ b/examples/quickcontrols2/wearable/wearable.qrc
@@ -3,7 +3,6 @@
<file>wearable.qml</file>
<file>qml/Alarms/alarms.js</file>
<file>qml/Alarms/AlarmsMain.qml</file>
- <file>qml/Common/PageContainer.qml</file>
<file>qml/Common/qmldir</file>
<file>qml/Common/UIStyle.qml</file>
<file>qml/Common/WSlider.qml</file>