From a5345fdb996b5494c4f4858297784d4314d35511 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 5 Sep 2018 16:14:49 +0300 Subject: 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 Reviewed-by: Sami Nurmenniemi --- basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml') diff --git a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml index 7f8f674..e25a84e 100644 --- a/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml +++ b/basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2017 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** -** This file is part of the Device Utilities module of the Qt Toolkit. +** This file is part of the Qt WebBrowser application. ** ** $QT_BEGIN_LICENSE:GPL$ ** Commercial License Usage -- cgit v1.2.3