summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-01-24 12:54:01 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-30 07:07:42 +0100
commitafde95125614179dac72102f614f954c6787c73d (patch)
treeae769f64af42aadd08ac85f5ee148c17455a5010 /demos
parent24a069c94674667b893ea19c656ffca8fa6e3009 (diff)
Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Iaddf1e489f97d2b08894827c90e9e58cd02d2ef2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'demos')
-rw-r--r--demos/qt3d/cubehouse/cubeview.cpp2
-rw-r--r--demos/qt3d/cubehouse/cubeview.h2
-rw-r--r--demos/qt3d/cubehouse/main.cpp2
-rw-r--r--demos/qt3d/cubehouse/projectivetextureeffect.cpp2
-rw-r--r--demos/qt3d/cubehouse/projectivetextureeffect.h2
-rw-r--r--demos/qt3d/cubehouse/shaders/depth.frag2
-rw-r--r--demos/qt3d/cubehouse/shaders/depth.vert2
-rw-r--r--demos/qt3d/cubehouse/shaders/depthTestShader.frag2
-rw-r--r--demos/qt3d/cubehouse/shaders/depthTestShader.vert2
-rw-r--r--demos/qt3d/cubehouse/shaders/objectlineartexgen.frag2
-rw-r--r--demos/qt3d/cubehouse/shaders/objectlineartexgen.vert2
-rw-r--r--demos/qt3d/pageflip/pageflip.cpp2
-rw-r--r--demos/qt3d/pageflip/pageflipmath.cpp2
-rw-r--r--demos/qt3d/pageflip/pageflipmath_p.h2
-rw-r--r--demos/qt3d/photobrowser3d/buttons.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/buttons.h2
-rw-r--r--demos/qt3d/photobrowser3d/bytereader.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/bytereader.h2
-rw-r--r--demos/qt3d/photobrowser3d/filescanner.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/filescanner.h2
-rw-r--r--demos/qt3d/photobrowser3d/imagedisplay.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/imagedisplay.h2
-rw-r--r--demos/qt3d/photobrowser3d/imageloader.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/imageloader.h2
-rw-r--r--demos/qt3d/photobrowser3d/imagemanager.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/imagemanager.h2
-rw-r--r--demos/qt3d/photobrowser3d/launcher.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/main.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/pancontroller.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/pancontroller.h2
-rw-r--r--demos/qt3d/photobrowser3d/photobrowser3dview.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/photobrowser3dview.h2
-rw-r--r--demos/qt3d/photobrowser3d/qatlas.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/qatlas.h2
-rw-r--r--demos/qt3d/photobrowser3d/qfocusadaptor.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/qfocusadaptor.h2
-rw-r--r--demos/qt3d/photobrowser3d/qphotobrowser3dscene.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/qphotobrowser3dscene.h2
-rw-r--r--demos/qt3d/photobrowser3d/shaders/replace_texture.fsh2
-rw-r--r--demos/qt3d/photobrowser3d/shaders/replace_texture.vsh2
-rw-r--r--demos/qt3d/photobrowser3d/skybox.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/skybox.h2
-rw-r--r--demos/qt3d/photobrowser3d/threadpool.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/threadpool.h2
-rw-r--r--demos/qt3d/photobrowser3d/thumbnailableimage.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/thumbnailableimage.h2
-rw-r--r--demos/qt3d/photobrowser3d/thumbnaileffect.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/thumbnaileffect.h2
-rw-r--r--demos/qt3d/photobrowser3d/thumbnailnode.cpp2
-rw-r--r--demos/qt3d/photobrowser3d/thumbnailnode.h2
-rw-r--r--demos/qt3d/shapes/shapes.cpp2
-rw-r--r--demos/qt3d/teaservice/meshobject.cpp2
-rw-r--r--demos/qt3d/teaservice/meshobject.h2
-rw-r--r--demos/qt3d/teaservice/per_pixel_lighting.fsh2
-rw-r--r--demos/qt3d/teaservice/per_pixel_lighting.vsh2
-rw-r--r--demos/qt3d/teaservice/perpixeleffect.cpp2
-rw-r--r--demos/qt3d/teaservice/perpixeleffect.h2
-rw-r--r--demos/qt3d/teaservice/sceneobject.cpp2
-rw-r--r--demos/qt3d/teaservice/sceneobject.h2
-rw-r--r--demos/qt3d/teaservice/teaservice.cpp2
-rw-r--r--demos/quick3d/flickr3d/main.cpp2
-rw-r--r--demos/quick3d/flickr3d/mt.qml2
-rw-r--r--demos/quick3d/flickr3d/qml/Flickr3d.qml2
-rw-r--r--demos/quick3d/flickr3d/qml/desktop.qml2
-rw-r--r--demos/quick3d/model_viewer/main.cpp2
-rw-r--r--demos/quick3d/model_viewer/mt.qml2
-rw-r--r--demos/quick3d/model_viewer/qml/FourButtons.qml2
-rw-r--r--demos/quick3d/model_viewer/qml/LongButton.qml2
-rw-r--r--demos/quick3d/model_viewer/qml/MainButton.qml2
-rw-r--r--demos/quick3d/model_viewer/qml/ModelViewer.qml2
-rw-r--r--demos/quick3d/model_viewer/qml/ShortButton.qml2
-rw-r--r--demos/quick3d/model_viewer/qml/desktop.qml2
-rw-r--r--demos/quick3d/qmlres.h2
-rw-r--r--demos/quick3d/robo_bounce/main.cpp2
-rw-r--r--demos/quick3d/robo_bounce/mt.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/RoboBounce.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml2
-rw-r--r--demos/quick3d/robo_bounce/qml/desktop.qml2
-rw-r--r--demos/quick3d/tea_service/main.cpp2
-rw-r--r--demos/quick3d/tea_service/mt.qml2
-rw-r--r--demos/quick3d/tea_service/qml/TeaService.qml2
-rw-r--r--demos/quick3d/tea_service/qml/Teacup.qml2
-rw-r--r--demos/quick3d/tea_service/qml/Teaspoon.qml2
-rw-r--r--demos/quick3d/tea_service/qml/desktop.qml2
90 files changed, 90 insertions, 90 deletions
diff --git a/demos/qt3d/cubehouse/cubeview.cpp b/demos/qt3d/cubehouse/cubeview.cpp
index a6c959534..d620f445f 100644
--- a/demos/qt3d/cubehouse/cubeview.cpp
+++ b/demos/qt3d/cubehouse/cubeview.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/cubeview.h b/demos/qt3d/cubehouse/cubeview.h
index c06be60e1..f07060b20 100644
--- a/demos/qt3d/cubehouse/cubeview.h
+++ b/demos/qt3d/cubehouse/cubeview.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/main.cpp b/demos/qt3d/cubehouse/main.cpp
index a54784df1..e783d6b99 100644
--- a/demos/qt3d/cubehouse/main.cpp
+++ b/demos/qt3d/cubehouse/main.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/projectivetextureeffect.cpp b/demos/qt3d/cubehouse/projectivetextureeffect.cpp
index 3661a5dad..55885c966 100644
--- a/demos/qt3d/cubehouse/projectivetextureeffect.cpp
+++ b/demos/qt3d/cubehouse/projectivetextureeffect.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/projectivetextureeffect.h b/demos/qt3d/cubehouse/projectivetextureeffect.h
index 56bc61396..915a2853a 100644
--- a/demos/qt3d/cubehouse/projectivetextureeffect.h
+++ b/demos/qt3d/cubehouse/projectivetextureeffect.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/shaders/depth.frag b/demos/qt3d/cubehouse/shaders/depth.frag
index df931527d..174bd924b 100644
--- a/demos/qt3d/cubehouse/shaders/depth.frag
+++ b/demos/qt3d/cubehouse/shaders/depth.frag
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/shaders/depth.vert b/demos/qt3d/cubehouse/shaders/depth.vert
index 7f288983e..ca9c6440f 100644
--- a/demos/qt3d/cubehouse/shaders/depth.vert
+++ b/demos/qt3d/cubehouse/shaders/depth.vert
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/shaders/depthTestShader.frag b/demos/qt3d/cubehouse/shaders/depthTestShader.frag
index a20ab6172..85845efb3 100644
--- a/demos/qt3d/cubehouse/shaders/depthTestShader.frag
+++ b/demos/qt3d/cubehouse/shaders/depthTestShader.frag
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/shaders/depthTestShader.vert b/demos/qt3d/cubehouse/shaders/depthTestShader.vert
index df62a0f05..73c914f95 100644
--- a/demos/qt3d/cubehouse/shaders/depthTestShader.vert
+++ b/demos/qt3d/cubehouse/shaders/depthTestShader.vert
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag b/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
index b311f9371..e0b3b2eef 100644
--- a/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
+++ b/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert b/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
index a507f405c..88185d56c 100644
--- a/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
+++ b/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/pageflip/pageflip.cpp b/demos/qt3d/pageflip/pageflip.cpp
index f92187762..3b9e46d12 100644
--- a/demos/qt3d/pageflip/pageflip.cpp
+++ b/demos/qt3d/pageflip/pageflip.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/pageflip/pageflipmath.cpp b/demos/qt3d/pageflip/pageflipmath.cpp
index b63fdb450..8f6d85561 100644
--- a/demos/qt3d/pageflip/pageflipmath.cpp
+++ b/demos/qt3d/pageflip/pageflipmath.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/pageflip/pageflipmath_p.h b/demos/qt3d/pageflip/pageflipmath_p.h
index 471868a6b..8ef572855 100644
--- a/demos/qt3d/pageflip/pageflipmath_p.h
+++ b/demos/qt3d/pageflip/pageflipmath_p.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/buttons.cpp b/demos/qt3d/photobrowser3d/buttons.cpp
index 556b82b5e..44f73cddc 100644
--- a/demos/qt3d/photobrowser3d/buttons.cpp
+++ b/demos/qt3d/photobrowser3d/buttons.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/buttons.h b/demos/qt3d/photobrowser3d/buttons.h
index 6ea32db4a..fdfb0e803 100644
--- a/demos/qt3d/photobrowser3d/buttons.h
+++ b/demos/qt3d/photobrowser3d/buttons.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/bytereader.cpp b/demos/qt3d/photobrowser3d/bytereader.cpp
index 63de0b3f2..9ddf6a413 100644
--- a/demos/qt3d/photobrowser3d/bytereader.cpp
+++ b/demos/qt3d/photobrowser3d/bytereader.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/bytereader.h b/demos/qt3d/photobrowser3d/bytereader.h
index f47b4ad2d..f4faadc65 100644
--- a/demos/qt3d/photobrowser3d/bytereader.h
+++ b/demos/qt3d/photobrowser3d/bytereader.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/filescanner.cpp b/demos/qt3d/photobrowser3d/filescanner.cpp
index 91efc2033..00d890c89 100644
--- a/demos/qt3d/photobrowser3d/filescanner.cpp
+++ b/demos/qt3d/photobrowser3d/filescanner.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/filescanner.h b/demos/qt3d/photobrowser3d/filescanner.h
index 529c3806d..2318f1faa 100644
--- a/demos/qt3d/photobrowser3d/filescanner.h
+++ b/demos/qt3d/photobrowser3d/filescanner.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/imagedisplay.cpp b/demos/qt3d/photobrowser3d/imagedisplay.cpp
index 10a209de9..62ca8f809 100644
--- a/demos/qt3d/photobrowser3d/imagedisplay.cpp
+++ b/demos/qt3d/photobrowser3d/imagedisplay.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/imagedisplay.h b/demos/qt3d/photobrowser3d/imagedisplay.h
index c275ace01..a931ab9d7 100644
--- a/demos/qt3d/photobrowser3d/imagedisplay.h
+++ b/demos/qt3d/photobrowser3d/imagedisplay.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/imageloader.cpp b/demos/qt3d/photobrowser3d/imageloader.cpp
index e39640737..068154447 100644
--- a/demos/qt3d/photobrowser3d/imageloader.cpp
+++ b/demos/qt3d/photobrowser3d/imageloader.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/imageloader.h b/demos/qt3d/photobrowser3d/imageloader.h
index b229224f5..237318f19 100644
--- a/demos/qt3d/photobrowser3d/imageloader.h
+++ b/demos/qt3d/photobrowser3d/imageloader.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/imagemanager.cpp b/demos/qt3d/photobrowser3d/imagemanager.cpp
index 9d2fc6f3c..8f1b22d8b 100644
--- a/demos/qt3d/photobrowser3d/imagemanager.cpp
+++ b/demos/qt3d/photobrowser3d/imagemanager.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/imagemanager.h b/demos/qt3d/photobrowser3d/imagemanager.h
index 5d84d9a78..ce09d56c0 100644
--- a/demos/qt3d/photobrowser3d/imagemanager.h
+++ b/demos/qt3d/photobrowser3d/imagemanager.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/launcher.cpp b/demos/qt3d/photobrowser3d/launcher.cpp
index 04c6f264a..d1f15167b 100644
--- a/demos/qt3d/photobrowser3d/launcher.cpp
+++ b/demos/qt3d/photobrowser3d/launcher.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/main.cpp b/demos/qt3d/photobrowser3d/main.cpp
index c2f196bd0..04fd6bea2 100644
--- a/demos/qt3d/photobrowser3d/main.cpp
+++ b/demos/qt3d/photobrowser3d/main.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/pancontroller.cpp b/demos/qt3d/photobrowser3d/pancontroller.cpp
index d2a3a633f..b0c6d4b3b 100644
--- a/demos/qt3d/photobrowser3d/pancontroller.cpp
+++ b/demos/qt3d/photobrowser3d/pancontroller.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/pancontroller.h b/demos/qt3d/photobrowser3d/pancontroller.h
index ff508bbed..c67ef2e3b 100644
--- a/demos/qt3d/photobrowser3d/pancontroller.h
+++ b/demos/qt3d/photobrowser3d/pancontroller.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/photobrowser3dview.cpp b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
index e966a279e..bffe32f39 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
+++ b/demos/qt3d/photobrowser3d/photobrowser3dview.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/photobrowser3dview.h b/demos/qt3d/photobrowser3d/photobrowser3dview.h
index 6a70a1969..dbe703ae5 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3dview.h
+++ b/demos/qt3d/photobrowser3d/photobrowser3dview.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/qatlas.cpp b/demos/qt3d/photobrowser3d/qatlas.cpp
index 773258bcb..b6a009f39 100644
--- a/demos/qt3d/photobrowser3d/qatlas.cpp
+++ b/demos/qt3d/photobrowser3d/qatlas.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/qatlas.h b/demos/qt3d/photobrowser3d/qatlas.h
index fb1de9d27..b222eee2d 100644
--- a/demos/qt3d/photobrowser3d/qatlas.h
+++ b/demos/qt3d/photobrowser3d/qatlas.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/qfocusadaptor.cpp b/demos/qt3d/photobrowser3d/qfocusadaptor.cpp
index f21b1f652..297890224 100644
--- a/demos/qt3d/photobrowser3d/qfocusadaptor.cpp
+++ b/demos/qt3d/photobrowser3d/qfocusadaptor.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/qfocusadaptor.h b/demos/qt3d/photobrowser3d/qfocusadaptor.h
index 5f7a6d859..ac91467f5 100644
--- a/demos/qt3d/photobrowser3d/qfocusadaptor.h
+++ b/demos/qt3d/photobrowser3d/qfocusadaptor.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/qphotobrowser3dscene.cpp b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.cpp
index a787e9025..6be6e3278 100644
--- a/demos/qt3d/photobrowser3d/qphotobrowser3dscene.cpp
+++ b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h
index 888c41988..0231bb9f8 100644
--- a/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h
+++ b/demos/qt3d/photobrowser3d/qphotobrowser3dscene.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh b/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
index b2d1a149b..34f40d392 100644
--- a/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
+++ b/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh b/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
index 22bb811c8..117464e21 100644
--- a/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
+++ b/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/skybox.cpp b/demos/qt3d/photobrowser3d/skybox.cpp
index f8a17cd4d..e6c8195cf 100644
--- a/demos/qt3d/photobrowser3d/skybox.cpp
+++ b/demos/qt3d/photobrowser3d/skybox.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/skybox.h b/demos/qt3d/photobrowser3d/skybox.h
index 14417337e..4b31b1855 100644
--- a/demos/qt3d/photobrowser3d/skybox.h
+++ b/demos/qt3d/photobrowser3d/skybox.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/threadpool.cpp b/demos/qt3d/photobrowser3d/threadpool.cpp
index 0f03e6738..3d4fc689e 100644
--- a/demos/qt3d/photobrowser3d/threadpool.cpp
+++ b/demos/qt3d/photobrowser3d/threadpool.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/threadpool.h b/demos/qt3d/photobrowser3d/threadpool.h
index bf167ea74..7ddc6f41a 100644
--- a/demos/qt3d/photobrowser3d/threadpool.h
+++ b/demos/qt3d/photobrowser3d/threadpool.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/thumbnailableimage.cpp b/demos/qt3d/photobrowser3d/thumbnailableimage.cpp
index 2d7ee33f3..f44ffb3a1 100644
--- a/demos/qt3d/photobrowser3d/thumbnailableimage.cpp
+++ b/demos/qt3d/photobrowser3d/thumbnailableimage.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/thumbnailableimage.h b/demos/qt3d/photobrowser3d/thumbnailableimage.h
index bc95256fc..17843f2de 100644
--- a/demos/qt3d/photobrowser3d/thumbnailableimage.h
+++ b/demos/qt3d/photobrowser3d/thumbnailableimage.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/thumbnaileffect.cpp b/demos/qt3d/photobrowser3d/thumbnaileffect.cpp
index 77329652f..bb60500fb 100644
--- a/demos/qt3d/photobrowser3d/thumbnaileffect.cpp
+++ b/demos/qt3d/photobrowser3d/thumbnaileffect.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/thumbnaileffect.h b/demos/qt3d/photobrowser3d/thumbnaileffect.h
index 7af1ccf34..73e95e056 100644
--- a/demos/qt3d/photobrowser3d/thumbnaileffect.h
+++ b/demos/qt3d/photobrowser3d/thumbnaileffect.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/thumbnailnode.cpp b/demos/qt3d/photobrowser3d/thumbnailnode.cpp
index 6e139fc65..1c2bdfd3b 100644
--- a/demos/qt3d/photobrowser3d/thumbnailnode.cpp
+++ b/demos/qt3d/photobrowser3d/thumbnailnode.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/photobrowser3d/thumbnailnode.h b/demos/qt3d/photobrowser3d/thumbnailnode.h
index 4d379b6c8..d1d63cee1 100644
--- a/demos/qt3d/photobrowser3d/thumbnailnode.h
+++ b/demos/qt3d/photobrowser3d/thumbnailnode.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/shapes/shapes.cpp b/demos/qt3d/shapes/shapes.cpp
index f901a28b5..21e6a50fb 100644
--- a/demos/qt3d/shapes/shapes.cpp
+++ b/demos/qt3d/shapes/shapes.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/meshobject.cpp b/demos/qt3d/teaservice/meshobject.cpp
index 3de36bdd4..c2ba0d5e5 100644
--- a/demos/qt3d/teaservice/meshobject.cpp
+++ b/demos/qt3d/teaservice/meshobject.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/meshobject.h b/demos/qt3d/teaservice/meshobject.h
index a7815ffd0..65b622a57 100644
--- a/demos/qt3d/teaservice/meshobject.h
+++ b/demos/qt3d/teaservice/meshobject.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/per_pixel_lighting.fsh b/demos/qt3d/teaservice/per_pixel_lighting.fsh
index db965486f..2cab8cd4d 100644
--- a/demos/qt3d/teaservice/per_pixel_lighting.fsh
+++ b/demos/qt3d/teaservice/per_pixel_lighting.fsh
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/per_pixel_lighting.vsh b/demos/qt3d/teaservice/per_pixel_lighting.vsh
index 27c46c1e1..dc28215cf 100644
--- a/demos/qt3d/teaservice/per_pixel_lighting.vsh
+++ b/demos/qt3d/teaservice/per_pixel_lighting.vsh
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/perpixeleffect.cpp b/demos/qt3d/teaservice/perpixeleffect.cpp
index cddc2fe6d..bbd7789b9 100644
--- a/demos/qt3d/teaservice/perpixeleffect.cpp
+++ b/demos/qt3d/teaservice/perpixeleffect.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/perpixeleffect.h b/demos/qt3d/teaservice/perpixeleffect.h
index dc4313f93..ffe6ff963 100644
--- a/demos/qt3d/teaservice/perpixeleffect.h
+++ b/demos/qt3d/teaservice/perpixeleffect.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/sceneobject.cpp b/demos/qt3d/teaservice/sceneobject.cpp
index 1cd808f52..d05a23413 100644
--- a/demos/qt3d/teaservice/sceneobject.cpp
+++ b/demos/qt3d/teaservice/sceneobject.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/sceneobject.h b/demos/qt3d/teaservice/sceneobject.h
index 43a8d398d..9fea6b0db 100644
--- a/demos/qt3d/teaservice/sceneobject.h
+++ b/demos/qt3d/teaservice/sceneobject.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/qt3d/teaservice/teaservice.cpp b/demos/qt3d/teaservice/teaservice.cpp
index 2eddadf67..be66b8012 100644
--- a/demos/qt3d/teaservice/teaservice.cpp
+++ b/demos/qt3d/teaservice/teaservice.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/flickr3d/main.cpp b/demos/quick3d/flickr3d/main.cpp
index 952919226..a49afa7e9 100644
--- a/demos/quick3d/flickr3d/main.cpp
+++ b/demos/quick3d/flickr3d/main.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/flickr3d/mt.qml b/demos/quick3d/flickr3d/mt.qml
index 9d10b954f..dcde43390 100644
--- a/demos/quick3d/flickr3d/mt.qml
+++ b/demos/quick3d/flickr3d/mt.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/flickr3d/qml/Flickr3d.qml b/demos/quick3d/flickr3d/qml/Flickr3d.qml
index 2bbb5d5b0..3eb0c3dc9 100644
--- a/demos/quick3d/flickr3d/qml/Flickr3d.qml
+++ b/demos/quick3d/flickr3d/qml/Flickr3d.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/flickr3d/qml/desktop.qml b/demos/quick3d/flickr3d/qml/desktop.qml
index 0d78d1acf..fa4dcb0ce 100644
--- a/demos/quick3d/flickr3d/qml/desktop.qml
+++ b/demos/quick3d/flickr3d/qml/desktop.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/model_viewer/main.cpp b/demos/quick3d/model_viewer/main.cpp
index 952919226..a49afa7e9 100644
--- a/demos/quick3d/model_viewer/main.cpp
+++ b/demos/quick3d/model_viewer/main.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/model_viewer/mt.qml b/demos/quick3d/model_viewer/mt.qml
index 3b4f8dbd4..825612fad 100644
--- a/demos/quick3d/model_viewer/mt.qml
+++ b/demos/quick3d/model_viewer/mt.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/model_viewer/qml/FourButtons.qml b/demos/quick3d/model_viewer/qml/FourButtons.qml
index 136d06353..186b2b765 100644
--- a/demos/quick3d/model_viewer/qml/FourButtons.qml
+++ b/demos/quick3d/model_viewer/qml/FourButtons.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/model_viewer/qml/LongButton.qml b/demos/quick3d/model_viewer/qml/LongButton.qml
index 81e99859d..461289b80 100644
--- a/demos/quick3d/model_viewer/qml/LongButton.qml
+++ b/demos/quick3d/model_viewer/qml/LongButton.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/model_viewer/qml/MainButton.qml b/demos/quick3d/model_viewer/qml/MainButton.qml
index 4f01cfcc2..17357a5db 100644
--- a/demos/quick3d/model_viewer/qml/MainButton.qml
+++ b/demos/quick3d/model_viewer/qml/MainButton.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/model_viewer/qml/ModelViewer.qml b/demos/quick3d/model_viewer/qml/ModelViewer.qml
index cd0cfb92b..883dfc6e4 100644
--- a/demos/quick3d/model_viewer/qml/ModelViewer.qml
+++ b/demos/quick3d/model_viewer/qml/ModelViewer.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/model_viewer/qml/ShortButton.qml b/demos/quick3d/model_viewer/qml/ShortButton.qml
index 78a961833..5b21b8df4 100644
--- a/demos/quick3d/model_viewer/qml/ShortButton.qml
+++ b/demos/quick3d/model_viewer/qml/ShortButton.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/model_viewer/qml/desktop.qml b/demos/quick3d/model_viewer/qml/desktop.qml
index 10b2269b6..f2e8d1b49 100644
--- a/demos/quick3d/model_viewer/qml/desktop.qml
+++ b/demos/quick3d/model_viewer/qml/desktop.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/qmlres.h b/demos/quick3d/qmlres.h
index 9bb51d3c5..67ee3d4c8 100644
--- a/demos/quick3d/qmlres.h
+++ b/demos/quick3d/qmlres.h
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/main.cpp b/demos/quick3d/robo_bounce/main.cpp
index 952919226..a49afa7e9 100644
--- a/demos/quick3d/robo_bounce/main.cpp
+++ b/demos/quick3d/robo_bounce/main.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/mt.qml b/demos/quick3d/robo_bounce/mt.qml
index a3b36a137..998f308a6 100644
--- a/demos/quick3d/robo_bounce/mt.qml
+++ b/demos/quick3d/robo_bounce/mt.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml b/demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml
index f8545810d..f72474fe1 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml
+++ b/demos/quick3d/robo_bounce/qml/Calculator/Calculator.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml
index 738d83550..08ff477c2 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Button.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml
index 6e0997949..466f55eef 100644
--- a/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml
+++ b/demos/quick3d/robo_bounce/qml/Calculator/CalculatorCore/Display.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/RoboBounce.qml b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
index 12e5393b2..cad805f58 100644
--- a/demos/quick3d/robo_bounce/qml/RoboBounce.qml
+++ b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml b/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
index fe1b1253c..19f96a974 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml b/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
index 1bc8b75c6..f71c6cca9 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml b/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
index 0902d731f..181a81b0f 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml b/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
index 4911f98a5..6b21f2edc 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/robo_bounce/qml/desktop.qml b/demos/quick3d/robo_bounce/qml/desktop.qml
index d31d36fc4..184ec98e1 100644
--- a/demos/quick3d/robo_bounce/qml/desktop.qml
+++ b/demos/quick3d/robo_bounce/qml/desktop.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/tea_service/main.cpp b/demos/quick3d/tea_service/main.cpp
index 952919226..a49afa7e9 100644
--- a/demos/quick3d/tea_service/main.cpp
+++ b/demos/quick3d/tea_service/main.cpp
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D module of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/tea_service/mt.qml b/demos/quick3d/tea_service/mt.qml
index 85af73d76..95a4d7864 100644
--- a/demos/quick3d/tea_service/mt.qml
+++ b/demos/quick3d/tea_service/mt.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the QtQuick3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/tea_service/qml/TeaService.qml b/demos/quick3d/tea_service/qml/TeaService.qml
index ce3c79934..858a6d7f3 100644
--- a/demos/quick3d/tea_service/qml/TeaService.qml
+++ b/demos/quick3d/tea_service/qml/TeaService.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/tea_service/qml/Teacup.qml b/demos/quick3d/tea_service/qml/Teacup.qml
index 4ea453a13..230dfb0db 100644
--- a/demos/quick3d/tea_service/qml/Teacup.qml
+++ b/demos/quick3d/tea_service/qml/Teacup.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/tea_service/qml/Teaspoon.qml b/demos/quick3d/tea_service/qml/Teaspoon.qml
index c2f865c16..880d29a6f 100644
--- a/demos/quick3d/tea_service/qml/Teaspoon.qml
+++ b/demos/quick3d/tea_service/qml/Teaspoon.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/demos/quick3d/tea_service/qml/desktop.qml b/demos/quick3d/tea_service/qml/desktop.qml
index e131fd970..886569d72 100644
--- a/demos/quick3d/tea_service/qml/desktop.qml
+++ b/demos/quick3d/tea_service/qml/desktop.qml
@@ -1,7 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
** Contact: http://www.qt-project.org/
**
** This file is part of the Qt3D examples of the Qt Toolkit.
@@ -35,6 +34,7 @@
**
**
**
+**
** $QT_END_LICENSE$
**
****************************************************************************/