diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-05 16:14:49 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-06 06:55:51 +0000 |
commit | a5345fdb996b5494c4f4858297784d4314d35511 (patch) | |
tree | 27bbbaa8b2cb74b25a2694fdf1dba87c32c37672 /basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/NavigationBar.qml | |
parent | d7e97310f2bb13818173afebd1f1d40c616250de (diff) |
qtwebbrowser: merge changes from qtwebbrowser git repo
* origin/dev:
Show settings on center of the screen
Update url for engadget.com favicon
Don't anchor to item that is part of a layout
Doc: Switch to standard doc config and templates
Install binaries into $$INSTALL_PREFIX
Do not try to compile if the QtWebEngine is missing
Add tests/tests.pro for the ci
Fix missing override warning
Update window title
Fix build with Qt 5.7
Add documentation
Update Copyright header
Add GPLv3 license file
Task-number: QTBUG-70390
Change-Id: I5233923302d6136d2fef28a9e446fdd592ad5d28
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Diffstat (limited to 'basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/NavigationBar.qml')
-rw-r--r-- | basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/NavigationBar.qml | 71 |
1 files changed, 20 insertions, 51 deletions
diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/NavigationBar.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/NavigationBar.qml index 19efa0d..8edbf77 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/NavigationBar.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/NavigationBar.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,29 +11,22 @@ ** 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$ ** ****************************************************************************/ + import QtQuick 2.5 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 @@ -166,10 +159,7 @@ ToolBar { } Rectangle { width: 1 - anchors { - top: parent.top - bottom: parent.bottom - } + height: parent.height color: uiSeparatorColor } UIButton { @@ -182,19 +172,13 @@ ToolBar { } Rectangle { width: 1 - anchors { - top: parent.top - bottom: parent.bottom - } + height: parent.height color: uiSeparatorColor } Rectangle { Layout.fillWidth: true implicitWidth: 10 - anchors { - top: parent.top - bottom: parent.bottom - } + height: parent.height color: uiColor } TextField { @@ -294,10 +278,7 @@ ToolBar { visible: !cancelButton.visible Layout.fillWidth: true implicitWidth: 10 - anchors { - top: parent.top - bottom: parent.bottom - } + height: parent.height color: uiColor } @@ -321,10 +302,7 @@ ToolBar { } Rectangle { width: 1 - anchors { - top: parent.top - bottom: parent.bottom - } + height: parent.height color: uiSeparatorColor } UIButton { @@ -344,10 +322,7 @@ ToolBar { } Rectangle { width: 1 - anchors { - top: parent.top - bottom: parent.bottom - } + height: parent.height color: uiSeparatorColor } UIButton { @@ -379,10 +354,7 @@ ToolBar { } Rectangle { width: 1 - anchors { - top: parent.top - bottom: parent.bottom - } + height: parent.height color: uiSeparatorColor } UIButton { @@ -410,10 +382,7 @@ ToolBar { } Rectangle { width: 1 - anchors { - top: parent.top - bottom: parent.bottom - } + height: parent.height color: uiSeparatorColor } UIButton { |