summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-01-10 16:00:50 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-12 02:37:46 +0100
commit8ccff34d6f1720c1b345109c636c56d3623bdb29 (patch)
tree4d855fe73bb53ea43e107c682458d73218df588c /demos
parent072139bb55dae3877790d6a36725b3a75aeaa027 (diff)
Update copyright year in Nokia copyright headers.
Update copyright headers from before 2011. Change-Id: Id5a16806e69c595b12cc761acfa0a0eaf0b99d72 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'demos')
-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/photobrowser3d/shaders/replace_texture.fsh2
-rw-r--r--demos/qt3d/photobrowser3d/shaders/replace_texture.vsh2
-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/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/robo_bounce/mt.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/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
31 files changed, 31 insertions, 31 deletions
diff --git a/demos/qt3d/cubehouse/shaders/depth.frag b/demos/qt3d/cubehouse/shaders/depth.frag
index 0dc15c969..1e31c00ec 100644
--- a/demos/qt3d/cubehouse/shaders/depth.frag
+++ b/demos/qt3d/cubehouse/shaders/depth.frag
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/qt3d/cubehouse/shaders/depth.vert b/demos/qt3d/cubehouse/shaders/depth.vert
index e356dfa0f..ef9980070 100644
--- a/demos/qt3d/cubehouse/shaders/depth.vert
+++ b/demos/qt3d/cubehouse/shaders/depth.vert
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/qt3d/cubehouse/shaders/depthTestShader.frag b/demos/qt3d/cubehouse/shaders/depthTestShader.frag
index 375a16dfe..2a2679585 100644
--- a/demos/qt3d/cubehouse/shaders/depthTestShader.frag
+++ b/demos/qt3d/cubehouse/shaders/depthTestShader.frag
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/qt3d/cubehouse/shaders/depthTestShader.vert b/demos/qt3d/cubehouse/shaders/depthTestShader.vert
index a993b240e..716a4a3f1 100644
--- a/demos/qt3d/cubehouse/shaders/depthTestShader.vert
+++ b/demos/qt3d/cubehouse/shaders/depthTestShader.vert
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag b/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
index 9cea0ef84..d5316304c 100644
--- a/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
+++ b/demos/qt3d/cubehouse/shaders/objectlineartexgen.frag
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert b/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
index a4d0d2a4a..f3447f56d 100644
--- a/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
+++ b/demos/qt3d/cubehouse/shaders/objectlineartexgen.vert
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh b/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
index 50b3f7d39..3aa102b15 100644
--- a/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
+++ b/demos/qt3d/photobrowser3d/shaders/replace_texture.fsh
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh b/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
index 60d072c78..000ddf0f5 100644
--- a/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
+++ b/demos/qt3d/photobrowser3d/shaders/replace_texture.vsh
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/flickr3d/main.cpp b/demos/quick3d/flickr3d/main.cpp
index 1bde3c7a0..eb128e91a 100644
--- a/demos/quick3d/flickr3d/main.cpp
+++ b/demos/quick3d/flickr3d/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/flickr3d/mt.qml b/demos/quick3d/flickr3d/mt.qml
index cba81825c..8d0a7af14 100644
--- a/demos/quick3d/flickr3d/mt.qml
+++ b/demos/quick3d/flickr3d/mt.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/flickr3d/qml/Flickr3d.qml b/demos/quick3d/flickr3d/qml/Flickr3d.qml
index 3dddb75d7..07e2e771e 100644
--- a/demos/quick3d/flickr3d/qml/Flickr3d.qml
+++ b/demos/quick3d/flickr3d/qml/Flickr3d.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/flickr3d/qml/desktop.qml b/demos/quick3d/flickr3d/qml/desktop.qml
index 66bdb072c..ae532c818 100644
--- a/demos/quick3d/flickr3d/qml/desktop.qml
+++ b/demos/quick3d/flickr3d/qml/desktop.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/model_viewer/mt.qml b/demos/quick3d/model_viewer/mt.qml
index ad1e78cfe..809211209 100644
--- a/demos/quick3d/model_viewer/mt.qml
+++ b/demos/quick3d/model_viewer/mt.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/model_viewer/qml/FourButtons.qml b/demos/quick3d/model_viewer/qml/FourButtons.qml
index aca15a11b..42ce86c5e 100644
--- a/demos/quick3d/model_viewer/qml/FourButtons.qml
+++ b/demos/quick3d/model_viewer/qml/FourButtons.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/model_viewer/qml/LongButton.qml b/demos/quick3d/model_viewer/qml/LongButton.qml
index a018262ee..c878d2c55 100644
--- a/demos/quick3d/model_viewer/qml/LongButton.qml
+++ b/demos/quick3d/model_viewer/qml/LongButton.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/model_viewer/qml/MainButton.qml b/demos/quick3d/model_viewer/qml/MainButton.qml
index 9f86b6e42..f2998db80 100644
--- a/demos/quick3d/model_viewer/qml/MainButton.qml
+++ b/demos/quick3d/model_viewer/qml/MainButton.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/model_viewer/qml/ModelViewer.qml b/demos/quick3d/model_viewer/qml/ModelViewer.qml
index 648bc952d..c00f339e2 100644
--- a/demos/quick3d/model_viewer/qml/ModelViewer.qml
+++ b/demos/quick3d/model_viewer/qml/ModelViewer.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/model_viewer/qml/ShortButton.qml b/demos/quick3d/model_viewer/qml/ShortButton.qml
index 921fbc095..0f1a09825 100644
--- a/demos/quick3d/model_viewer/qml/ShortButton.qml
+++ b/demos/quick3d/model_viewer/qml/ShortButton.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/model_viewer/qml/desktop.qml b/demos/quick3d/model_viewer/qml/desktop.qml
index 6c3373ece..636d91cbb 100644
--- a/demos/quick3d/model_viewer/qml/desktop.qml
+++ b/demos/quick3d/model_viewer/qml/desktop.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/robo_bounce/mt.qml b/demos/quick3d/robo_bounce/mt.qml
index ff08be1d3..e647fd77c 100644
--- a/demos/quick3d/robo_bounce/mt.qml
+++ b/demos/quick3d/robo_bounce/mt.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/robo_bounce/qml/RoboBounce.qml b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
index 1e87b3c5c..b0a6bf121 100644
--- a/demos/quick3d/robo_bounce/qml/RoboBounce.qml
+++ b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml b/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
index f3516fb46..3abab9ca0 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/PushButton.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml b/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
index 3c7149351..3401cd618 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/QMLPanels.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml b/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
index 5f19656bf..fc786f6f5 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/Robot.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml b/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
index 2e92210d2..aa7d01496 100644
--- a/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
+++ b/demos/quick3d/robo_bounce/qml/RobotCore/TronCube.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/robo_bounce/qml/desktop.qml b/demos/quick3d/robo_bounce/qml/desktop.qml
index 62832b1fd..81306e9c1 100644
--- a/demos/quick3d/robo_bounce/qml/desktop.qml
+++ b/demos/quick3d/robo_bounce/qml/desktop.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/tea_service/mt.qml b/demos/quick3d/tea_service/mt.qml
index 11c21d7d4..664af5a15 100644
--- a/demos/quick3d/tea_service/mt.qml
+++ b/demos/quick3d/tea_service/mt.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/tea_service/qml/TeaService.qml b/demos/quick3d/tea_service/qml/TeaService.qml
index b3c6cfc35..3999cbd8b 100644
--- a/demos/quick3d/tea_service/qml/TeaService.qml
+++ b/demos/quick3d/tea_service/qml/TeaService.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/tea_service/qml/Teacup.qml b/demos/quick3d/tea_service/qml/Teacup.qml
index bccee6d1b..d992acb77 100644
--- a/demos/quick3d/tea_service/qml/Teacup.qml
+++ b/demos/quick3d/tea_service/qml/Teacup.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/tea_service/qml/Teaspoon.qml b/demos/quick3d/tea_service/qml/Teaspoon.qml
index 55d376c6a..1a3178cbd 100644
--- a/demos/quick3d/tea_service/qml/Teaspoon.qml
+++ b/demos/quick3d/tea_service/qml/Teaspoon.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/demos/quick3d/tea_service/qml/desktop.qml b/demos/quick3d/tea_service/qml/desktop.qml
index 81248e525..3a45ecf61 100644
--- a/demos/quick3d/tea_service/qml/desktop.qml
+++ b/demos/quick3d/tea_service/qml/desktop.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**