diff options
| author | Jouni Roivas <jroivas@iki.fi> | 2014-01-14 00:30:43 +0200 |
|---|---|---|
| committer | Jouni Roivas <jroivas@iki.fi> | 2014-01-14 00:30:43 +0200 |
| commit | eb954450558344651e7589c5491488b8356a95be (patch) | |
| tree | 3419d5c594cc6a108412617511ec29ea23c21b3e /qml | |
| parent | b3480884915e9ee04846945cda9800216c55668f (diff) | |
License formatting. Fix cover page information.
Diffstat (limited to 'qml')
| -rw-r--r-- | qml/cover/CoverPage.qml | 6 | ||||
| -rw-r--r-- | qml/pages/WatchPage.qml | 5 | ||||
| -rw-r--r-- | qml/waterwatch.qml | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/qml/cover/CoverPage.qml b/qml/cover/CoverPage.qml index b717b49..aaa33c6 100644 --- a/qml/cover/CoverPage.qml +++ b/qml/cover/CoverPage.qml @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Jouni Roivas + Copyright (C) 2014 Jouni Roivas Copyright (C) 2013 Jolla Ltd. Contact: Thomas Perl <thomas.perl@jollamobile.com> All rights reserved. @@ -13,7 +13,7 @@ * 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 Jolla Ltd nor the + * Neither the name of the authors nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -41,7 +41,7 @@ CoverBackground { Label { anchors.top: label.bottom anchors.horizontalCenter: parent.horizontalCenter - text: watchConnector.name + text: watchPage.watchConnector.name font.pointSize: Theme.fontSizeSmall } } diff --git a/qml/pages/WatchPage.qml b/qml/pages/WatchPage.qml index 743e130..bf76338 100644 --- a/qml/pages/WatchPage.qml +++ b/qml/pages/WatchPage.qml @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Jouni Roivas + Copyright (C) 2014 Jouni Roivas Copyright (C) 2013 Jolla Ltd. Contact: Thomas Perl <thomas.perl@jollamobile.com> All rights reserved. @@ -13,7 +13,7 @@ * 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 Jolla Ltd nor the + * Neither the name of the authors nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -41,6 +41,7 @@ import watch 0.1 Page { id: page + property alias watchConnector: watchConnector WatchConnector { id: watchConnector diff --git a/qml/waterwatch.qml b/qml/waterwatch.qml index b41c7f5..cf65076 100644 --- a/qml/waterwatch.qml +++ b/qml/waterwatch.qml @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Jouni Roivas + Copyright (C) 2014 Jouni Roivas Copyright (C) 2013 Jolla Ltd. Contact: Thomas Perl <thomas.perl@jollamobile.com> All rights reserved. @@ -13,7 +13,7 @@ * 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 Jolla Ltd nor the + * Neither the name of the authors nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. @@ -35,7 +35,7 @@ import "pages" ApplicationWindow { - initialPage: Component { WatchPage { } } + initialPage: WatchPage { id: watchPage } cover: Qt.resolvedUrl("cover/CoverPage.qml") } |