summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-21 19:07:13 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-21 19:07:13 (GMT)
commit6093bac3049854ded63f74a0deac9df730f2027f (patch)
tree4cd7102619f026952c645c15310e6bdd64d05f20 /src/opengl
parentf0289430822c241f808c64342ae796ba6a460096 (diff)
downloadQt-6093bac3049854ded63f74a0deac9df730f2027f.zip
Qt-6093bac3049854ded63f74a0deac9df730f2027f.tar.gz
Qt-6093bac3049854ded63f74a0deac9df730f2027f.tar.bz2
Fix obsolete license headers.
Reviewed-by: Trust Me
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/gl2paintengineex/qglcustomshaderstage.cpp2
-rw-r--r--src/opengl/gl2paintengineex/qglcustomshaderstage_p.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
index 9a5cd10..9a729f9 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage.cpp
@@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
index 70e9ff0..5392643 100644
--- a/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
+++ b/src/opengl/gl2paintengineex/qglcustomshaderstage_p.h
@@ -34,11 +34,14 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
+#ifndef QGL_CUSTOM_SHADER_STAGE_H
+#define QGL_CUSTOM_SHADER_STAGE_H
+
//
// W A R N I N G
// -------------
@@ -50,9 +53,6 @@
// We mean it.
//
-#ifndef QGL_CUSTOM_SHADER_STAGE_H
-#define QGL_CUSTOM_SHADER_STAGE_H
-
#include <QGLShaderProgram>
QT_BEGIN_HEADER