From 3485589dc6d952f6bc9c52034b7f041ae8954f88 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Wed, 24 Jul 2019 09:50:49 +0300
Subject: Add missing settings properties of viewSettings and appFont

Those properties make SettingsUI dependent on qtlauncher, thus the need
to add the necessary values here.

Fixes: QTBUG-68987
Change-Id: I8d194317af341048a5b3607e8b796947fb60bff6
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 src/settingsui/ViewSettings.qml  | 43 ++++++++++++++++++++++++++++++++++++++++
 src/settingsui/main.qml          |  6 ++++++
 src/settingsui/settingsuiapp.qrc |  2 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/settingsui/ViewSettings.qml

(limited to 'src')

diff --git a/src/settingsui/ViewSettings.qml b/src/settingsui/ViewSettings.qml
new file mode 100644
index 0000000..9bbbc10
--- /dev/null
+++ b/src/settingsui/ViewSettings.qml
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt for Device Creation.
+**
+** $QT_BEGIN_LICENSE:GPL$
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 or (at your option) any later version
+** approved by the KDE Free Qt Foundation. The licenses are as published by
+** the Free Software Foundation and appearing in the file LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 2.0
+
+Item {
+    id: viewSettings
+
+    property real pageMargin: 0.03 * Math.min(window.width, window.height)
+    property real spacing: pageMargin * 0.5
+    property string appFont: "TitilliumWeb"
+    property string backgroundColor: "#09102b"
+    property string borderColor: "#9d9faa"
+    property string buttonGreenColor: "#41cd52"
+    property string buttonGrayColor: "#9d9faa"
+    property string buttonActiveColor: "#216729"
+    property string scrollBarColor: "#41cd52"
+}
diff --git a/src/settingsui/main.qml b/src/settingsui/main.qml
index 874e0eb..8c97811 100644
--- a/src/settingsui/main.qml
+++ b/src/settingsui/main.qml
@@ -36,6 +36,12 @@ Window {
     id: window
     visible: true
 
+    property alias appFont: viewSettings.appFont
+
+    ViewSettings {
+        id: viewSettings
+    }
+
     Item {
         id: root
         anchors.fill: parent
diff --git a/src/settingsui/settingsuiapp.qrc b/src/settingsui/settingsuiapp.qrc
index a3e7ca5..110cf83 100644
--- a/src/settingsui/settingsuiapp.qrc
+++ b/src/settingsui/settingsuiapp.qrc
@@ -31,6 +31,6 @@
         <file>settingsuiplugin/ShutdownPopup.qml</file>
         <file>bluetooth/Bluetooth.qml</file>
         <file>bluetooth/Discovery.qml</file>
-        <file>timedate/TimeDate.qml</file>
+        <file>ViewSettings.qml</file>
     </qresource>
 </RCC>
-- 
cgit v1.2.3