From d209d35f64c901fe7c0665b3f735c072682761de Mon Sep 17 00:00:00 2001 From: Joshua Joseph Date: Sun, 15 Jun 2014 01:22:24 +0300 Subject: OS Detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --001a113a374080d8af04fbd33a62 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Sun, Jun 15, 2014 at 1:07 AM, Thiago Macieira wrote: > Em s=C3=A1b 14 jun 2014, =C3=A0s 15:05:24, Thiago Macieira escreveu: > > > Also, please keep the original copyright headers from the files you copie= d. > -- > Attached patch adds Qt copyright to both files. --=20 Thanks, Joshua
On Sun, Jun 15, 2014 at 1:07 AM, Thiago Macieira <thiago@macieira.org> wrote:
Em sáb 14 jun 2014, às 15:05:24, Thiago Macieira escreveu:


Also, please keep the original copyright headers from the files you copied.
--

Attached patch adds Qt copyright to both files. 


--
Thanks,
Joshua

From 092bea260da8b02437c54eac51fd4fa044069e0e Mon Sep 17 00:00:00 2001 From: "Joseph W. Joshua" Date: Sun, 15 Jun 2014 01:20:12 +0300 Subject: [PATCH] Include Qt copyright headers in SubsurfaceSysInfo Signed-off-by: Joseph W. Joshua Signed-off-by: Dirk Hohndel --- subsurfacesysinfo.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++ subsurfacesysinfo.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/subsurfacesysinfo.cpp b/subsurfacesysinfo.cpp index f6577ede2..934e01320 100644 --- a/subsurfacesysinfo.cpp +++ b/subsurfacesysinfo.cpp @@ -1,3 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Intel Corporation +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + #include "subsurfacesysinfo.h" #include #include "qplatformdefs.h" diff --git a/subsurfacesysinfo.h b/subsurfacesysinfo.h index 8018ddb31..ef5a29862 100644 --- a/subsurfacesysinfo.h +++ b/subsurfacesysinfo.h @@ -1,3 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Intel Corporation +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + #ifndef SUBSURFACESYSINFO_H #define SUBSURFACESYSINFO_H -- cgit v1.2.3-70-g09d2