summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-09-13 01:48:23 -0700
committerMatt Ranostay <matt.ranostay@konsulko.com>2019-09-13 02:00:24 -0700
commite80621c362d3f9824fd3dd30f744a9adc078fd68 (patch)
tree032ba56b8223d6879e8a7d4f9c91b7314e960e60
parent7fe0662f11de5414a0136f574e271ff10585186d (diff)
messaging: qml: update QML widget imports for Qt 5.11
Update the imports of QML widgets to the latest version used by AGL which is 5.11 Bug-AGL: SPEC-2566 Change-Id: Ic6a2252f1a8080fd1daf6bebb4e5d42828e75369 Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--app/Messaging.qml6
-rw-r--r--app/Notification.qml22
2 files changed, 22 insertions, 6 deletions
diff --git a/app/Messaging.qml b/app/Messaging.qml
index ec7c7c7..611f044 100644
--- a/app/Messaging.qml
+++ b/app/Messaging.qml
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import QtQuick 2.6
-import QtQuick.Layouts 1.3
-import QtQuick.Controls 2.0
+import QtQuick 2.11
+import QtQuick.Layouts 1.11
+import QtQuick.Controls 2.4
import AGL.Demo.Controls 1.0
ApplicationWindow {
diff --git a/app/Notification.qml b/app/Notification.qml
index f4facfa..4a37591 100644
--- a/app/Notification.qml
+++ b/app/Notification.qml
@@ -1,6 +1,22 @@
-import QtQuick 2.6
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 2.0
+/*
+ * Copyright (C) 2019 Konsulko Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import QtQuick 2.11
+import QtQuick.Layouts 1.11
+import QtQuick.Controls 2.4
Item {
height: msg.height