Fixed headers, typos and import statements to comply with Qt CI system

42 files changed, 373 insertions, 46 deletions

diff --git a/src/scenegraph/qsggeometry.cpp b/src/scenegraph/qsggeometry.cpp
index 14ee4db..05c111a 100644
--- a/src/scenegraph/qsggeometry.cpp
+++ b/src/scenegraph/qsggeometry.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Qt scene graph research project.
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/scenegraph/qsggeometry.h b/src/scenegraph/qsggeometry.h
index 0055392..b6663f8 100644
--- a/src/scenegraph/qsggeometry.h
+++ b/src/scenegraph/qsggeometry.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Qt scene graph research project.
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/src/shadereffectitem.cpp b/src/shadereffectitem.cpp
index a32168e..5bb906c 100644
--- a/src/shadereffectitem.cpp
+++ b/src/shadereffectitem.cpp
@@ -302,7 +302,7 @@ void ShaderEffectItem::setVertexShader(const QString &code)
 
 /*!
     \qmlproperty bool ShaderEffectItem::blending
-    This property defines wheter item is drawn using blending.
+    This property defines whether item is drawn using blending.
 
     If true, the RGBA pixel output from the fragment shader is blended with
     the pixel RGBA-values already in the framebuffer.
@@ -565,7 +565,7 @@ void ShaderEffectItem::bindGeometry()
             continue;
         Q_ASSERT_X(j < m_geometry.attributeCount(), "ShaderEffectItem::bindGeometry()", "Geometry lacks attribute required by material");
         const QSGGeometry::Attribute &a = m_geometry.attributes()[j];
-        Q_ASSERT_X(j == a.position, "ShaderEffectItem::bindGeometry()", "Geometry does not have continous attribute positions");
+        Q_ASSERT_X(j == a.position, "ShaderEffectItem::bindGeometry()", "Geometry does not have continuous attribute positions");
 #if defined(QT_OPENGL_ES_2)
         GLboolean normalize = a.type != GL_FLOAT;
 #else
diff --git a/src/shadereffectsource.cpp b/src/shadereffectsource.cpp
index 0a133bd..dec3bb0 100644
--- a/src/shadereffectsource.cpp
+++ b/src/shadereffectsource.cpp
@@ -216,7 +216,7 @@ void ShaderEffectSource::setTextureSize(const QSize &size)
 
 /*!
     \qmlproperty bool ShaderEffectSource::live
-    This property holds the optimization flag to define wheter the source item content is changing or
+    This property holds the optimization flag to define whether the source item content is changing or
     static.
 
     If value true is assigned to this property, source item content is re-rendered into a
@@ -229,7 +229,7 @@ void ShaderEffectSource::setTextureSize(const QSize &size)
 
 /*!
     \property ShaderEffectSource::live
-    \brief the flag tells wheter source item content is changing between frames.
+    \brief the flag tells whether source item content is changing between frames.
 */
 
 void ShaderEffectSource::setLive(bool s)
@@ -245,7 +245,7 @@ void ShaderEffectSource::setLive(bool s)
 
 /*!
     \qmlproperty bool ShaderEffectSource::hideSource
-    This property holds the flag to define wheter the original source item is
+    This property holds the flag to define whether the original source item is
     hidden when the effect item is drawn.
 
     The default value is false.
@@ -253,7 +253,7 @@ void ShaderEffectSource::setLive(bool s)
 
 /*!
     \property ShaderEffectSource::hideSource
-    \brief the flag tells wheter original source item content should be hidden.
+    \brief the flag tells whether original source item content should be hidden.
 */
 
 void ShaderEffectSource::setHideSource(bool hide)
