Update headers to pass license check test

Change-Id: I48623789ed483a9f8efe17fe398400ed29c87f3f
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>

30 files changed, 194 insertions, 136 deletions

diff --git a/src/doc/src/qtquick2drenderer-index.qdoc b/src/doc/src/qtquick2drenderer-index.qdoc
index 7af642e125..52eed811a3 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 3dc408a458..1870964ea7 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 c1ba38d377..63c3f209f2 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 8fc57b96cd..94fdfe13ca 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 b3b97a7d7c..7f9a4b587a 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 0d734df943..bc633b50e1 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 36d83b3b40..bd750adfdc 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 e7b5e47323..281a105aeb 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 b5b0dbc5cf..7bbe5dc2eb 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 4a62350d11..2c3a867c5e 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 052e7b88e3..829fbb8e3a 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 34fdc44ef3..5cb96ccf39 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 7e61cfa889..9bb3b78d4e 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 6a2891dc8d..6244c4d971 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 1a4c70e7ab..d240b085d3 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 842ee3bf0e..54b2cd8570 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 5b35859a19..c247d58ac7 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 f0c6890001..f2a67909a3 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 3b612e1f62..49a67fab63 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 <qmath.h>
diff --git a/src/plugins/scenegraph/softwarecontext/rectanglenode.h b/src/plugins/scenegraph/softwarecontext/rectanglenode.h
index 091920abef..cffd11c504 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 6122434f70..9be4145db2 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 416c56a0b2..4a18c00512 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 6cb655013f..dad2c1c9cb 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 4f17e85765..eeb7e892d8 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 8fcf3abc8f..25de22d1fc 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 c4375b1dec..eb01e8b276 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 9f255c28af..ab274ed4af 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: <gunnar.sletta@jollamobile.com>
 ** 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 844e0def13..7ecb1fd857 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: <gunnar.sletta@jollamobile.com>
 ** 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 9638a02b33..fb42844a39 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 <EGL/egl.h>
 
diff --git a/tools/opengldummy/src/gles2.cpp b/tools/opengldummy/src/gles2.cpp
index 9d239c97ad..44e8774d93 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 <GLES2/gl2.h>