1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some wrong licenses in QtWaylandClient

Browse Source 
Change-Id: I8d5e88e9b296276c6d9d570b3e5e704f32298d83
This commit is contained in:
Jørgen Lind 2015-07-24 15:22:41 +02:00
parent bd4a0928ab
commit 5328e070e3
4 changed files with 84 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/platforms/wayland/qwaylanddatadevice.cpp
View File

@ -3,41 +3,35 @@
** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB). ** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB).
** Contact: http://www.qt.io/licensing/ ** Contact: http://www.qt.io/licensing/
** **
** This file is part of the Qt Compositor. ** This file is part of the QtWaylandClient module of the Qt Toolkit.
** **
** $QT_BEGIN_LICENSE:BSD$ ** $QT_BEGIN_LICENSE:LGPL21$
** You may use this file under the terms of the BSD license as follows: ** 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 http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
** **
** "Redistribution and use in source and binary forms, with or without ** GNU Lesser General Public License Usage
** modification, are permitted provided that the following conditions are ** Alternatively, this file may be used under the terms of the GNU Lesser
** met: ** General Public License version 2.1 or version 3 as published by the Free
** * Redistributions of source code must retain the above copyright ** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** notice, this list of conditions and the following disclaimer. ** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** * Redistributions in binary form must reproduce the above copyright ** following information to ensure the GNU Lesser General Public License
** notice, this list of conditions and the following disclaimer in ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** the documentation and/or other materials provided with the ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
** 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.
** **
** ** As a special exception, The Qt Company gives you certain additional
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** rights. These rights are described in The Qt Company LGPL Exception
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** 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$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include "qwaylanddatadevice_p.h" #include "qwaylanddatadevice_p.h"
#include "qwaylanddatadevicemanager_p.h" #include "qwaylanddatadevicemanager_p.h"

48
src/plugins/platforms/wayland/qwaylanddatadevice_p.h
View File

@ -3,41 +3,35 @@
** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB). ** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB).
** Contact: http://www.qt.io/licensing/ ** Contact: http://www.qt.io/licensing/
** **
** This file is part of the Qt Compositor. ** This file is part of the QtWaylandClient module of the Qt Toolkit.
** **
** $QT_BEGIN_LICENSE:BSD$ ** $QT_BEGIN_LICENSE:LGPL21$
** You may use this file under the terms of the BSD license as follows: ** 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 http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
** **
** "Redistribution and use in source and binary forms, with or without ** GNU Lesser General Public License Usage
** modification, are permitted provided that the following conditions are ** Alternatively, this file may be used under the terms of the GNU Lesser
** met: ** General Public License version 2.1 or version 3 as published by the Free
** * Redistributions of source code must retain the above copyright ** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** notice, this list of conditions and the following disclaimer. ** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** * Redistributions in binary form must reproduce the above copyright ** following information to ensure the GNU Lesser General Public License
** notice, this list of conditions and the following disclaimer in ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** the documentation and/or other materials provided with the ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
** 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.
** **
** ** As a special exception, The Qt Company gives you certain additional
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** rights. These rights are described in The Qt Company LGPL Exception
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** 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$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#ifndef QWAYLANDDATADEVICE_H #ifndef QWAYLANDDATADEVICE_H
#define QWAYLANDDATADEVICE_H #define QWAYLANDDATADEVICE_H

48
src/plugins/platforms/wayland/qwaylandinputcontext.cpp
View File

@ -3,41 +3,35 @@
** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB). ** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB).
** Contact: http://www.qt.io/licensing/ ** Contact: http://www.qt.io/licensing/
** **
** This file is part of the Qt Compositor. ** This file is part of the QtWaylandClient module of the Qt Toolkit.
** **
** $QT_BEGIN_LICENSE:BSD$ ** $QT_BEGIN_LICENSE:LGPL21$
** You may use this file under the terms of the BSD license as follows: ** 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 http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
** **
** "Redistribution and use in source and binary forms, with or without ** GNU Lesser General Public License Usage
** modification, are permitted provided that the following conditions are ** Alternatively, this file may be used under the terms of the GNU Lesser
** met: ** General Public License version 2.1 or version 3 as published by the Free
** * Redistributions of source code must retain the above copyright ** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** notice, this list of conditions and the following disclaimer. ** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** * Redistributions in binary form must reproduce the above copyright ** following information to ensure the GNU Lesser General Public License
** notice, this list of conditions and the following disclaimer in ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** the documentation and/or other materials provided with the ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
** 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.
** **
** ** As a special exception, The Qt Company gives you certain additional
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** rights. These rights are described in The Qt Company LGPL Exception
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** 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$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#include "qwaylandinputcontext_p.h" #include "qwaylandinputcontext_p.h"
#include <QGuiApplication> #include <QGuiApplication>

48
src/plugins/platforms/wayland/qwaylandinputcontext_p.h
View File

@ -3,41 +3,35 @@
** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB). ** Copyright (C) 2013 Klarälvdalens Datakonsult AB (KDAB).
** Contact: http://www.qt.io/licensing/ ** Contact: http://www.qt.io/licensing/
** **
** This file is part of the Qt Compositor. ** This file is part of the QtWaylandClient module of the Qt Toolkit.
** **
** $QT_BEGIN_LICENSE:BSD$ ** $QT_BEGIN_LICENSE:LGPL21$
** You may use this file under the terms of the BSD license as follows: ** 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 http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
** **
** "Redistribution and use in source and binary forms, with or without ** GNU Lesser General Public License Usage
** modification, are permitted provided that the following conditions are ** Alternatively, this file may be used under the terms of the GNU Lesser
** met: ** General Public License version 2.1 or version 3 as published by the Free
** * Redistributions of source code must retain the above copyright ** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** notice, this list of conditions and the following disclaimer. ** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** * Redistributions in binary form must reproduce the above copyright ** following information to ensure the GNU Lesser General Public License
** notice, this list of conditions and the following disclaimer in ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** the documentation and/or other materials provided with the ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
** 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.
** **
** ** As a special exception, The Qt Company gives you certain additional
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** rights. These rights are described in The Qt Company LGPL Exception
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
** 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$ ** $QT_END_LICENSE$
** **
****************************************************************************/ ****************************************************************************/
#ifndef QWAYLANDINPUTCONTEXT_H #ifndef QWAYLANDINPUTCONTEXT_H
#define QWAYLANDINPUTCONTEXT_H #define QWAYLANDINPUTCONTEXT_H