diff --git a/tests/manual/performance/GaussianBlur.qml b/tests/manual/performance/GaussianBlur.qml
index 4424b0b..ee4c029 100644
--- a/tests/manual/performance/GaussianBlur.qml
+++ b/tests/manual/performance/GaussianBlur.qml
@@ -1,4 +1,45 @@
-import Qt 4.7
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Item {
diff --git a/tests/manual/performance/GaussianDirectionalBlur.qml b/tests/manual/performance/GaussianDirectionalBlur.qml
index 33f576b..e09dde2 100644
--- a/tests/manual/performance/GaussianDirectionalBlur.qml
+++ b/tests/manual/performance/GaussianDirectionalBlur.qml
@@ -1,4 +1,45 @@
-import Qt 4.7
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 // Note 1. This shader implements gaussian blur without dynamic array access from inside shader loops (Optional feature in OpenGLES 2.0).
diff --git a/tests/manual/performance/GaussianDropShadow.qml b/tests/manual/performance/GaussianDropShadow.qml
index be78c86..4e8c8d3 100644
--- a/tests/manual/performance/GaussianDropShadow.qml
+++ b/tests/manual/performance/GaussianDropShadow.qml
@@ -1,4 +1,45 @@
-import Qt 4.7
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Item {
diff --git a/tests/manual/performance/TestGaussianDropShadow.qml b/tests/manual/performance/TestGaussianDropShadow.qml
index 5843d55..4831758 100755
--- a/tests/manual/performance/TestGaussianDropShadow.qml
+++ b/tests/manual/performance/TestGaussianDropShadow.qml
@@ -1,4 +1,45 @@
-import Qt 4.7
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Item {
diff --git a/tests/manual/performance/TestWater.qml b/tests/manual/performance/TestWater.qml
index 4d90950..c4fbc2a 100755
--- a/tests/manual/performance/TestWater.qml
+++ b/tests/manual/performance/TestWater.qml
@@ -1,4 +1,44 @@
-import Qt 4.7
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Item {
diff --git a/tests/manual/performance/Water.qml b/tests/manual/performance/Water.qml
index 02486dd..6a1ec1c 100644
--- a/tests/manual/performance/Water.qml
+++ b/tests/manual/performance/Water.qml
@@ -1,4 +1,45 @@
-import Qt 4.7
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Item {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestActive.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestActive.qml
index 8aaee0d..303c7db 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestActive.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestActive.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBasic.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBasic.qml
index c7ec908..b70cac0 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBasic.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBasic.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Item {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBlending.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBlending.qml
index d7ce837..0c31419 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBlending.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBlending.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBlendingModes.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBlendingModes.qml
index bd60c68..47f5bc3 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBlendingModes.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestBlendingModes.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Item {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestEffectHierarchy.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestEffectHierarchy.qml
index e3a4c80..1cad5b1 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestEffectHierarchy.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestEffectHierarchy.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml
index ab84557..1446f9b 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestFormat.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestFormat.qml
index 9b1c697..df5e06d 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestFormat.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestFormat.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestFragmentShader.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestFragmentShader.qml
index 0a7f261..d170358 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestFragmentShader.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestFragmentShader.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestGrab.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestGrab.qml
index 6a20835..08e9319 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestGrab.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestGrab.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestHideOriginal.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestHideOriginal.qml
index 4027745..1cd449f 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestHideOriginal.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestHideOriginal.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestHorizontalWrap.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestHorizontalWrap.qml
index 92436a8..3b94389 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestHorizontalWrap.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestHorizontalWrap.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageFiltering.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageFiltering.qml
index 07da7b8..9d990d0 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageFiltering.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageFiltering.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMargins.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMargins.qml
index 8bfafa9..3ad2b50 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMargins.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMargins.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml
index 61f947a..453bbaf 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMipmap.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMipmap.qml
index 56b8168..a51068d 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMipmap.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestImageMipmap.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestItemMargins.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestItemMargins.qml
index 26c6f57..94f7824 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestItemMargins.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestItemMargins.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml
index abbf8f4..83784c3 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestLive.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestLive.qml
index 0d3553b..6db568d 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestLive.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestLive.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestMeshResolution.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestMeshResolution.qml
index e8ddc61..255df36 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestMeshResolution.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestMeshResolution.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestOneSource.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestOneSource.qml
index 8b92247..117ae65 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestOneSource.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestOneSource.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestOpacity.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestOpacity.qml
index af5ecf7..00af373 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestOpacity.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestOpacity.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestRotation.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestRotation.qml
index 4262ebc..c4435fa 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestRotation.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestRotation.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestScale.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestScale.qml
index b60747c..3488eab 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestScale.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestScale.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTextureSize.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTextureSize.qml
index 5ca08cb..7369efc 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTextureSize.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTextureSize.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml
index e84b84b..8098a4d 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTwoSources.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTwoSources.qml
index c8f12af..e651cd9 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTwoSources.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestTwoSources.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestVertexShader.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestVertexShader.qml
index 0e12257..a7530dc 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestVertexShader.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestVertexShader.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestVerticalWrap.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestVerticalWrap.qml
index 96171ef..726b237 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestVerticalWrap.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestVerticalWrap.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestWrapRepeat.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestWrapRepeat.qml
index 35f6b92..514e150 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestWrapRepeat.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/TestWrapRepeat.qml
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-import Qt 4.7
+import QtQuick 1.0
 import Qt.labs.shaders 1.0
 
 Rectangle {
diff --git a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/main.qml b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/main.qml
index 2a857a9..1abf524 100644
--- a/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/main.qml
+++ b/tests/manual/qmlshadersplugintest/qml/qmlshadersplugintest/main.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
+import QtQuick 1.0
 
 Item {
     id: main
diff --git a/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.cpp b/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.cpp
index 51b5fcc..b5b43bf 100644
--- a/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ b/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 // checksum 0xdf1f version 0x10008
 #include "qmlapplicationviewer.h"
 
diff --git a/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.h b/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.h
index ea78431..4d1a38c 100644
--- a/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.h
+++ b/tests/manual/qmlshadersplugintest/qmlapplicationviewer/qmlapplicationviewer.h
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QML Shaders plugin of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 // checksum 0x39ee version 0x10008
 #ifndef QMLAPPLICATIONVIEWER_H
 #define QMLAPPLICATIONVIEWER_H