diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:25:01 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-09-14 10:27:21 +0300 |
commit | 97863a4992276a3d1aeb3c1bb9ef5a280a5e8b12 (patch) | |
tree | b38f6f152e7036b91c25834a917e320955660db2 /basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml | |
parent | 8be609623fc646e8d9642fc8481a1b9e59fb8417 (diff) | |
parent | aa8e21cc3f60e54dd9c5d1ec482ca440857568f0 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
aa8e21c Add new Qt3D demo
ca03367 Exclude demos from colibri imx6ull
a5345fd qtwebbrowser: merge changes from qtwebbrowser git repo
d7e9731 do not enable highdpiscaling on emulator
f730907 Fix mediaplayer default video path
09aa32d Fix some major scaling & font issues on ebike-demo
Change-Id: I044c29ea2908a6254f32b0623037ea63f23d25cb
Diffstat (limited to 'basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml')
-rw-r--r-- | basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml index 81397fd..0b45801 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/SettingsView.qml @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** -** This file is part of the QtBrowser project. +** This file is part of the Qt WebBrowser application. ** ** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage @@ -11,25 +11,17 @@ ** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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 2 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPLv2 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** +** 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$ ** @@ -118,14 +110,13 @@ Rectangle { ListView { id: listView - leftMargin: 230 - rightMargin: leftMargin anchors.fill: parent model: listModel delegate: Rectangle { color: "transparent" height: 100 width: 560 + anchors.horizontalCenter: parent.horizontalCenter Text { anchors.verticalCenter: parent.verticalCenter font.family: defaultFontFamily |