From c7aa0be29858649b7c8ab8cae0aaae4ebedfad82 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Mon, 23 Nov 2015 12:42:31 +0100 Subject: Update headers to pass license check test Change-Id: I48623789ed483a9f8efe17fe398400ed29c87f3f Reviewed-by: Antti Kokko --- src/doc/src/qtquick2drenderer-index.qdoc | 10 +++++---- .../src/qtquick2drenderer-installation-guide.qdoc | 10 +++++---- src/doc/src/qtquick2drenderer-limitations.qdoc | 10 +++++---- src/doc/src/qtquick2drenderer-performance.qdoc | 10 +++++---- src/plugins/scenegraph/softwarecontext/context.cpp | 10 +++++---- src/plugins/scenegraph/softwarecontext/context.h | 10 +++++---- .../scenegraph/softwarecontext/glyphnode.cpp | 10 +++++---- src/plugins/scenegraph/softwarecontext/glyphnode.h | 10 +++++---- .../scenegraph/softwarecontext/imagenode.cpp | 10 +++++---- src/plugins/scenegraph/softwarecontext/imagenode.h | 10 +++++---- .../scenegraph/softwarecontext/ninepatchnode.cpp | 10 +++++---- .../scenegraph/softwarecontext/ninepatchnode.h | 10 +++++---- .../scenegraph/softwarecontext/painternode.cpp | 10 +++++---- .../scenegraph/softwarecontext/painternode.h | 10 +++++---- .../scenegraph/softwarecontext/pixmaptexture.cpp | 10 +++++---- .../scenegraph/softwarecontext/pixmaptexture.h | 10 +++++---- .../scenegraph/softwarecontext/pluginmain.cpp | 10 +++++---- .../scenegraph/softwarecontext/pluginmain.h | 10 +++++---- .../scenegraph/softwarecontext/rectanglenode.cpp | 10 +++++---- .../scenegraph/softwarecontext/rectanglenode.h | 10 +++++---- .../softwarecontext/renderingvisitor.cpp | 10 +++++---- .../scenegraph/softwarecontext/renderingvisitor.h | 10 +++++---- .../scenegraph/softwarecontext/renderloop.cpp | 10 +++++---- .../scenegraph/softwarecontext/renderloop.h | 10 +++++---- .../scenegraph/softwarecontext/softwarelayer.cpp | 10 +++++---- .../scenegraph/softwarecontext/softwarelayer.h | 10 +++++---- .../softwarecontext/threadedrenderloop.cpp | 10 +++++---- .../softwarecontext/threadedrenderloop.h | 10 +++++---- tools/opengldummy/src/egl.cpp | 25 +++++++++++----------- tools/opengldummy/src/gles2.cpp | 25 +++++++++++----------- 30 files changed, 194 insertions(+), 136 deletions(-) diff --git a/src/doc/src/qtquick2drenderer-index.qdoc b/src/doc/src/qtquick2drenderer-index.qdoc index 7af642e..52eed81 100644 --- a/src/doc/src/qtquick2drenderer-index.qdoc +++ b/src/doc/src/qtquick2drenderer-index.qdoc @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ /*! \contentspage{index.html}{Qt Quick 2D Renderer} diff --git a/src/doc/src/qtquick2drenderer-installation-guide.qdoc b/src/doc/src/qtquick2drenderer-installation-guide.qdoc index 3dc408a..1870964 100644 --- a/src/doc/src/qtquick2drenderer-installation-guide.qdoc +++ b/src/doc/src/qtquick2drenderer-installation-guide.qdoc @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ /*! \page qtquick2drenderer-installation-guide.html diff --git a/src/doc/src/qtquick2drenderer-limitations.qdoc b/src/doc/src/qtquick2drenderer-limitations.qdoc index c1ba38d..63c3f20 100644 --- a/src/doc/src/qtquick2drenderer-limitations.qdoc +++ b/src/doc/src/qtquick2drenderer-limitations.qdoc @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ /*! \page qtquick2drenderer-limitations.html diff --git a/src/doc/src/qtquick2drenderer-performance.qdoc b/src/doc/src/qtquick2drenderer-performance.qdoc index 8fc57b9..94fdfe1 100644 --- a/src/doc/src/qtquick2drenderer-performance.qdoc +++ b/src/doc/src/qtquick2drenderer-performance.qdoc @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ /*! \contentspage{index.html}{Qt Quick 2D Renderer} diff --git a/src/plugins/scenegraph/softwarecontext/context.cpp b/src/plugins/scenegraph/softwarecontext/context.cpp index b3b97a7..7f9a4b5 100644 --- a/src/plugins/scenegraph/softwarecontext/context.cpp +++ b/src/plugins/scenegraph/softwarecontext/context.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "context.h" diff --git a/src/plugins/scenegraph/softwarecontext/context.h b/src/plugins/scenegraph/softwarecontext/context.h index 0d734df..bc633b5 100644 --- a/src/plugins/scenegraph/softwarecontext/context.h +++ b/src/plugins/scenegraph/softwarecontext/context.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef CONTEXT_H #define CONTEXT_H diff --git a/src/plugins/scenegraph/softwarecontext/glyphnode.cpp b/src/plugins/scenegraph/softwarecontext/glyphnode.cpp index 36d83b3..bd750ad 100644 --- a/src/plugins/scenegraph/softwarecontext/glyphnode.cpp +++ b/src/plugins/scenegraph/softwarecontext/glyphnode.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "glyphnode.h" diff --git a/src/plugins/scenegraph/softwarecontext/glyphnode.h b/src/plugins/scenegraph/softwarecontext/glyphnode.h index e7b5e47..281a105 100644 --- a/src/plugins/scenegraph/softwarecontext/glyphnode.h +++ b/src/plugins/scenegraph/softwarecontext/glyphnode.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef GLYPHNODE_H #define GLYPHNODE_H diff --git a/src/plugins/scenegraph/softwarecontext/imagenode.cpp b/src/plugins/scenegraph/softwarecontext/imagenode.cpp index b5b0dbc..7bbe5dc 100644 --- a/src/plugins/scenegraph/softwarecontext/imagenode.cpp +++ b/src/plugins/scenegraph/softwarecontext/imagenode.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "imagenode.h" diff --git a/src/plugins/scenegraph/softwarecontext/imagenode.h b/src/plugins/scenegraph/softwarecontext/imagenode.h index 4a62350..2c3a867 100644 --- a/src/plugins/scenegraph/softwarecontext/imagenode.h +++ b/src/plugins/scenegraph/softwarecontext/imagenode.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef IMAGENODE_H #define IMAGENODE_H diff --git a/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp b/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp index 052e7b8..829fbb8 100644 --- a/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp +++ b/src/plugins/scenegraph/softwarecontext/ninepatchnode.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "ninepatchnode.h" #include "pixmaptexture.h" diff --git a/src/plugins/scenegraph/softwarecontext/ninepatchnode.h b/src/plugins/scenegraph/softwarecontext/ninepatchnode.h index 34fdc44..5cb96cc 100644 --- a/src/plugins/scenegraph/softwarecontext/ninepatchnode.h +++ b/src/plugins/scenegraph/softwarecontext/ninepatchnode.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef NINEPATCHNODE_H #define NINEPATCHNODE_H diff --git a/src/plugins/scenegraph/softwarecontext/painternode.cpp b/src/plugins/scenegraph/softwarecontext/painternode.cpp index 7e61cfa..9bb3b78 100644 --- a/src/plugins/scenegraph/softwarecontext/painternode.cpp +++ b/src/plugins/scenegraph/softwarecontext/painternode.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "painternode.h" #include "pixmaptexture.h" diff --git a/src/plugins/scenegraph/softwarecontext/painternode.h b/src/plugins/scenegraph/softwarecontext/painternode.h index 6a2891d..6244c4d 100644 --- a/src/plugins/scenegraph/softwarecontext/painternode.h +++ b/src/plugins/scenegraph/softwarecontext/painternode.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef PAINTERNODE_H #define PAINTERNODE_H diff --git a/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp b/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp index 1a4c70e..d240b08 100644 --- a/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp +++ b/src/plugins/scenegraph/softwarecontext/pixmaptexture.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "pixmaptexture.h" diff --git a/src/plugins/scenegraph/softwarecontext/pixmaptexture.h b/src/plugins/scenegraph/softwarecontext/pixmaptexture.h index 842ee3b..54b2cd8 100644 --- a/src/plugins/scenegraph/softwarecontext/pixmaptexture.h +++ b/src/plugins/scenegraph/softwarecontext/pixmaptexture.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef PIXMAPTEXTURE_H #define PIXMAPTEXTURE_H diff --git a/src/plugins/scenegraph/softwarecontext/pluginmain.cpp b/src/plugins/scenegraph/softwarecontext/pluginmain.cpp index 5b35859..c247d58 100644 --- a/src/plugins/scenegraph/softwarecontext/pluginmain.cpp +++ b/src/plugins/scenegraph/softwarecontext/pluginmain.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "pluginmain.h" #include "context.h" diff --git a/src/plugins/scenegraph/softwarecontext/pluginmain.h b/src/plugins/scenegraph/softwarecontext/pluginmain.h index f0c6890..f2a6790 100644 --- a/src/plugins/scenegraph/softwarecontext/pluginmain.h +++ b/src/plugins/scenegraph/softwarecontext/pluginmain.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef PLUGINMAIN_H #define PLUGINMAIN_H diff --git a/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp b/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp index 3b612e1..49a67fa 100644 --- a/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp +++ b/src/plugins/scenegraph/softwarecontext/rectanglenode.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "rectanglenode.h" #include diff --git a/src/plugins/scenegraph/softwarecontext/rectanglenode.h b/src/plugins/scenegraph/softwarecontext/rectanglenode.h index 091920a..cffd11c 100644 --- a/src/plugins/scenegraph/softwarecontext/rectanglenode.h +++ b/src/plugins/scenegraph/softwarecontext/rectanglenode.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef RECTANGLENODE_H #define RECTANGLENODE_H diff --git a/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp b/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp index 6122434..9be4145 100644 --- a/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp +++ b/src/plugins/scenegraph/softwarecontext/renderingvisitor.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "renderingvisitor.h" diff --git a/src/plugins/scenegraph/softwarecontext/renderingvisitor.h b/src/plugins/scenegraph/softwarecontext/renderingvisitor.h index 416c56a..4a18c00 100644 --- a/src/plugins/scenegraph/softwarecontext/renderingvisitor.h +++ b/src/plugins/scenegraph/softwarecontext/renderingvisitor.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef RENDERINGVISITOR_H #define RENDERINGVISITOR_H diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.cpp b/src/plugins/scenegraph/softwarecontext/renderloop.cpp index 6cb6550..dad2c1c 100644 --- a/src/plugins/scenegraph/softwarecontext/renderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/renderloop.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "renderloop.h" diff --git a/src/plugins/scenegraph/softwarecontext/renderloop.h b/src/plugins/scenegraph/softwarecontext/renderloop.h index 4f17e85..eeb7e89 100644 --- a/src/plugins/scenegraph/softwarecontext/renderloop.h +++ b/src/plugins/scenegraph/softwarecontext/renderloop.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef RENDERLOOP_H #define RENDERLOOP_H diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp index 8fcf3ab..25de22d 100644 --- a/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp +++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.cpp @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "softwarelayer.h" diff --git a/src/plugins/scenegraph/softwarecontext/softwarelayer.h b/src/plugins/scenegraph/softwarecontext/softwarelayer.h index c4375b1..eb01e8b 100644 --- a/src/plugins/scenegraph/softwarecontext/softwarelayer.h +++ b/src/plugins/scenegraph/softwarecontext/softwarelayer.h @@ -1,11 +1,12 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -13,9 +14,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef SOFTWARELAYER_H #define SOFTWARELAYER_H diff --git a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp index 9f255c2..ab274ed 100644 --- a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp +++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp @@ -1,12 +1,13 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2014 Jolla Ltd, author: ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of H. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,9 +15,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include "threadedrenderloop.h" diff --git a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h index 844e0de..7ecb1fd 100644 --- a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h +++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.h @@ -1,12 +1,13 @@ -/**************************************************************************** +/****************************************************************************** ** ** Copyright (C) 2014 Jolla Ltd, author: ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of Qt Quick 2d Renderer module of the Qt Toolkit. +** This file is part of the Qt Quick 2d Renderer module. +** +** $QT_BEGIN_LICENSE:COMM$ ** -** $QT_BEGIN_LICENSE$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -14,9 +15,10 @@ ** 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. +** ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #ifndef THREADEDRENDERLOOP_H #define THREADEDRENDERLOOP_H diff --git a/tools/opengldummy/src/egl.cpp b/tools/opengldummy/src/egl.cpp index 9638a02..fb42844 100644 --- a/tools/opengldummy/src/egl.cpp +++ b/tools/opengldummy/src/egl.cpp @@ -1,22 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt SceneGraph Raster Add-on. +** This file is part of the Qt Quick 2d Renderer module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial 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://qt.digia.com ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include diff --git a/tools/opengldummy/src/gles2.cpp b/tools/opengldummy/src/gles2.cpp index 9d239c9..44e8774 100644 --- a/tools/opengldummy/src/gles2.cpp +++ b/tools/opengldummy/src/gles2.cpp @@ -1,22 +1,23 @@ -/**************************************************************************** +/****************************************************************************** ** -** Copyright (C) 2014 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt SceneGraph Raster Add-on. +** This file is part of the Qt Quick 2d Renderer module. ** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial 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://qt.digia.com ** $QT_END_LICENSE$ ** -****************************************************************************/ +******************************************************************************/ #include -- cgit v1.2.3