1 files changed, 11 insertions, 11 deletions

diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h
index 4cf656fd86..fd7f2b328c 100644
--- a/src/opengl/qgl_p.h
+++ b/src/opengl/qgl_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtOpenGL module of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
 ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -134,7 +134,7 @@ public:
     void initContext(QGLContext *context, const QGLWidget* shareWidget);
     bool renderCxPm(QPixmap *pixmap);
     void cleanupColormaps();
-    void aboutToDestroy() {
+    void aboutToDestroy() Q_DECL_OVERRIDE {
         if (glcx && !parent_changing)
             glcx->reset();
     }
@@ -482,12 +482,12 @@ public:
     }
 
 protected:
-    void invalidateResource()
+    void invalidateResource() Q_DECL_OVERRIDE
     {
         m_id = 0;
     }
 
-    void freeResource(QOpenGLContext *context)
+    void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE
     {
         if (m_id) {
             freeResource(QGLContext::fromOpenGLContext(context), m_id);
@@ -511,7 +511,7 @@ public:
     }
 
 protected:
-    void freeResource(QGLContext *ctx, GLuint id)
+    void freeResource(QGLContext *ctx, GLuint id) Q_DECL_OVERRIDE
     {
         m_func(ctx, id);
     }