From 384775293c03db5d25b57f112eaa1a01e380cbe6 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Wed, 23 Nov 2016 13:15:28 +0100 Subject: Change license text Change-Id: I74e5115a032cd94d245e63d7d9e47f3d028e0110 Reviewed-by: Samuli Piippo --- main.cpp | 25 ++++++++++++++----------- perfprocesshandler.cpp | 25 ++++++++++++++----------- perfprocesshandler.h | 25 ++++++++++++++----------- portlist.cpp | 25 ++++++++++++++----------- portlist.h | 25 ++++++++++++++----------- process.cpp | 25 ++++++++++++++----------- process.h | 25 ++++++++++++++----------- 7 files changed, 98 insertions(+), 77 deletions(-) diff --git a/main.cpp b/main.cpp index 854276e..13bd85e 100644 --- a/main.cpp +++ b/main.cpp @@ -1,20 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Enterprise Embedded. +** This file is part of Qt for Device Creation. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** $QT_BEGIN_LICENSE:COMM$ +** +** 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 Digia. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io +** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "process.h" #include "portlist.h" diff --git a/perfprocesshandler.cpp b/perfprocesshandler.cpp index 9b609ab..2f6000b 100644 --- a/perfprocesshandler.cpp +++ b/perfprocesshandler.cpp @@ -1,20 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd -** All rights reserved. -** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of QtEnterprise Embedded. +** This file is part of Qt for Device Creation. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** $QT_BEGIN_LICENSE:COMM$ +** +** 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. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io/contact-us +** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "perfprocesshandler.h" #include diff --git a/perfprocesshandler.h b/perfprocesshandler.h index f10e8a6..b7867ce 100644 --- a/perfprocesshandler.h +++ b/perfprocesshandler.h @@ -1,20 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd -** All rights reserved. -** For any questions to The Qt Company, please use contact form at http://www.qt.io/contact-us +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of QtEnterprise Embedded. +** This file is part of Qt for Device Creation. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** $QT_BEGIN_LICENSE:COMM$ +** +** 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. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io/contact-us +** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef PERFPROCESSHANDLER_H #define PERFPROCESSHANDLER_H diff --git a/portlist.cpp b/portlist.cpp index a93814e..6a3a0de 100644 --- a/portlist.cpp +++ b/portlist.cpp @@ -1,20 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Enterprise Embedded. +** This file is part of Qt for Device Creation. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** $QT_BEGIN_LICENSE:COMM$ +** +** 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 Digia. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io +** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "portlist.h" diff --git a/portlist.h b/portlist.h index 171194c..5ad0954 100644 --- a/portlist.h +++ b/portlist.h @@ -1,20 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Enterprise Embedded. +** This file is part of Qt for Device Creation. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** $QT_BEGIN_LICENSE:COMM$ +** +** 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 Digia. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io +** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef PORTLIST_H #define PORTLIST_H diff --git a/process.cpp b/process.cpp index 451e1f8..954cc12 100644 --- a/process.cpp +++ b/process.cpp @@ -1,20 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Enterprise Embedded. +** This file is part of Qt for Device Creation. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** $QT_BEGIN_LICENSE:COMM$ +** +** 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 Digia. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io +** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "process.h" #include diff --git a/process.h b/process.h index 46bea62..d820707 100644 --- a/process.h +++ b/process.h @@ -1,20 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://www.qt.io +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Enterprise Embedded. +** This file is part of Qt for Device Creation. ** -** Licensees holding valid Qt Enterprise licenses may use this file in -** accordance with the Qt Enterprise License Agreement provided with the +** $QT_BEGIN_LICENSE:COMM$ +** +** 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 Digia. +** 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. ** -** If you have questions regarding the use of this file, please use -** contact form at http://www.qt.io +** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef PROCESS_H #define PROCESS_H -- cgit v1.2.3