From 7c554e643355242346d42e1ab9bcbf3973863eb3 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 2 Mar 2022 13:14:10 -0800 Subject: [PATCH] update licensing --- gui/LICENSE | 3 +++ gui/README.md | 2 -- gui/instance.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ gui/instance.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ gui/main.cpp | 3 +++ gui/window.cpp | 3 +++ gui/window.h | 3 +++ 7 files changed, 118 insertions(+), 2 deletions(-) diff --git a/gui/LICENSE b/gui/LICENSE index 755068f255..6f5e0155a3 100644 --- a/gui/LICENSE +++ b/gui/LICENSE @@ -1,3 +1,6 @@ +Copyright 2022 The Kubernetes Authors All rights reserved. + +Copyright (C) 2021 Anders F Björklund Copyright (C) 2016 The Qt Company Ltd. Redistribution and use in source and binary forms, with or without diff --git a/gui/README.md b/gui/README.md index 2f5ff99457..e4ac30ea6b 100644 --- a/gui/README.md +++ b/gui/README.md @@ -20,5 +20,3 @@ $ ./systray ---- See - -minikube logo from the project. diff --git a/gui/instance.cpp b/gui/instance.cpp index 580470a769..599e42e109 100644 --- a/gui/instance.cpp +++ b/gui/instance.cpp @@ -1,3 +1,56 @@ +/**************************************************************************** +** +** Copyright 2022 The Kubernetes Authors All rights reserved. +** +** Copyright (C) 2021 Anders F Björklund +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + #include "instance.h" #include diff --git a/gui/instance.h b/gui/instance.h index 500e9ed0bf..d961479e24 100644 --- a/gui/instance.h +++ b/gui/instance.h @@ -1,3 +1,56 @@ +/**************************************************************************** +** +** Copyright 2022 The Kubernetes Authors All rights reserved. +** +** Copyright (C) 2021 Anders F Björklund +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** 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. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + #ifndef INSTANCE_H #define INSTANCE_H diff --git a/gui/main.cpp b/gui/main.cpp index d981415b44..3aeff51e5d 100644 --- a/gui/main.cpp +++ b/gui/main.cpp @@ -1,5 +1,8 @@ /**************************************************************************** ** +** Copyright 2022 The Kubernetes Authors All rights reserved. +** +** Copyright (C) 2021 Anders F Björklund ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** diff --git a/gui/window.cpp b/gui/window.cpp index 2c6bc12c5b..d857c6a73c 100644 --- a/gui/window.cpp +++ b/gui/window.cpp @@ -1,5 +1,8 @@ /**************************************************************************** ** +** Copyright 2022 The Kubernetes Authors All rights reserved. +** +** Copyright (C) 2021 Anders F Björklund ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** diff --git a/gui/window.h b/gui/window.h index 22a95ecbe1..80da8ccedc 100644 --- a/gui/window.h +++ b/gui/window.h @@ -1,5 +1,8 @@ /**************************************************************************** ** +** Copyright 2022 The Kubernetes Authors All rights reserved. +** +** Copyright (C) 2021 Anders F Björklund ** Copyright (C) 2016 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ **