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/CustomSwitch.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/CustomSwitch.qml')
| -rw-r--r-- | basicsuite/qtwebbrowser/tqtc-qtwebbrowser/src/qml/CustomSwitch.qml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |